Changeset 2015 for trunk/vendor/Text

Timestamp:

07/20/07 09:03:04 (18 months ago)

Author:

jepso

Message:

- New feature in documentation: you can now link to other documentation sections with the following syntax:

• [doc getting-started:installation], or
• [doc getting-started:installation Custom link text]

- Updated Text_Wiki to 1.2.0
- Documentation should now pass XHTML validator
- Formatted DSN section so that it's easier on eyes
- The single quotes in <code type='php'> won't work anymore due to the Text_Wiki update. Use double quotes instead: <code type="php">. The single quotes have been converted to double quotes in documentation files.
- Modified the links in h1-h6 headings to use the same style as the headings.
- Some refactoring

Location:

trunk/vendor/Text

Files:

• Wiki.php (modified) (20 diffs)
• Wiki/Mediawiki.php (deleted)
• Wiki/Parse.php (modified) (2 diffs)
• Wiki/Parse/Default/Blockquote.php (modified) (7 diffs)
• Wiki/Parse/Default/Code.php (modified) (4 diffs)
• Wiki/Parse/Default/Freelink.php (modified) (4 diffs)
• Wiki/Parse/Default/Prefilter.php (modified) (2 diffs)
• Wiki/Parse/Default/Wikilink.php (modified) (6 diffs)
• Wiki/Parse/Mediawiki (deleted)
• Wiki/Render/Latex/Url.php (modified) (3 diffs)
• Wiki/Render/Plain/Url.php (modified) (1 diff)
• Wiki/Render/Xhtml/Address.php (added)
• Wiki/Render/Xhtml/Blockquote.php (modified) (2 diffs)
• Wiki/Render/Xhtml/Bold.php (modified) (1 diff)
• Wiki/Render/Xhtml/Box.php (modified) (3 diffs)
• Wiki/Render/Xhtml/Center.php (modified) (3 diffs)
• Wiki/Render/Xhtml/Code.php (modified) (4 diffs)
• Wiki/Render/Xhtml/Image.php (modified) (3 diffs)
• Wiki/Render/Xhtml/Interwiki.php (modified) (2 diffs)
• Wiki/Render/Xhtml/Italic.php (modified) (1 diff)
• Wiki/Render/Xhtml/Phplookup.php (modified) (2 diffs)
• Wiki/Render/Xhtml/Preformatted.php (modified) (2 diffs)
• Wiki/Render/Xhtml/Underline.php (modified) (1 diff)
• Wiki/Render/Xhtml/Url.php (modified) (4 diffs)
• Wiki/Render/Xhtml/Wikilink.php (modified) (3 diffs)

trunk/vendor/Text/Wiki.php

@@ -10 +10 @@
  * @author     Paul M. Jones <pmjones@php.net>
  * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    CVS: $Id: Wiki.php,v 1.48 2006/10/10 19:34:38 justinpatrin Exp $
+ * @version    CVS: $Id: Wiki.php,v 1.51 2007/06/09 23:17:46 justinpatrin Exp $
  * @link       http://pear.php.net/package/Text_Wiki
  */
@@ -34 +34 @@
  * @author     Paul M. Jones <pmjones@php.net>
  * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    Release: 1.2.0RC1
+ * @version    Release: 1.2.0
  * @link       http://pear.php.net/package/Text_Wiki
  */
@@ -257 +257 @@
     var $source = '';
 
+    /**
+     * The output text
+     *
+     * @var string
+     */
+    var $output = '';
+
 
     /**
@@ -338 +345 @@
     /**
      * Temporary configuration variable
+     *
+     * @var string
      */
     var $renderingType = 'preg';
 
     /**
+     * Stack of rendering callbacks
+     *
+     * @var Array
+     */
+    var $_renderCallbacks = array();
+
+    /**
+     * Current output block
+     *
+     * @var string
+     */
+    var $_block;
+
+    /**
+     * A stack of blocks
+     *
+     * @param Array
+     */
+    var $_blocks;
+
+    /**
     *
     * Constructor.
@@ -357 +387 @@
     {
         if (is_array($rules)) {
-            $this->rules = $rules;
+            $this->rules = array();
+            foreach ($rules as $rule) {
+                $this->rules[] = ucfirst($rule);
+            }
         }
 
@@ -409 +442 @@
     * @return &object a reference to the Text_Wiki unique instantiation.
     */
-    function singleton($parser = 'Default', $rules = null)
+    function &singleton($parser = 'Default', $rules = null)
     {
         static $only = array();
         if (!isset($only[$parser])) {
-            $ret = Text_Wiki::factory($parser, $rules);
+            $ret = & Text_Wiki::factory($parser, $rules);
             if (Text_Wiki::isError($ret)) {
                 return $ret;
             }
-            $only[$parser] = $ret;
+            $only[$parser] =& $ret;
         }
         return $only[$parser];
@@ -433 +466 @@
      * @return Text_Wiki a Parser object extended from Text_Wiki
      */
-    function factory($parser = 'Default', $rules = null)
+    function &factory($parser = 'Default', $rules = null)
     {
         $class = 'Text_Wiki_' . $parser;
@@ -446 +479 @@
         }
 
-        $obj = new $class($rules);
+        $obj =& new $class($rules);
         return $obj;
     }
@@ -921 +954 @@
                 // load may have failed; only parse if
                 // an object is in the array now
-                if (isset($this->parseObj[$name]) && is_object($this->parseObj[$name])) {
+                if (is_object($this->parseObj[$name])) {
                     $this->parseObj[$name]->parse();
                 }
@@ -949 +982 @@
 
         // the eventual output text
-        $output = '';
+        $this->output = '';
 
         // when passing through the parsed source text, keep track of when
@@ -966 +999 @@
         // pre-rendering activity
         if (is_object($this->formatObj[$format])) {
-            $output .= $this->formatObj[$format]->pre();
+            $this->output .= $this->formatObj[$format]->pre();
         }
 
@@ -975 +1008 @@
 
         if ($this->renderingType == 'preg') {
-            $output = preg_replace_callback('/'.$this->delim.'(\d+)'.$this->delim.'/',
+            $this->output = preg_replace_callback('/'.$this->delim.'(\d+)'.$this->delim.'/',
                                             array(&$this, '_renderToken'),
                                             $this->source);
+            /*
+//Damn strtok()! Why does it "skip" empty parts of the string. It's useless now!
+        } elseif ($this->renderingType == 'strtok') {
+            echo '<pre>'.htmlentities($this->source).'</pre>';
+            $t = strtok($this->source, $this->delim);
+            $inToken = true;
+            $i = 0;
+            while ($t !== false) {
+                echo 'Token: '.$i.'<pre>"'.htmlentities($t).'"</pre><br/><br/>';
+                if ($inToken) {
+                    //$this->output .= $this->renderObj[$this->tokens[$t][0]]->token($this->tokens[$t][1]);
+                } else {
+                    $this->output .= $t;
+                }
+                $inToken = !$inToken;
+                $t = strtok($this->delim);
+                ++$i;
+            }
+            */
         } else {
             // pass through the parsed source text character by character
+            $this->_block = '';
+            $tokenStack = array();
             $k = strlen($this->source);
             for ($i = 0; $i < $k; $i++) {
@@ -991 +1045 @@
                     // yes; are we ending the section?
                     if ($char == $this->delim) {
+
+                        if (count($this->_renderCallbacks) == 0) {
+                            $this->output .= $this->_block;
+                            $this->_block = '';
+                        }
+
+                        if (isset($opts['type'])) {
+                            if ($opts['type'] == 'start') {
+                                array_push($tokenStack, $rule);
+                            } elseif ($opts['type'] == 'end') {
+                                if ($tokenStack[count($tokenStack) - 1] != $rule) {
+                                    return Text_Wiki::error('Unbalanced tokens, check your syntax');
+                                } else {
+                                    array_pop($tokenStack);
+                                }
+                            }
+                        }
 
                         // yes, get the replacement text for the delimited
@@ -997 +1068 @@
                         $rule = $this->tokens[$key][0];
                         $opts = $this->tokens[$key][1];
-                        $output .= $this->renderObj[$rule]->token($opts);
+                        $this->_block .= $this->renderObj[$rule]->token($opts);
                         $in_delim = false;
 
                     } else {
 
-                        // no, add to the dlimited token key number
+                        // no, add to the delimited token key number
                         $key .= $char;
 
@@ -1016 +1087 @@
                         $key = '';
                         $in_delim = true;
+
                     } else {
                         // no, add to the output as-is
-                        $output .= $char;
+                        $this->_block .= $char;
                     }
                 }
@@ -1024 +1096 @@
         }
 
+        if (count($this->_renderCallbacks)) {
+            return $this->error('Render callbacks left over after processing finished');
+        }
+        /*
+        while (count($this->_renderCallbacks)) {
+            $this->popRenderCallback();
+        }
+        */
+        if (strlen($this->_block)) {
+            $this->output .= $this->_block;
+            $this->_block = '';
+        }
+
         // post-rendering activity
         if (is_object($this->formatObj[$format])) {
-            $output .= $this->formatObj[$format]->post();
+            $this->output .= $this->formatObj[$format]->post();
         }
 
         // return the rendered source text.
-        return $output;
+        return $this->output;
     }
 
@@ -1044 +1129 @@
     }
 
+    function registerRenderCallback($callback) {
+        $this->_blocks[] = $this->_block;
+        $this->_block = '';
+        $this->_renderCallbacks[] = $callback;
+    }
+
+    function popRenderCallback() {
+        if (count($this->_renderCallbacks) == 0) {
+            return Text_Wiki::error('Render callback popped when no render callbacks in stack');
+        } else {
+            $callback = array_pop($this->_renderCallbacks);
+            $this->_block = call_user_func($callback, $this->_block);
+            if (count($this->_blocks)) {
+                $parentBlock = array_pop($this->_blocks);
+                $this->_block = $parentBlock.$this->_block;
+            }
+            if (count($this->_renderCallbacks) == 0) {
+                $this->output .= $this->_block;
+                $this->_block = '';
+            }
+        }
+    }
 
     /**
@@ -1223 +1330 @@
         }
 
-        $this->parseObj[$rule] = new $class($this);
+        $this->parseObj[$rule] =& new $class($this);
 
     }
@@ -1259 +1366 @@
         }
 
-        $this->renderObj[$rule] = new $class($this);
+        $this->renderObj[$rule] =& new $class($this);
     }
 
@@ -1292 +1399 @@
         }
 
-        $this->formatObj[$format] = new $class($this);
+        $this->formatObj[$format] =& new $class($this);
     }
 

trunk/vendor/Text/Wiki/Parse.php

@@ -234 +234 @@
         // find the =" sections;
         $tmp = explode('="', trim($text));
-        $mark = '"';
-
-        if (count($tmp) == 1) {
-            $tmp = explode("='", trim($text));
-            $mark = "'";
-        }
 
         // basic setup
@@ -258 +252 @@
             // the part to the left is the value for the last key,
             // the part to the right is the next key name
-            $pos = strrpos($val, $mark);
+            $pos = strrpos($val, '"');
             $attrs[$key] = stripslashes(substr($val, 0, $pos));
             $key = trim(substr($val, $pos+1));
 
         }
+
         return $attrs;
 

trunk/vendor/Text/Wiki/Parse/Default/Blockquote.php

@@ -13 +13 @@
 * @license LGPL
 * 
-* @version $Id: Blockquote.php,v 1.3 2005/02/23 17:38:29 pmjones Exp $
+* @version $Id: Blockquote.php,v 1.4 2006/10/21 05:56:28 justinpatrin Exp $
 * 
 */
@@ -77 +77 @@
     {
         // the replacement text we will return to parse()
-        $return = '';
+        $return = "\n";
         
         // the list of post-processing matches
@@ -92 +92 @@
         );
         
-        // a stack of starts and ends; we keep this so that we know what
-        // indent level we're at.
-        $stack = array();
-        
+        $curLevel = 0;
+
         // loop through each list-item element.
         foreach ($list as $key => $val) {
@@ -106 +104 @@
             $level = strlen($val[1]);
             
-            // get the text of the line
-            $text = $val[2];
-            
             // add a level to the list?
-            while ($level > count($stack)) {
-                
+            while ($level > $curLevel) {
                 // the current indent level is greater than the number
                 // of stack elements, so we must be starting a new
                 // level.  push the new level onto the stack with a 
                 // dummy value (boolean true)...
-                array_push($stack, true);
+                ++$curLevel;
                 
-                $return .= "\n";
+                //$return .= "\n";
                 
                 // ...and add a start token to the return.
@@ -125 +119 @@
                     array(
                         'type' => 'start',
-                        'level' => $level - 1
+                        'level' => $curLevel
                     )
                 );
                 
-                $return .= "\n\n";
+                //$return .= "\n\n";
             }
             
             // remove a level?
-            while (count($stack) > $level) {
+            while ($curLevel > $level) {
                 
                 // as long as the stack count is greater than the
@@ -139 +133 @@
                 // continue adding end-list tokens until the stack count
                 // and the indent level are the same.
-                array_pop($stack);
                 
-                $return .= "\n\n";
+                //$return .= "\n\n";
                 
                 $return .= $this->wiki->addToken(
@@ -147 +140 @@
                     array (
                         'type' => 'end',
-                        'level' => count($stack)
+                        'level' => $curLevel
                     )
                 );
                 
-                $return .= "\n";
+                //$return .= "\n";
+                --$curLevel;
             }
             
             // add the line text.
-            $return .= $text;
+            $return .= $val[2];
         }
+        
+        // the last char of the matched pattern must be \n but we don't
+        // want this to be inside the tokens
+        $return = substr($return, 0, -1);
         
         // the last line may have been indented.  go through the stack
         // and create end-tokens until the stack is empty.
-        $return .= "\n";
-        
-        while (count($stack) > 0) {
-            array_pop($stack);
+        //$return .= "\n";
+
+        while ($curLevel > 0) {
             $return .= $this->wiki->addToken(
                 $this->rule, 
                 array (
                     'type' => 'end',
-                    'level' => count($stack)
+                    'level' => $curLevel
                 )
             );
+            --$curLevel;
         }
         
+        // put back the trailing \n
+        $return .= "\n";
+
         // we're done!  send back the replacement text.
-        return "\n$return\n\n";
+        return $return;
     }
 }

trunk/vendor/Text/Wiki/Parse/Default/Code.php

@@ -13 +13 @@
 * @license LGPL
 * 
-* @version $Id: Code.php,v 1.10 2006/02/21 14:33:53 toggg Exp $
+* @version $Id: Code.php,v 1.11 2007/06/09 23:11:25 justinpatrin Exp $
 * 
 */
@@ -51 +51 @@
     
 /*    var $regex = '/^(\<code( .+)?\>)\n(.+)\n(\<\/code\>)(\s|$)/Umsi';*/
-/*    var $regex = ';^<code(\s[^>]*)?>((?:(?R)|.)*?)\n</code>(\s|$);msi';*/
-    var $regex = ';^<code(\s[^>]*)?>\n(.+?)\n</code>(\s|$);msi';
+    var $regex = ';^<code(\s[^>]*)?>((?:(?R)|.*?)*)\n</code>(\s|$);msi';
     
     /**
@@ -73 +72 @@
         // are there additional attribute arguments?
         $args = trim($matches[1]);
-
+        
         if ($args == '') {
             $options = array(
@@ -82 +81 @@
                 // get the attributes...
                 $attr = $this->getAttrs($args);
-
+                
                 // ... and make sure we have a 'type'
                 if (! isset($attr['type'])) {

trunk/vendor/Text/Wiki/Parse/Default/Freelink.php

@@ -13 +13 @@
 * @license LGPL
 * 
-* @version $Id: Freelink.php,v 1.4 2005/10/19 23:43:53 toggg Exp $
+* @version $Id: Freelink.php,v 1.8 2006/12/08 08:23:51 justinpatrin Exp $
 * 
 */
@@ -42 +42 @@
 class Text_Wiki_Parse_Freelink extends Text_Wiki_Parse {
     
+    var $conf = array (
+                       'utf-8' => false
+    );
     
     /**
@@ -57 +60 @@
     {
         parent::Text_Wiki_Parse($obj);
-        
+        if ($this->getConf('utf-8')) {
+            $any = '\p{L}';
+        } else {
+            $any = '';
+        }
         $this->regex =
             '/' .                                                   // START regex
             "\\(\\(" .                                               // double open-parens
             "(" .                                                   // START freelink page patter
-            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+" . // 1 or more of just about any character
+            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&".$any."\xc0-\xff]+" . // 1 or more of just about any character
             ")" .                                                   // END  freelink page pattern
             "(" .                                                   // START display-name
             "\|" .                                                   // a pipe to start the display name
-            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&\xc0-\xff]+" . // 1 or more of just about any character
+            "[-A-Za-z0-9 _+\\/.,;:!?'\"\\[\\]\\{\\}&".$any."\xc0-\xff]+" . // 1 or more of just about any character
             ")?" .                                                   // END display-name pattern 0 or 1
             "(" .                                                   // START pattern for named anchors
@@ -74 +81 @@
             ")?" .                                                   // END named anchors pattern 0 or 1
             "()\\)\\)" .                                           // double close-parens
-            '/';                                                   // END regex
+            '/'.($this->getConf('utf-8') ? 'u' : '');              // END regex
     }
     

trunk/vendor/Text/Wiki/Parse/Default/Prefilter.php

@@ -13 +13 @@
 * @license LGPL
 * 
-* @version $Id: Prefilter.php,v 1.3 2005/02/23 17:38:29 pmjones Exp $
+* @version $Id: Prefilter.php,v 1.4 2006/12/08 08:30:37 justinpatrin Exp $
 * 
 */
@@ -66 +66 @@
         // seems to help many rules.
         $this->wiki->source = "\n" . $this->wiki->source . "\n\n";
+
+        $this->wiki->source = str_replace("\n----\n","\n\n----\n\n",
+                                          $this->wiki->source);
+        $this->wiki->source = preg_replace("/\n(\\+{1,6})(.*)\n/m",
+                                           "\n\n\\1 \\2\n\n",
+                                           $this->wiki->source);
         
         // finally, compress all instances of 3 or more newlines