PetLid / rssreader

vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php

Doc Comments +1 added lines

@@ -205,6 +205,7 @@
     /**
      * Adds a module to the current doctype by first registering it,
      * and then tacking it on to the active doctype
+     * @param HTMLPurifier_HTMLModule $module
      */
     public function addModule($module)
     {

Spacing +33 added lines, -33 removed lines

@@ -174,7 +174,7 @@ 
             $original_module = $module;
             $ok = false;
             foreach ($this->prefixes as $prefix) {
-                $module = $prefix . $original_module;
+                $module = $prefix.$original_module;
                 if (class_exists($module)) {
                     $ok = true;
                     break;
@@ -184,7 +184,7 @@ 
                 $module = $original_module;
                 if (!class_exists($module)) {
                     trigger_error(
-                        $original_module . ' module does not exist',
+                        $original_module.' module does not exist',
                         E_USER_ERROR
                     );
                     return;
@@ -193,13 +193,13 @@ 
             $module = new $module();
         }
         if (empty($module->name)) {
-            trigger_error('Module instance of ' . get_class($module) . ' must have name');
+            trigger_error('Module instance of '.get_class($module).' must have name');
             return;
         }
-        if (!$overload && isset($this->registeredModules[$module->name])) {
-            trigger_error('Overloading ' . $module->name . ' without explicit overload parameter', E_USER_WARNING);
+        if (!$overload && isset($this->registeredModules[ $module->name ])) {
+            trigger_error('Overloading '.$module->name.' without explicit overload parameter', E_USER_WARNING);
         }
-        $this->registeredModules[$module->name] = $module;
+        $this->registeredModules[ $module->name ] = $module;
     }
 
     /**
@@ -212,7 +212,7 @@ 
         if (is_object($module)) {
             $module = $module->name;
         }
-        $this->userModules[] = $module;
+        $this->userModules[ ] = $module;
     }
 
     /**
@@ -221,7 +221,7 @@ 
      */
     public function addPrefix($prefix)
     {
-        $this->prefixes[] = $prefix;
+        $this->prefixes[ ] = $prefix;
     }
 
     /**
@@ -243,33 +243,33 @@ 
 
         if (is_array($lookup)) {
             foreach ($modules as $k => $m) {
-                if (isset($special_cases[$m])) {
+                if (isset($special_cases[ $m ])) {
                     continue;
                 }
-                if (!isset($lookup[$m])) {
-                    unset($modules[$k]);
+                if (!isset($lookup[ $m ])) {
+                    unset($modules[ $k ]);
                 }
             }
         }
 
         // custom modules
         if ($config->get('HTML.Proprietary')) {
-            $modules[] = 'Proprietary';
+            $modules[ ] = 'Proprietary';
         }
         if ($config->get('HTML.SafeObject')) {
-            $modules[] = 'SafeObject';
+            $modules[ ] = 'SafeObject';
         }
         if ($config->get('HTML.SafeEmbed')) {
-            $modules[] = 'SafeEmbed';
+            $modules[ ] = 'SafeEmbed';
         }
         if ($config->get('HTML.SafeScripting') !== array()) {
-            $modules[] = 'SafeScripting';
+            $modules[ ] = 'SafeScripting';
         }
         if ($config->get('HTML.Nofollow')) {
-            $modules[] = 'Nofollow';
+            $modules[ ] = 'Nofollow';
         }
         if ($config->get('HTML.TargetBlank')) {
-            $modules[] = 'TargetBlank';
+            $modules[ ] = 'TargetBlank';
         }
 
         // merge in custom modules
@@ -277,12 +277,12 @@ 
 
         foreach ($modules as $module) {
             $this->processModule($module);
-            $this->modules[$module]->setup($config);
+            $this->modules[ $module ]->setup($config);
         }
 
         foreach ($this->doctype->tidyModules as $module) {
             $this->processModule($module);
-            $this->modules[$module]->setup($config);
+            $this->modules[ $module ]->setup($config);
         }
 
         // prepare any injectors
@@ -293,7 +293,7 @@ 
                     $class = "HTMLPurifier_Injector_$injector";
                     $injector = new $class;
                 }
-                $n[$injector->name] = $injector;
+                $n[ $injector->name ] = $injector;
             }
             $module->info_injector = $n;
         }
@@ -301,10 +301,10 @@ 
         // setup lookup table based on all valid modules
         foreach ($this->modules as $module) {
             foreach ($module->info as $name => $def) {
-                if (!isset($this->elementLookup[$name])) {
-                    $this->elementLookup[$name] = array();
+                if (!isset($this->elementLookup[ $name ])) {
+                    $this->elementLookup[ $name ] = array();
                 }
-                $this->elementLookup[$name][] = $module->name;
+                $this->elementLookup[ $name ][ ] = $module->name;
             }
         }
 
@@ -329,10 +329,10 @@ 
      */
     public function processModule($module)
     {
-        if (!isset($this->registeredModules[$module]) || is_object($module)) {
+        if (!isset($this->registeredModules[ $module ]) || is_object($module)) {
             $this->registerModule($module);
         }
-        $this->modules[$module] = $this->registeredModules[$module];
+        $this->modules[ $module ] = $this->registeredModules[ $module ];
     }
 
     /**
@@ -347,10 +347,10 @@ 
                 continue;
             }
             foreach ($module->info as $name => $v) {
-                if (isset($elements[$name])) {
+                if (isset($elements[ $name ])) {
                     continue;
                 }
-                $elements[$name] = $this->getElement($name);
+                $elements[ $name ] = $this->getElement($name);
             }
         }
 
@@ -358,7 +358,7 @@ 
         // appeared to be safe actually wasn't
         foreach ($elements as $n => $v) {
             if ($v === false) {
-                unset($elements[$n]);
+                unset($elements[ $n ]);
             }
         }
 
@@ -378,7 +378,7 @@ 
      */
     public function getElement($name, $trusted = null)
     {
-        if (!isset($this->elementLookup[$name])) {
+        if (!isset($this->elementLookup[ $name ])) {
             return false;
         }
 
@@ -390,8 +390,8 @@ 
 
         // iterate through each module that has registered itself to this
         // element
-        foreach ($this->elementLookup[$name] as $module_name) {
-            $module = $this->modules[$module_name];
+        foreach ($this->elementLookup[ $name ] as $module_name) {
+            $module = $this->modules[ $module_name ];
 
             // refuse to create/merge from a module that is deemed unsafe--
             // pretend the module doesn't exist--when trusted mode is not on.
@@ -402,7 +402,7 @@ 
             // clone is used because, ideally speaking, the original
             // definition should not be modified. Usually, this will
             // make no difference, but for consistency's sake
-            $new_def = clone $module->info[$name];
+            $new_def = clone $module->info[ $name ];
 
             if (!$def && $new_def->standalone) {
                 $def = $new_def;
@@ -449,7 +449,7 @@ 
         // add information on required attributes
         foreach ($def->attr as $attr_name => $attr_def) {
             if ($attr_def->required) {
-                $def->required_attr[] = $attr_name;
+                $def->required_attr[ ] = $attr_name;
             }
         }
         return $def;

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      * deleted a node, and now need to see if this change affected any
      * earlier nodes. Rewinding does not affect other injectors, and can
      * result in infinite loops if not used carefully.
-     * @param bool|int $offset
+     * @param integer $offset
      * @warning HTML Purifier will prevent you from fast-forwarding with this
      *          function.
      */

Spacing +13 added lines, -13 removed lines

@@ -104,9 +104,9 @@ 
         if ($result !== false) {
             return $result;
         }
-        $this->currentNesting =& $context->get('CurrentNesting');
-        $this->currentToken   =& $context->get('CurrentToken');
-        $this->inputZipper    =& $context->get('InputZipper');
+        $this->currentNesting = & $context->get('CurrentNesting');
+        $this->currentToken   = & $context->get('CurrentToken');
+        $this->inputZipper    = & $context->get('InputZipper');
         return false;
     }
 
@@ -124,14 +124,14 @@ 
             if (is_int($element)) {
                 $element = $attributes;
             }
-            if (!isset($def->info[$element])) {
+            if (!isset($def->info[ $element ])) {
                 return $element;
             }
             if (!is_array($attributes)) {
                 continue;
             }
             foreach ($attributes as $name) {
-                if (!isset($def->info[$element]->attr[$name])) {
+                if (!isset($def->info[ $element ]->attr[ $name ])) {
                     return "$element.$name";
                 }
             }
@@ -148,19 +148,19 @@ 
     {
         if (!empty($this->currentNesting)) {
             $parent_token = array_pop($this->currentNesting);
-            $this->currentNesting[] = $parent_token;
-            $parent = $this->htmlDefinition->info[$parent_token->name];
+            $this->currentNesting[ ] = $parent_token;
+            $parent = $this->htmlDefinition->info[ $parent_token->name ];
         } else {
             $parent = $this->htmlDefinition->info_parent_def;
         }
-        if (!isset($parent->child->elements[$name]) || isset($parent->excludes[$name])) {
+        if (!isset($parent->child->elements[ $name ]) || isset($parent->excludes[ $name ])) {
             return false;
         }
         // check for exclusion
         for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
-            $node = $this->currentNesting[$i];
-            $def  = $this->htmlDefinition->info[$node->name];
-            if (isset($def->excludes[$name])) {
+            $node = $this->currentNesting[ $i ];
+            $def  = $this->htmlDefinition->info[ $node->name ];
+            if (isset($def->excludes[ $name ])) {
                 return false;
             }
         }
@@ -187,7 +187,7 @@ 
         if ($i < 0) {
             return false;
         }
-        $current = $this->inputZipper->back[$i];
+        $current = $this->inputZipper->back[ $i ];
         return true;
     }
 
@@ -241,7 +241,7 @@ 
         if ($i < 0) {
             return false;
         }
-        $current = $this->inputZipper->front[$i];
+        $current = $this->inputZipper->front[ $i ];
         return true;
     }
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php

Doc Comments +1 added lines, -1 removed lines

@@ -328,7 +328,7 @@
      * Determines if a particular token requires an earlier inline token
      * to get a paragraph. This should be used with _forwardUntilEndToken
      * @param HTMLPurifier_Token $current
-     * @return bool
+     * @return boolean|null
      */
     private function _checkNeedsP($current)
     {

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
     private function _pStart()
     {
         $par = new HTMLPurifier_Token_Start('p');
-        $par->armor['MakeWellFormed_TagClosedError'] = true;
+        $par->armor[ 'MakeWellFormed_TagClosedError' ] = true;
         return $par;
     }
 
@@ -88,7 +88,7 @@ 
             }
             // Is the current parent a <p> tag?
         } elseif (!empty($this->currentNesting) &&
-            $this->currentNesting[count($this->currentNesting) - 1]->name == 'p') {
+            $this->currentNesting[ count($this->currentNesting) - 1 ]->name == 'p') {
             // State 3.1: ...<p>PAR1
             //                  ----
 
@@ -220,13 +220,13 @@ 
         if ($c == 1) {
             // There were no double-newlines, abort quickly. In theory this
             // should never happen.
-            $result[] = new HTMLPurifier_Token_Text($data);
+            $result[ ] = new HTMLPurifier_Token_Text($data);
             return;
         }
         for ($i = 0; $i < $c; $i++) {
-            $par = $raw_paragraphs[$i];
+            $par = $raw_paragraphs[ $i ];
             if (trim($par) !== '') {
-                $paragraphs[] = $par;
+                $paragraphs[ ] = $par;
             } else {
                 if ($i == 0) {
                     // Double newline at the front
@@ -235,8 +235,8 @@ 
                         // injector did not add any start paragraph tokens.
                         // This means that we have been in a paragraph for
                         // a while, and the newline means we should start a new one.
-                        $result[] = new HTMLPurifier_Token_End('p');
-                        $result[] = new HTMLPurifier_Token_Text("\n\n");
+                        $result[ ] = new HTMLPurifier_Token_End('p');
+                        $result[ ] = new HTMLPurifier_Token_Text("\n\n");
                         // However, the start token should only be added if
                         // there is more processing to be done (i.e. there are
                         // real paragraphs in here). If there are none, the
@@ -265,15 +265,15 @@ 
 
         // Add the start tag indicated by \n\n at the beginning of $data
         if ($needs_start) {
-            $result[] = $this->_pStart();
+            $result[ ] = $this->_pStart();
         }
 
         // Append the paragraphs onto the result
         foreach ($paragraphs as $par) {
-            $result[] = new HTMLPurifier_Token_Text($par);
-            $result[] = new HTMLPurifier_Token_End('p');
-            $result[] = new HTMLPurifier_Token_Text("\n\n");
-            $result[] = $this->_pStart();
+            $result[ ] = new HTMLPurifier_Token_Text($par);
+            $result[ ] = new HTMLPurifier_Token_End('p');
+            $result[ ] = new HTMLPurifier_Token_Text("\n\n");
+            $result[ ] = $this->_pStart();
         }
 
         // Remove trailing start token; Injector will handle this later if
@@ -297,7 +297,7 @@ 
      */
     private function _isInline($token)
     {
-        return isset($this->htmlDefinition->info['p']->child->elements[$token->name]);
+        return isset($this->htmlDefinition->info[ 'p' ]->child->elements[ $token->name ]);
     }
 
     /**

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php

Doc Comments +1 added lines

@@ -341,6 +341,7 @@
     /**
      * Takes a string of HTML (fragment or document) and returns the content
      * @todo Consider making protected
+     * @param string $html
      */
     public function extractBody($html)
     {

Spacing +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
                     break;
                 default:
                     throw new HTMLPurifier_Exception(
-                        "Cannot instantiate unrecognized Lexer type " .
+                        "Cannot instantiate unrecognized Lexer type ".
                         htmlspecialchars($lexer)
                     );
             }
@@ -138,7 +138,7 @@ 
         // hack out something using XSLT, remove this stipulation
         if ($needs_tracking && !$inst->tracksLineNumbers) {
             throw new HTMLPurifier_Exception(
-                'Cannot use lexer that does not support line numbers with ' .
+                'Cannot use lexer that does not support line numbers with '.
                 'Core.MaintainLineNumbers or Core.CollectErrors (use DirectLex instead)'
             );
         }
@@ -192,7 +192,7 @@ 
 
         // subtracts amps that cannot possibly be escaped
         $num_amp = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string) - 1] === '&' ? 1 : 0);
+            ($string[ strlen($string) - 1 ] === '&' ? 1 : 0);
 
         if (!$num_amp) {
             return $string;
@@ -202,7 +202,7 @@ 
 
         // code duplication for sake of optimization, see above
         $num_amp_2 = substr_count($string, '&') - substr_count($string, '& ') -
-            ($string[strlen($string) - 1] === '&' ? 1 : 0);
+            ($string[ strlen($string) - 1 ] === '&' ? 1 : 0);
 
         if ($num_amp_2 <= $num_esc_amp) {
             return $string;
@@ -279,7 +279,7 @@ 
     protected static function CDATACallback($matches)
     {
         // not exactly sure why the character set is needed, but whatever
-        return htmlspecialchars($matches[1], ENT_COMPAT, 'UTF-8');
+        return htmlspecialchars($matches[ 1 ], ENT_COMPAT, 'UTF-8');
     }
 
     /**
@@ -313,7 +313,7 @@ 
         if ($config->get('Core.ConvertDocumentToFragment')) {
             $e = false;
             if ($config->get('Core.CollectErrors')) {
-                $e =& $context->get('ErrorCollector');
+                $e = & $context->get('ErrorCollector');
             }
             $new_html = $this->extractBody($html);
             if ($e && $new_html != $html) {
@@ -347,7 +347,7 @@ 
         $matches = array();
         $result = preg_match('!<body[^>]*>(.*)</body>!is', $html, $matches);
         if ($result) {
-            return $matches[1];
+            return $matches[ 1 ];
         } else {
             return $html;
         }

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php

Doc Comments +18 added lines

@@ -458,6 +458,9 @@ 
     const CHARACTR = 4;
     const EOF = 5;
 
+    /**
+     * @param string $data
+     */
     public function __construct($data)
     {
         $this->data = $data;
@@ -478,6 +481,9 @@ 
         return $this->tree->save();
     }
 
+    /**
+     * @return string
+     */
     private function char()
     {
         return ($this->char < $this->EOF)
@@ -485,6 +491,11 @@ 
             : false;
     }
 
+    /**
+     * @param integer $s
+     *
+     * @return string
+     */
     private function character($s, $l = 0)
     {
         if ($s + $l < $this->EOF) {
@@ -496,6 +507,10 @@ 
         }
     }
 
+    /**
+     * @param string $char_class
+     * @param integer $start
+     */
     private function characters($char_class, $start)
     {
         return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start));
@@ -4645,6 +4660,9 @@ 
         }
     }
 
+    /**
+     * @param string[] $elements
+     */
     private function clearStackToTableContext($elements)
     {
         /* When the steps above require the UA to clear the stack back to a

Spacing +304 added lines, -304 removed lines

@@ -469,7 +469,7 @@ 
         $this->state = 'data';
 
         while ($this->state !== null) {
-            $this->{$this->state . 'State'}();
+            $this->{$this->state.'State'}();
         }
     }
 
@@ -481,7 +481,7 @@ 
     private function char()
     {
         return ($this->char < $this->EOF)
-            ? $this->data[$this->char]
+            ? $this->data[ $this->char ]
             : false;
     }
 
@@ -489,7 +489,7 @@ 
     {
         if ($s + $l < $this->EOF) {
             if ($l === 0) {
-                return $this->data[$s];
+                return $this->data[ $s ];
             } else {
                 return substr($this->data, $s, $l);
             }
@@ -498,7 +498,7 @@ 
 
     private function characters($char_class, $start)
     {
-        return preg_replace('#^([' . $char_class . ']+).*#s', '\\1', substr($this->data, $start));
+        return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
     }
 
     private function dataState()
@@ -845,7 +845,7 @@ 
             /* Anything else
             Append the current input character to the current tag token's tag name.
             Stay in the tag name state. */
-            $this->token['name'] .= strtolower($char);
+            $this->token[ 'name' ] .= strtolower($char);
             $this->state = 'tagName';
         }
     }
@@ -891,7 +891,7 @@ 
             Start a new attribute in the current tag token. Set that attribute's
             name to the current input character, and its value to the empty string.
             Switch to the attribute name state. */
-            $this->token['attr'][] = array(
+            $this->token[ 'attr' ][ ] = array(
                 'name' => strtolower($char),
                 'value' => null
             );
@@ -945,8 +945,8 @@ 
             /* Anything else
             Append the current input character to the current attribute's name.
             Stay in the attribute name state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['name'] .= strtolower($char);
+            $last = count($this->token[ 'attr' ]) - 1;
+            $this->token[ 'attr' ][ $last ][ 'name' ] .= strtolower($char);
 
             $this->state = 'attributeName';
         }
@@ -998,7 +998,7 @@ 
             Start a new attribute in the current tag token. Set that attribute's
             name to the current input character, and its value to the empty string.
             Switch to the attribute name state. */
-            $this->token['attr'][] = array(
+            $this->token[ 'attr' ][ ] = array(
                 'name' => strtolower($char),
                 'value' => null
             );
@@ -1049,8 +1049,8 @@ 
             /* Anything else
             Append the current input character to the current attribute's value.
             Switch to the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
+            $last = count($this->token[ 'attr' ]) - 1;
+            $this->token[ 'attr' ][ $last ][ 'value' ] .= $char;
 
             $this->state = 'attributeValueUnquoted';
         }
@@ -1085,8 +1085,8 @@ 
             /* Anything else
             Append the current input character to the current attribute's value.
             Stay in the attribute value (double-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
+            $last = count($this->token[ 'attr' ]) - 1;
+            $this->token[ 'attr' ][ $last ][ 'value' ] .= $char;
 
             $this->state = 'attributeValueDoubleQuoted';
         }
@@ -1121,8 +1121,8 @@ 
             /* Anything else
             Append the current input character to the current attribute's value.
             Stay in the attribute value (single-quoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
+            $last = count($this->token[ 'attr' ]) - 1;
+            $this->token[ 'attr' ][ $last ][ 'value' ] .= $char;
 
             $this->state = 'attributeValueSingleQuoted';
         }
@@ -1158,8 +1158,8 @@ 
             /* Anything else
             Append the current input character to the current attribute's value.
             Stay in the attribute value (unquoted) state. */
-            $last = count($this->token['attr']) - 1;
-            $this->token['attr'][$last]['value'] .= $char;
+            $last = count($this->token[ 'attr' ]) - 1;
+            $this->token[ 'attr' ][ $last ][ 'value' ] .= $char;
 
             $this->state = 'attributeValueUnquoted';
         }
@@ -1177,8 +1177,8 @@ 
             ? '&'
             : $entity;
 
-        $last = count($this->token['attr']) - 1;
-        $this->token['attr'][$last]['value'] .= $char;
+        $last = count($this->token[ 'attr' ]) - 1;
+        $this->token[ 'attr' ][ $last ][ 'value' ] .= $char;
     }
 
     private function bogusCommentState()
@@ -1262,7 +1262,7 @@ 
         } else {
             /* Append the input character to the comment token's data. Stay in
             the comment state. */
-            $this->token['data'] .= $char;
+            $this->token[ 'data' ] .= $char;
         }
     }
 
@@ -1289,7 +1289,7 @@ 
         } else {
             /* Append a U+002D HYPHEN-MINUS (-) character and the input
             character to the comment token's data. Switch to the comment state. */
-            $this->token['data'] .= '-' . $char;
+            $this->token[ 'data' ] .= '-'.$char;
             $this->state = 'comment';
         }
     }
@@ -1305,7 +1305,7 @@ 
             $this->state = 'data';
 
         } elseif ($char === '-') {
-            $this->token['data'] .= '-';
+            $this->token[ 'data' ] .= '-';
 
         } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
@@ -1313,7 +1313,7 @@ 
             $this->state = 'data';
 
         } else {
-            $this->token['data'] .= '--' . $char;
+            $this->token[ 'data' ] .= '--'.$char;
             $this->state = 'comment';
         }
     }
@@ -1399,7 +1399,7 @@ 
             $this->state = 'data';
 
         } elseif (preg_match('/^[a-z]$/', $char)) {
-            $this->token['name'] .= strtoupper($char);
+            $this->token[ 'name' ] .= strtoupper($char);
 
         } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
@@ -1407,10 +1407,10 @@ 
             $this->state = 'data';
 
         } else {
-            $this->token['name'] .= $char;
+            $this->token[ 'name' ] .= $char;
         }
 
-        $this->token['error'] = ($this->token['name'] === 'HTML')
+        $this->token[ 'error' ] = ($this->token[ 'name' ] === 'HTML')
             ? false
             : true;
     }
@@ -1434,7 +1434,7 @@ 
             $this->state = 'data';
 
         } else {
-            $this->token['error'] = true;
+            $this->token[ 'error' ] = true;
             $this->state = 'bogusDoctype';
         }
     }
@@ -1523,8 +1523,8 @@ 
                     $this->char++;
 
                     if (in_array($id, $this->entities)) {
-                        if ($e_name[$c - 1] !== ';') {
-                            if ($c < $len && $e_name[$c] == ';') {
+                        if ($e_name[ $c - 1 ] !== ';') {
+                            if ($c < $len && $e_name[ $c ] == ';') {
                                 $this->char++; // consume extra semicolon
                             }
                         }
@@ -1547,7 +1547,7 @@ 
 
         // Return a character token for the character corresponding to the
         // entity name (as given by the second column of the entities table).
-        return html_entity_decode('&' . $entity . ';', ENT_QUOTES, 'UTF-8');
+        return html_entity_decode('&'.$entity.';', ENT_QUOTES, 'UTF-8');
     }
 
     private function emitToken($token)
@@ -1557,7 +1557,7 @@ 
         if (is_int($emit)) {
             $this->content_model = $emit;
 
-        } elseif ($token['type'] === self::ENDTAG) {
+        } elseif ($token[ 'type' ] === self::ENDTAG) {
             $this->content_model = self::PCDATA;
         }
     }
@@ -1740,13 +1740,13 @@ 
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE
         An end-of-file token */
-        if ((isset($token['error']) && $token['error']) ||
-            $token['type'] === HTML5::COMMENT ||
-            $token['type'] === HTML5::STARTTAG ||
-            $token['type'] === HTML5::ENDTAG ||
-            $token['type'] === HTML5::EOF ||
-            ($token['type'] === HTML5::CHARACTR && isset($token['data']) &&
-                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data']))
+        if ((isset($token[ 'error' ]) && $token[ 'error' ]) ||
+            $token[ 'type' ] === HTML5::COMMENT ||
+            $token[ 'type' ] === HTML5::STARTTAG ||
+            $token[ 'type' ] === HTML5::ENDTAG ||
+            $token[ 'type' ] === HTML5::EOF ||
+            ($token[ 'type' ] === HTML5::CHARACTR && isset($token[ 'data' ]) &&
+                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ]))
         ) {
             /* This specification does not define how to handle this case. In
             particular, user agents may ignore the entirety of this specification
@@ -1757,7 +1757,7 @@ 
             return $this->rootElementPhase($token);
 
             /* A DOCTYPE token marked as being correct */
-        } elseif (isset($token['error']) && !$token['error']) {
+        } elseif (isset($token[ 'error' ]) && !$token[ 'error' ]) {
             /* Append a DocumentType node to the Document  node, with the name
             attribute set to the name given in the DOCTYPE token (which will be
             "HTML"), and the other attributes specific to DocumentType objects
@@ -1771,13 +1771,13 @@ 
             /* A character token that is one of one of U+0009 CHARACTER TABULATION,
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE */
-        } elseif (isset($token['data']) && preg_match(
+        } elseif (isset($token[ 'data' ]) && preg_match(
                 '/^[\t\n\x0b\x0c ]+$/',
-                $token['data']
+                $token[ 'data' ]
             )
         ) {
             /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
+            $text = $this->dom->createTextNode($token[ 'data' ]);
             $this->dom->appendChild($text);
         }
     }
@@ -1788,24 +1788,24 @@ 
         stage, it must be processed as described in this section. */
 
         /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
+        if ($token[ 'type' ] === HTML5::DOCTYPE) {
             // Parse error. Ignore the token.
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the Document object with the data
             attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
+            $comment = $this->dom->createComment($token[ 'data' ]);
             $this->dom->appendChild($comment);
 
             /* A character token that is one of one of U+0009 CHARACTER TABULATION,
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE */
-        } elseif ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        } elseif ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
+            $text = $this->dom->createTextNode($token[ 'data' ]);
             $this->dom->appendChild($text);
 
             /* A character token that is not one of U+0009 CHARACTER TABULATION,
@@ -1814,18 +1814,18 @@ 
             A start tag token
             An end tag token
             An end-of-file token */
-        } elseif (($token['type'] === HTML5::CHARACTR &&
-                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-            $token['type'] === HTML5::STARTTAG ||
-            $token['type'] === HTML5::ENDTAG ||
-            $token['type'] === HTML5::EOF
+        } elseif (($token[ 'type' ] === HTML5::CHARACTR &&
+                !preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])) ||
+            $token[ 'type' ] === HTML5::STARTTAG ||
+            $token[ 'type' ] === HTML5::ENDTAG ||
+            $token[ 'type' ] === HTML5::EOF
         ) {
             /* Create an HTMLElement node with the tag name html, in the HTML
             namespace. Append it to the Document object. Switch to the main
             phase and reprocess the current token. */
             $html = $this->dom->createElement('html');
             $this->dom->appendChild($html);
-            $this->stack[] = $html;
+            $this->stack[ ] = $html;
 
             $this->phase = self::MAIN_PHASE;
             return $this->mainPhase($token);
@@ -1837,11 +1837,11 @@ 
         /* Tokens in the main phase must be handled as follows: */
 
         /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
+        if ($token[ 'type' ] === HTML5::DOCTYPE) {
             // Parse error. Ignore the token.
 
             /* A start tag token with the tag name "html" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'html') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'html') {
             /* If this start tag token was not the first start tag token, then
             it is a parse error. */
 
@@ -1849,14 +1849,14 @@ 
             is already present on the top element of the stack of open elements.
             If it is not, add the attribute and its corresponding value to that
             element. */
-            foreach ($token['attr'] as $attr) {
-                if (!$this->stack[0]->hasAttribute($attr['name'])) {
-                    $this->stack[0]->setAttribute($attr['name'], $attr['value']);
+            foreach ($token[ 'attr' ] as $attr) {
+                if (!$this->stack[ 0 ]->hasAttribute($attr[ 'name' ])) {
+                    $this->stack[ 0 ]->setAttribute($attr[ 'name' ], $attr[ 'value' ]);
                 }
             }
 
             /* An end-of-file token */
-        } elseif ($token['type'] === HTML5::EOF) {
+        } elseif ($token[ 'type' ] === HTML5::EOF) {
             /* Generate implied end tags. */
             $this->generateImpliedEndTags();
 
@@ -1920,20 +1920,20 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data attribute
             set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
             /* A start tag token with the tag name "head" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'head') {
             /* Create an element for the token, append the new element to the
             current node and push it onto the stack of open elements. */
             $element = $this->insertElement($token);
@@ -1949,11 +1949,11 @@ 
             Or a character token that is not one of U+0009 CHARACTER TABULATION,
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE. Or any other start tag token */
-        } elseif ($token['type'] === HTML5::STARTTAG ||
-            ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
-            ($token['type'] === HTML5::CHARACTR && !preg_match(
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG ||
+            ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'html') ||
+            ($token[ 'type' ] === HTML5::CHARACTR && !preg_match(
                     '/^[\t\n\x0b\x0c ]$/',
-                    $token['data']
+                    $token[ 'data' ]
                 ))
         ) {
             /* Act as if a start tag token with the tag name "head" and no
@@ -1969,7 +1969,7 @@ 
             return $this->inHead($token);
 
             /* Any other end tag */
-        } elseif ($token['type'] === HTML5::ENDTAG) {
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG) {
             /* Parse error. Ignore the token. */
         }
     }
@@ -1985,30 +1985,30 @@ 
         THIS DIFFERS FROM THE SPEC: If the current node is either a title, style
         or script element, append the character to the current node regardless
         of its content. */
-        if (($token['type'] === HTML5::CHARACTR &&
-                preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) || (
-                $token['type'] === HTML5::CHARACTR && in_array(
+        if (($token[ 'type' ] === HTML5::CHARACTR &&
+                preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])) || (
+                $token[ 'type' ] === HTML5::CHARACTR && in_array(
                     end($this->stack)->nodeName,
                     array('title', 'style', 'script')
                 ))
         ) {
             /* Append the character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data attribute
             set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('title', 'style', 'script'))
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            in_array($token[ 'name' ], array('title', 'style', 'script'))
         ) {
             array_pop($this->stack);
             return HTML5::PCDATA;
 
             /* A start tag with the tag name "title" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'title') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'title') {
             /* Create an element for the token and append the new element to the
             node pointed to by the head element pointer, or, if that is null
             (innerHTML case), to the current node. */
@@ -2024,7 +2024,7 @@ 
             return HTML5::RCDATA;
 
             /* A start tag with the tag name "style" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'style') {
             /* Create an element for the token and append the new element to the
             node pointed to by the head element pointer, or, if that is null
             (innerHTML case), to the current node. */
@@ -2040,7 +2040,7 @@ 
             return HTML5::CDATA;
 
             /* A start tag with the tag name "script" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'script') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'script') {
             /* Create an element for the token. */
             $element = $this->insertElement($token, false);
             $this->head_pointer->appendChild($element);
@@ -2049,8 +2049,8 @@ 
             return HTML5::CDATA;
 
             /* A start tag with the tag name "base", "link", or "meta" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array('base', 'link', 'meta')
             )
         ) {
@@ -2067,7 +2067,7 @@ 
             }
 
             /* An end tag with the tag name "head" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'head') {
             /* If the current node is a head element, pop the current node off
             the stack of open elements. */
             if ($this->head_pointer->isSameNode(end($this->stack))) {
@@ -2082,8 +2082,8 @@ 
             $this->mode = self::AFTER_HEAD;
 
             /* A start tag with the tag name "head" or an end tag except "html". */
-        } elseif (($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
-            ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')
+        } elseif (($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'head') ||
+            ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] !== 'html')
         ) {
             // Parse error. Ignore the token.
 
@@ -2116,20 +2116,20 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data attribute
             set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
             /* A start tag token with the tag name "body" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'body') {
             /* Insert a body element for the token. */
             $this->insertElement($token);
 
@@ -2137,7 +2137,7 @@ 
             $this->mode = self::IN_BODY;
 
             /* A start tag token with the tag name "frameset" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'frameset') {
             /* Insert a frameset element for the token. */
             $this->insertElement($token);
 
@@ -2146,8 +2146,8 @@ 
 
             /* A start tag token whose tag name is one of: "base", "link", "meta",
             "script", "style", "title" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array('base', 'link', 'meta', 'script', 'style', 'title')
             )
         ) {
@@ -2176,25 +2176,25 @@ 
     {
         /* Handle the token as follows: */
 
-        switch ($token['type']) {
+        switch ($token[ 'type' ]) {
             /* A character token */
             case HTML5::CHARACTR:
                 /* Reconstruct the active formatting elements, if any. */
                 $this->reconstructActiveFormattingElements();
 
                 /* Append the token's character to the current node. */
-                $this->insertText($token['data']);
+                $this->insertText($token[ 'data' ]);
                 break;
 
             /* A comment token */
             case HTML5::COMMENT:
                 /* Append a Comment node to the current node with the data
                 attribute set to the data given in the comment token. */
-                $this->insertComment($token['data']);
+                $this->insertComment($token[ 'data' ]);
                 break;
 
             case HTML5::STARTTAG:
-                switch ($token['name']) {
+                switch ($token[ 'name' ]) {
                     /* A start tag token whose tag name is one of: "script",
                     "style" */
                     case 'script':
@@ -2221,7 +2221,7 @@ 
                         elements is not a body element, or, if the stack of open
                         elements has only one node on it, then ignore the token.
                         (innerHTML case) */
-                        if (count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
+                        if (count($this->stack) === 1 || $this->stack[ 1 ]->nodeName !== 'body') {
                             // Ignore
 
                             /* Otherwise, for each attribute on the token, check to see
@@ -2230,9 +2230,9 @@ 
                             add the attribute and its corresponding value to that
                             element. */
                         } else {
-                            foreach ($token['attr'] as $attr) {
-                                if (!$this->stack[1]->hasAttribute($attr['name'])) {
-                                    $this->stack[1]->setAttribute($attr['name'], $attr['value']);
+                            foreach ($token[ 'attr' ] as $attr) {
+                                if (!$this->stack[ 1 ]->hasAttribute($attr[ 'name' ])) {
+                                    $this->stack[ 1 ]->setAttribute($attr[ 'name' ], $attr[ 'value' ]);
                                 }
                             }
                         }
@@ -2319,13 +2319,13 @@ 
                             /* 1. Initialise node to be the current node (the
                             bottommost node of the stack). */
                             $stop = false;
-                            $node = $this->stack[$n];
+                            $node = $this->stack[ $n ];
                             $cat = $this->getElementCategory($node->tagName);
 
                             /* 2. If node is an li, dd or dt element, then pop all
                             the    nodes from the current node up to node, including
                             node, then stop this algorithm. */
-                            if ($token['name'] === $node->tagName || ($token['name'] !== 'li'
+                            if ($token[ 'name' ] === $node->tagName || ($token[ 'name' ] !== 'li'
                                     && ($node->tagName === 'dd' || $node->tagName === 'dt'))
                             ) {
                                 for ($x = $stack_length; $x >= $n; $x--) {
@@ -2416,10 +2416,10 @@ 
                         $leng = count($this->a_formatting);
 
                         for ($n = $leng - 1; $n >= 0; $n--) {
-                            if ($this->a_formatting[$n] === self::MARKER) {
+                            if ($this->a_formatting[ $n ] === self::MARKER) {
                                 break;
 
-                            } elseif ($this->a_formatting[$n]->nodeName === 'a') {
+                            } elseif ($this->a_formatting[ $n ]->nodeName === 'a') {
                                 $this->emitToken(
                                     array(
                                         'name' => 'a',
@@ -2438,7 +2438,7 @@ 
 
                         /* Add that element to the list of active formatting
                         elements. */
-                        $this->a_formatting[] = $el;
+                        $this->a_formatting[ ] = $el;
                         break;
 
                     /* A start tag whose tag name is one of: "b", "big", "em", "font",
@@ -2463,7 +2463,7 @@ 
 
                         /* Add that element to the list of active formatting
                         elements. */
-                        $this->a_formatting[] = $el;
+                        $this->a_formatting[ ] = $el;
                         break;
 
                     /* A start tag token whose tag name is "button" */
@@ -2489,7 +2489,7 @@ 
 
                         /* Insert a marker at the end of the list of active
                         formatting elements. */
-                        $this->a_formatting[] = self::MARKER;
+                        $this->a_formatting[ ] = self::MARKER;
                         break;
 
                     /* A start tag token whose tag name is one of: "marquee", "object" */
@@ -2503,7 +2503,7 @@ 
 
                         /* Insert a marker at the end of the list of active
                         formatting elements. */
-                        $this->a_formatting[] = self::MARKER;
+                        $this->a_formatting[ ] = self::MARKER;
                         break;
 
                     /* A start tag token whose tag name is "xmp" */
@@ -2583,7 +2583,7 @@ 
                     case 'image':
                         /* Parse error. Change the token's tag name to "img" and
                         reprocess it. (Don't ask.) */
-                        $token['name'] = 'img';
+                        $token[ 'name' ] = 'img';
                         return $this->inBody($token);
                         break;
 
@@ -2656,7 +2656,7 @@ 
 
                             /* Act as if a stream of character tokens had been seen. */
                             $this->insertText(
-                                'This is a searchable index. ' .
+                                'This is a searchable index. '.
                                 'Insert your search keywords here: '
                             );
 
@@ -2664,8 +2664,8 @@ 
                             had been seen, with all the attributes from the "isindex"
                             token, except with the "name" attribute set to the value
                             "isindex" (ignoring any explicit "name" attribute). */
-                            $attr = $token['attr'];
-                            $attr[] = array('name' => 'name', 'value' => 'isindex');
+                            $attr = $token[ 'attr' ];
+                            $attr[ ] = array('name' => 'name', 'value' => 'isindex');
 
                             $this->inBody(
                                 array(
@@ -2678,7 +2678,7 @@ 
                             /* Act as if a stream of character tokens had been seen
                             (see below for what they should say). */
                             $this->insertText(
-                                'This is a searchable index. ' .
+                                'This is a searchable index. '.
                                 'Insert your search keywords here: '
                             );
 
@@ -2798,13 +2798,13 @@ 
                 break;
 
             case HTML5::ENDTAG:
-                switch ($token['name']) {
+                switch ($token[ 'name' ]) {
                     /* An end tag with the tag name "body" */
                     case 'body':
                         /* If the second element in the stack of open elements is
                         not a body element, this is a parse error. Ignore the token.
                         (innerHTML case) */
-                        if (count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
+                        if (count($this->stack) < 2 || $this->stack[ 1 ]->nodeName !== 'body') {
                             // Ignore.
 
                             /* If the current node is not the body element, then this
@@ -2850,7 +2850,7 @@ 
                         /* If the stack of open elements has an element in scope
                         with the same tag name as that of the token, then generate
                         implied end tags. */
-                        if ($this->elementInScope($token['name'])) {
+                        if ($this->elementInScope($token[ 'name' ])) {
                             $this->generateImpliedEndTags();
 
                             /* Now, if the current node is not an element with
@@ -2863,7 +2863,7 @@ 
                             then pop elements from this stack until an element
                             with that tag name has been popped from the stack. */
                             for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
+                                if ($this->stack[ $n ]->nodeName === $token[ 'name' ]) {
                                     $n = -1;
                                 }
 
@@ -2877,12 +2877,12 @@ 
                         /* If the stack of open elements has an element in scope
                         with the same tag name as that of the token, then generate
                         implied    end tags. */
-                        if ($this->elementInScope($token['name'])) {
+                        if ($this->elementInScope($token[ 'name' ])) {
                             $this->generateImpliedEndTags();
 
                         }
 
-                        if (end($this->stack)->nodeName !== $token['name']) {
+                        if (end($this->stack)->nodeName !== $token[ 'name' ]) {
                             /* Now, if the current node is not an element with the
                             same tag name as that of the token, then this is a parse
                             error. */
@@ -2932,8 +2932,8 @@ 
                         whose tag name matches the tag name of the token, then
                         generate implied end tags, except for elements with the
                         same tag name as the token. */
-                        if ($this->elementInScope($token['name'])) {
-                            $this->generateImpliedEndTags(array($token['name']));
+                        if ($this->elementInScope($token[ 'name' ])) {
+                            $this->generateImpliedEndTags(array($token[ 'name' ]));
 
                             /* If the current node is not an element with the same
                             tag name as the token, then this is a parse error. */
@@ -2944,7 +2944,7 @@ 
                             pop elements from this stack until an element with that
                             tag name has been popped from the stack. */
                             for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
+                                if ($this->stack[ $n ]->nodeName === $token[ 'name' ]) {
                                     $n = -1;
                                 }
 
@@ -3007,11 +3007,11 @@ 
                         */
                         while (true) {
                             for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
-                                if ($this->a_formatting[$a] === self::MARKER) {
+                                if ($this->a_formatting[ $a ] === self::MARKER) {
                                     break;
 
-                                } elseif ($this->a_formatting[$a]->tagName === $token['name']) {
-                                    $formatting_element = $this->a_formatting[$a];
+                                } elseif ($this->a_formatting[ $a ]->tagName === $token[ 'name' ]) {
+                                    $formatting_element = $this->a_formatting[ $a ];
                                     $in_stack = in_array($formatting_element, $this->stack, true);
                                     $fe_af_pos = $a;
                                     break;
@@ -3023,7 +3023,7 @@ 
                             is not in scope, then this is a parse error. Abort
                             these steps. The token is ignored. */
                             if (!isset($formatting_element) || ($in_stack &&
-                                    !$this->elementInScope($token['name']))
+                                    !$this->elementInScope($token[ 'name' ]))
                             ) {
                                 break;
 
@@ -3032,7 +3032,7 @@ 
                                 parse error; remove the element from the list, and
                                 abort these steps. */
                             } elseif (isset($formatting_element) && !$in_stack) {
-                                unset($this->a_formatting[$fe_af_pos]);
+                                unset($this->a_formatting[ $fe_af_pos ]);
                                 $this->a_formatting = array_merge($this->a_formatting);
                                 break;
                             }
@@ -3046,10 +3046,10 @@ 
                             $length = count($this->stack);
 
                             for ($s = $fe_s_pos + 1; $s < $length; $s++) {
-                                $category = $this->getElementCategory($this->stack[$s]->nodeName);
+                                $category = $this->getElementCategory($this->stack[ $s ]->nodeName);
 
                                 if ($category !== self::PHRASING && $category !== self::FORMATTING) {
-                                    $furthest_block = $this->stack[$s];
+                                    $furthest_block = $this->stack[ $s ];
                                 }
                             }
 
@@ -3064,7 +3064,7 @@ 
                                     array_pop($this->stack);
                                 }
 
-                                unset($this->a_formatting[$fe_af_pos]);
+                                unset($this->a_formatting[ $fe_af_pos ]);
                                 $this->a_formatting = array_merge($this->a_formatting);
                                 break;
                             }
@@ -3072,7 +3072,7 @@ 
                             /* 4. Let the common ancestor be the element
                             immediately above the formatting element in the stack
                             of open elements. */
-                            $common_ancestor = $this->stack[$fe_s_pos - 1];
+                            $common_ancestor = $this->stack[ $fe_s_pos - 1 ];
 
                             /* 5. If the furthest block has a parent node, then
                             remove the furthest block from its parent node. */
@@ -3095,14 +3095,14 @@ 
                                 for ($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
                                     /* 7.1 Let node be the element immediately
                                     prior to node in the stack of open elements. */
-                                    $node = $this->stack[$n];
+                                    $node = $this->stack[ $n ];
 
                                     /* 7.2 If node is not in the list of active
                                     formatting elements, then remove node from
                                     the stack of open elements and then go back
                                     to step 1. */
                                     if (!in_array($node, $this->a_formatting, true)) {
-                                        unset($this->stack[$n]);
+                                        unset($this->stack[ $n ]);
                                         $this->stack = array_merge($this->stack);
 
                                     } else {
@@ -3135,8 +3135,8 @@ 
                                     $s_pos = array_search($node, $this->stack, true);
                                     $a_pos = array_search($node, $this->a_formatting, true);
 
-                                    $this->stack[$s_pos] = $clone;
-                                    $this->a_formatting[$a_pos] = $clone;
+                                    $this->stack[ $s_pos ] = $clone;
+                                    $this->a_formatting[ $a_pos ] = $clone;
                                     $node = $clone;
                                 }
 
@@ -3183,7 +3183,7 @@ 
                             into the list of active formatting elements at the
                             position of the aforementioned bookmark. */
                             $fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
-                            unset($this->a_formatting[$fe_af_pos]);
+                            unset($this->a_formatting[ $fe_af_pos ]);
                             $this->a_formatting = array_merge($this->a_formatting);
 
                             $af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
@@ -3197,7 +3197,7 @@ 
                             furthest block in that stack. */
                             $fe_s_pos = array_search($formatting_element, $this->stack, true);
                             $fb_s_pos = array_search($furthest_block, $this->stack, true);
-                            unset($this->stack[$fe_s_pos]);
+                            unset($this->stack[ $fe_s_pos ]);
 
                             $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
                             $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
@@ -3216,7 +3216,7 @@ 
                         /* If the stack of open elements has an element in scope whose
                         tag name matches the tag name of the token, then generate implied
                         tags. */
-                        if ($this->elementInScope($token['name'])) {
+                        if ($this->elementInScope($token[ 'name' ])) {
                             $this->generateImpliedEndTags();
 
                             /* Now, if the current node is not an element with the same
@@ -3229,7 +3229,7 @@ 
                             the stack, and clear the list of active formatting elements up
                             to the last marker. */
                             for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                                if ($this->stack[$n]->nodeName === $token['name']) {
+                                if ($this->stack[ $n ]->nodeName === $token[ 'name' ]) {
                                     $n = -1;
                                 }
 
@@ -3279,7 +3279,7 @@ 
 
                             /* If node has the same tag name as the end tag token,
                             then: */
-                            if ($token['name'] === $node->nodeName) {
+                            if ($token[ 'name' ] === $node->nodeName) {
                                 /* Generate implied end tags. */
                                 $this->generateImpliedEndTags();
 
@@ -3319,30 +3319,30 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
+            $text = $this->dom->createTextNode($token[ 'data' ]);
             end($this->stack)->appendChild($text);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data
             attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
+            $comment = $this->dom->createComment($token[ 'data' ]);
             end($this->stack)->appendChild($comment);
 
             /* A start tag whose tag name is "caption" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'caption'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'caption'
         ) {
             /* Clear the stack back to a table context. */
             $this->clearStackToTableContext($clear);
 
             /* Insert a marker at the end of the list of active
             formatting elements. */
-            $this->a_formatting[] = self::MARKER;
+            $this->a_formatting[ ] = self::MARKER;
 
             /* Insert an HTML element for the token, then switch the
             insertion mode to "in caption". */
@@ -3350,8 +3350,8 @@ 
             $this->mode = self::IN_CAPTION;
 
             /* A start tag whose tag name is "colgroup" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'colgroup'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'colgroup'
         ) {
             /* Clear the stack back to a table context. */
             $this->clearStackToTableContext($clear);
@@ -3362,8 +3362,8 @@ 
             $this->mode = self::IN_CGROUP;
 
             /* A start tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'col'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'col'
         ) {
             $this->inTable(
                 array(
@@ -3376,8 +3376,8 @@ 
             $this->inColumnGroup($token);
 
             /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array('tbody', 'tfoot', 'thead')
             )
         ) {
@@ -3390,8 +3390,8 @@ 
             $this->mode = self::IN_TBODY;
 
             /* A start tag whose tag name is one of: "td", "th", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            in_array($token['name'], array('td', 'th', 'tr'))
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            in_array($token[ 'name' ], array('td', 'th', 'tr'))
         ) {
             /* Act as if a start tag token with the tag name "tbody" had been
             seen, then reprocess the current token. */
@@ -3406,8 +3406,8 @@ 
             return $this->inTableBody($token);
 
             /* A start tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'table'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'table'
         ) {
             /* Parse error. Act as if an end tag token with the tag name "table"
             had been seen, then, if that token wasn't ignored, reprocess the
@@ -3422,13 +3422,13 @@ 
             return $this->mainPhase($token);
 
             /* An end tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'table'
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            $token[ 'name' ] === 'table'
         ) {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 return false;
 
                 /* Otherwise: */
@@ -3457,8 +3457,8 @@ 
 
             /* An end tag whose tag name is one of: "body", "caption", "col",
             "colgroup", "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array(
                     'body',
                     'caption',
@@ -3501,8 +3501,8 @@ 
                 element is the element before the last table element in the
                 stack of open elements. */
                 for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                    if ($this->stack[$n]->nodeName === 'table') {
-                        $table = $this->stack[$n];
+                    if ($this->stack[ $n ]->nodeName === 'table') {
+                        $table = $this->stack[ $n ];
                         break;
                     }
                 }
@@ -3511,12 +3511,12 @@ 
                     $this->foster_parent = $table->parentNode;
 
                 } elseif (!isset($table)) {
-                    $this->foster_parent = $this->stack[0];
+                    $this->foster_parent = $this->stack[ 0 ];
 
                 } elseif (isset($table) && ($table->parentNode === null ||
                         $table->parentNode->nodeType !== XML_ELEMENT_NODE)
                 ) {
-                    $this->foster_parent = $this->stack[$n - 1];
+                    $this->foster_parent = $this->stack[ $n - 1 ];
                 }
             }
 
@@ -3527,11 +3527,11 @@ 
     private function inCaption($token)
     {
         /* An end tag whose tag name is "caption" */
-        if ($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
+        if ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'caption') {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore
 
                 /* Otherwise: */
@@ -3565,8 +3565,8 @@ 
             /* A start tag whose tag name is one of: "caption", "col", "colgroup",
             "tbody", "td", "tfoot", "th", "thead", "tr", or an end tag whose tag
             name is "table" */
-        } elseif (($token['type'] === HTML5::STARTTAG && in_array(
-                    $token['name'],
+        } elseif (($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                    $token[ 'name' ],
                     array(
                         'caption',
                         'col',
@@ -3578,8 +3578,8 @@ 
                         'thead',
                         'tr'
                     )
-                )) || ($token['type'] === HTML5::ENDTAG &&
-                $token['name'] === 'table')
+                )) || ($token[ 'type' ] === HTML5::ENDTAG &&
+                $token[ 'name' ] === 'table')
         ) {
             /* Parse error. Act as if an end tag with the tag name "caption"
             had been seen, then, if that token wasn't ignored, reprocess the
@@ -3595,8 +3595,8 @@ 
 
             /* An end tag whose tag name is one of: "body", "col", "colgroup",
             "html", "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array(
                     'body',
                     'col',
@@ -3624,30 +3624,30 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
+            $text = $this->dom->createTextNode($token[ 'data' ]);
             end($this->stack)->appendChild($text);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data
             attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
+            $comment = $this->dom->createComment($token[ 'data' ]);
             end($this->stack)->appendChild($comment);
 
             /* A start tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::STARTTAG && $token['name'] === 'col') {
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'col') {
             /* Insert a col element for the token. Immediately pop the current
             node off the stack of open elements. */
             $this->insertElement($token);
             array_pop($this->stack);
 
             /* An end tag whose tag name is "colgroup" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'colgroup'
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            $token[ 'name' ] === 'colgroup'
         ) {
             /* If the current node is the root html element, then this is a
             parse error, ignore the token. (innerHTML case) */
@@ -3663,7 +3663,7 @@ 
             }
 
             /* An end tag whose tag name is "col" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'col') {
             /* Parse error. Ignore the token. */
 
             /* Anything else */
@@ -3686,7 +3686,7 @@ 
         $clear = array('tbody', 'tfoot', 'thead', 'html');
 
         /* A start tag whose tag name is "tr" */
-        if ($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
+        if ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'tr') {
             /* Clear the stack back to a table body context. */
             $this->clearStackToTableContext($clear);
 
@@ -3696,8 +3696,8 @@ 
             $this->mode = self::IN_ROW;
 
             /* A start tag whose tag name is one of: "th", "td" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            ($token['name'] === 'th' || $token['name'] === 'td')
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            ($token[ 'name' ] === 'th' || $token[ 'name' ] === 'td')
         ) {
             /* Parse error. Act as if a start tag with the tag name "tr" had
             been seen, then reprocess the current token. */
@@ -3712,13 +3712,13 @@ 
             return $this->inRow($token);
 
             /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('tbody', 'tfoot', 'thead'))
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            in_array($token[ 'name' ], array('tbody', 'tfoot', 'thead'))
         ) {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore
 
                 /* Otherwise: */
@@ -3734,11 +3734,11 @@ 
 
             /* A start tag whose tag name is one of: "caption", "col", "colgroup",
             "tbody", "tfoot", "thead", or an end tag whose tag name is "table" */
-        } elseif (($token['type'] === HTML5::STARTTAG && in_array(
-                    $token['name'],
+        } elseif (($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                    $token[ 'name' ],
                     array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead')
                 )) ||
-            ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')
+            ($token[ 'type' ] === HTML5::STARTTAG && $token[ 'name' ] === 'table')
         ) {
             /* If the stack of open elements does not have a tbody, thead, or
             tfoot element in table scope, this is a parse error. Ignore the
@@ -3766,8 +3766,8 @@ 
 
             /* An end tag whose tag name is one of: "body", "caption", "col",
             "colgroup", "html", "td", "th", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
             )
         ) {
@@ -3785,8 +3785,8 @@ 
         $clear = array('tr', 'html');
 
         /* A start tag whose tag name is one of: "th", "td" */
-        if ($token['type'] === HTML5::STARTTAG &&
-            ($token['name'] === 'th' || $token['name'] === 'td')
+        if ($token[ 'type' ] === HTML5::STARTTAG &&
+            ($token[ 'name' ] === 'th' || $token[ 'name' ] === 'td')
         ) {
             /* Clear the stack back to a table row context. */
             $this->clearStackToTableContext($clear);
@@ -3798,14 +3798,14 @@ 
 
             /* Insert a marker at the end of the list of active formatting
             elements. */
-            $this->a_formatting[] = self::MARKER;
+            $this->a_formatting[ ] = self::MARKER;
 
             /* An end tag whose tag name is "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'tr') {
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'tr') {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore.
 
                 /* Otherwise: */
@@ -3822,8 +3822,8 @@ 
 
             /* A start tag whose tag name is one of: "caption", "col", "colgroup",
             "tbody", "tfoot", "thead", "tr" or an end tag whose tag name is "table" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr')
             )
         ) {
@@ -3839,13 +3839,13 @@ 
             return $this->inCell($token);
 
             /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            in_array($token['name'], array('tbody', 'tfoot', 'thead'))
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            in_array($token[ 'name' ], array('tbody', 'tfoot', 'thead'))
         ) {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore.
 
                 /* Otherwise: */
@@ -3864,8 +3864,8 @@ 
 
             /* An end tag whose tag name is one of: "body", "caption", "col",
             "colgroup", "html", "td", "th" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr')
             )
         ) {
@@ -3881,20 +3881,20 @@ 
     private function inCell($token)
     {
         /* An end tag whose tag name is one of: "td", "th" */
-        if ($token['type'] === HTML5::ENDTAG &&
-            ($token['name'] === 'td' || $token['name'] === 'th')
+        if ($token[ 'type' ] === HTML5::ENDTAG &&
+            ($token[ 'name' ] === 'td' || $token[ 'name' ] === 'th')
         ) {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as that of the token, then this is a
             parse error and the token must be ignored. */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore.
 
                 /* Otherwise: */
             } else {
                 /* Generate implied end tags, except for elements with the same
                 tag name as the token. */
-                $this->generateImpliedEndTags(array($token['name']));
+                $this->generateImpliedEndTags(array($token[ 'name' ]));
 
                 /* Now, if the current node is not an element with the same tag
                 name as the token, then this is a parse error. */
@@ -3906,7 +3906,7 @@ 
                     $node = end($this->stack)->nodeName;
                     array_pop($this->stack);
 
-                    if ($node === $token['name']) {
+                    if ($node === $token[ 'name' ]) {
                         break;
                     }
                 }
@@ -3922,8 +3922,8 @@ 
 
             /* A start tag whose tag name is one of: "caption", "col", "colgroup",
             "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array(
                     'caption',
                     'col',
@@ -3952,8 +3952,8 @@ 
 
             /* A start tag whose tag name is one of: "caption", "col", "colgroup",
             "tbody", "td", "tfoot", "th", "thead", "tr" */
-        } elseif ($token['type'] === HTML5::STARTTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG && in_array(
+                $token[ 'name' ],
                 array(
                     'caption',
                     'col',
@@ -3982,8 +3982,8 @@ 
 
             /* An end tag whose tag name is one of: "body", "caption", "col",
             "colgroup", "html" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array('body', 'caption', 'col', 'colgroup', 'html')
             )
         ) {
@@ -3991,8 +3991,8 @@ 
 
             /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
             "thead", "tr" */
-        } elseif ($token['type'] === HTML5::ENDTAG && in_array(
-                $token['name'],
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && in_array(
+                $token[ 'name' ],
                 array('table', 'tbody', 'tfoot', 'thead', 'tr')
             )
         ) {
@@ -4000,7 +4000,7 @@ 
             scope with the same tag name as that of the token (which can only
             happen for "tbody", "tfoot" and "thead", or, in the innerHTML case),
             then this is a parse error and the token must be ignored. */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // Ignore.
 
                 /* Otherwise, close the cell (see below) and reprocess the current
@@ -4022,19 +4022,19 @@ 
         /* Handle the token as follows: */
 
         /* A character token */
-        if ($token['type'] === HTML5::CHARACTR) {
+        if ($token[ 'type' ] === HTML5::CHARACTR) {
             /* Append the token's character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data
             attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
             /* A start tag token whose tag name is "option" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'option'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'option'
         ) {
             /* If the current node is an option element, act as if an end tag
             with the tag name "option" had been seen. */
@@ -4051,8 +4051,8 @@ 
             $this->insertElement($token);
 
             /* A start tag token whose tag name is "optgroup" */
-        } elseif ($token['type'] === HTML5::STARTTAG &&
-            $token['name'] === 'optgroup'
+        } elseif ($token[ 'type' ] === HTML5::STARTTAG &&
+            $token[ 'name' ] === 'optgroup'
         ) {
             /* If the current node is an option element, act as if an end tag
             with the tag name "option" had been seen. */
@@ -4080,8 +4080,8 @@ 
             $this->insertElement($token);
 
             /* An end tag token whose tag name is "optgroup" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'optgroup'
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            $token[ 'name' ] === 'optgroup'
         ) {
             /* First, if the current node is an option element, and the node
             immediately before it in the stack of open elements is an optgroup
@@ -4089,8 +4089,8 @@ 
             been seen. */
             $elements_in_stack = count($this->stack);
 
-            if ($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
-                $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup'
+            if ($this->stack[ $elements_in_stack - 1 ]->nodeName === 'option' &&
+                $this->stack[ $elements_in_stack - 2 ]->nodeName === 'optgroup'
             ) {
                 $this->inSelect(
                     array(
@@ -4103,13 +4103,13 @@ 
             /* If the current node is an optgroup element, then pop that node
             from the stack of open elements. Otherwise, this is a parse error,
             ignore the token. */
-            if ($this->stack[$elements_in_stack - 1] === 'optgroup') {
+            if ($this->stack[ $elements_in_stack - 1 ] === 'optgroup') {
                 array_pop($this->stack);
             }
 
             /* An end tag token whose tag name is "option" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'option'
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            $token[ 'name' ] === 'option'
         ) {
             /* If the current node is an option element, then pop that node
             from the stack of open elements. Otherwise, this is a parse error,
@@ -4119,13 +4119,13 @@ 
             }
 
             /* An end tag whose tag name is "select" */
-        } elseif ($token['type'] === HTML5::ENDTAG &&
-            $token['name'] === 'select'
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG &&
+            $token[ 'name' ] === 'select'
         ) {
             /* If the stack of open elements does not have an element in table
             scope with the same tag name as the token, this is a parse error.
             Ignore the token. (innerHTML case) */
-            if (!$this->elementInScope($token['name'], true)) {
+            if (!$this->elementInScope($token[ 'name' ], true)) {
                 // w/e
 
                 /* Otherwise: */
@@ -4146,8 +4146,8 @@ 
             }
 
             /* A start tag whose tag name is "select" */
-        } elseif ($token['name'] === 'select' &&
-            $token['type'] === HTML5::STARTTAG
+        } elseif ($token[ 'name' ] === 'select' &&
+            $token[ 'type' ] === HTML5::STARTTAG
         ) {
             /* Parse error. Act as if the token had been an end tag with the
             tag name "select" instead. */
@@ -4161,7 +4161,7 @@ 
             /* An end tag whose tag name is one of: "caption", "table", "tbody",
             "tfoot", "thead", "tr", "td", "th" */
         } elseif (in_array(
-                $token['name'],
+                $token[ 'name' ],
                 array(
                     'caption',
                     'table',
@@ -4172,7 +4172,7 @@ 
                     'td',
                     'th'
                 )
-            ) && $token['type'] === HTML5::ENDTAG
+            ) && $token[ 'type' ] === HTML5::ENDTAG
         ) {
             /* Parse error. */
             // w/e
@@ -4181,7 +4181,7 @@ 
             the same tag name as that of the token, then act as if an end tag
             with the tag name "select" had been seen, and reprocess the token.
             Otherwise, ignore the token. */
-            if ($this->elementInScope($token['name'], true)) {
+            if ($this->elementInScope($token[ 'name' ], true)) {
                 $this->inSelect(
                     array(
                         'name' => 'select',
@@ -4205,23 +4205,23 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Process the token as it would be processed if the insertion mode
             was "in body". */
             $this->inBody($token);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the first element in the stack of open
             elements (the html element), with the data attribute set to the
             data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
-            $this->stack[0]->appendChild($comment);
+            $comment = $this->dom->createComment($token[ 'data' ]);
+            $this->stack[ 0 ]->appendChild($comment);
 
             /* An end tag with the tag name "html" */
-        } elseif ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') {
+        } elseif ($token[ 'type' ] === HTML5::ENDTAG && $token[ 'name' ] === 'html') {
             /* If the parser was originally created in order to handle the
             setting of an element's innerHTML attribute, this is a parse error;
             ignore the token. (The element will be an html element in this
@@ -4246,27 +4246,27 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data
             attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
             /* A start tag with the tag name "frameset" */
-        } elseif ($token['name'] === 'frameset' &&
-            $token['type'] === HTML5::STARTTAG
+        } elseif ($token[ 'name' ] === 'frameset' &&
+            $token[ 'type' ] === HTML5::STARTTAG
         ) {
             $this->insertElement($token);
 
             /* An end tag with the tag name "frameset" */
-        } elseif ($token['name'] === 'frameset' &&
-            $token['type'] === HTML5::ENDTAG
+        } elseif ($token[ 'name' ] === 'frameset' &&
+            $token[ 'type' ] === HTML5::ENDTAG
         ) {
             /* If the current node is the root html element, then this is a
             parse error; ignore the token. (innerHTML case) */
@@ -4286,8 +4286,8 @@ 
             }
 
             /* A start tag with the tag name "frame" */
-        } elseif ($token['name'] === 'frame' &&
-            $token['type'] === HTML5::STARTTAG
+        } elseif ($token[ 'name' ] === 'frame' &&
+            $token[ 'type' ] === HTML5::STARTTAG
         ) {
             /* Insert an HTML element for the token. */
             $this->insertElement($token);
@@ -4296,8 +4296,8 @@ 
             array_pop($this->stack);
 
             /* A start tag with the tag name "noframes" */
-        } elseif ($token['name'] === 'noframes' &&
-            $token['type'] === HTML5::STARTTAG
+        } elseif ($token[ 'name' ] === 'noframes' &&
+            $token[ 'type' ] === HTML5::STARTTAG
         ) {
             /* Process the token as if the insertion mode had been "in body". */
             $this->inBody($token);
@@ -4315,28 +4315,28 @@ 
         /* A character token that is one of one of U+0009 CHARACTER TABULATION,
         U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
         U+000D CARRIAGE RETURN (CR), or U+0020 SPACE */
-        if ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        if ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Append the character to the current node. */
-            $this->insertText($token['data']);
+            $this->insertText($token[ 'data' ]);
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the current node with the data
             attribute set to the data given in the comment token. */
-            $this->insertComment($token['data']);
+            $this->insertComment($token[ 'data' ]);
 
             /* An end tag with the tag name "html" */
-        } elseif ($token['name'] === 'html' &&
-            $token['type'] === HTML5::ENDTAG
+        } elseif ($token[ 'name' ] === 'html' &&
+            $token[ 'type' ] === HTML5::ENDTAG
         ) {
             /* Switch to the trailing end phase. */
             $this->phase = self::END_PHASE;
 
             /* A start tag with the tag name "noframes" */
-        } elseif ($token['name'] === 'noframes' &&
-            $token['type'] === HTML5::STARTTAG
+        } elseif ($token[ 'name' ] === 'noframes' &&
+            $token[ 'type' ] === HTML5::STARTTAG
         ) {
             /* Process the token as if the insertion mode had been "in body". */
             $this->inBody($token);
@@ -4353,21 +4353,21 @@ 
         stage, it must be processed as described in this section. */
 
         /* A DOCTYPE token */
-        if ($token['type'] === HTML5::DOCTYPE) {
+        if ($token[ 'type' ] === HTML5::DOCTYPE) {
             // Parse error. Ignore the token.
 
             /* A comment token */
-        } elseif ($token['type'] === HTML5::COMMENT) {
+        } elseif ($token[ 'type' ] === HTML5::COMMENT) {
             /* Append a Comment node to the Document object with the data
             attribute set to the data given in the comment token. */
-            $comment = $this->dom->createComment($token['data']);
+            $comment = $this->dom->createComment($token[ 'data' ]);
             $this->dom->appendChild($comment);
 
             /* A character token that is one of one of U+0009 CHARACTER TABULATION,
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE */
-        } elseif ($token['type'] === HTML5::CHARACTR &&
-            preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])
+        } elseif ($token[ 'type' ] === HTML5::CHARACTR &&
+            preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])
         ) {
             /* Process the token as it would be processed in the main phase. */
             $this->mainPhase($token);
@@ -4375,9 +4375,9 @@ 
             /* A character token that is not one of U+0009 CHARACTER TABULATION,
             U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM FEED (FF),
             or U+0020 SPACE. Or a start tag token. Or an end tag token. */
-        } elseif (($token['type'] === HTML5::CHARACTR &&
-                preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
-            $token['type'] === HTML5::STARTTAG || $token['type'] === HTML5::ENDTAG
+        } elseif (($token[ 'type' ] === HTML5::CHARACTR &&
+                preg_match('/^[\t\n\x0b\x0c ]+$/', $token[ 'data' ])) ||
+            $token[ 'type' ] === HTML5::STARTTAG || $token[ 'type' ] === HTML5::ENDTAG
         ) {
             /* Parse error. Switch back to the main phase and reprocess the
             token. */
@@ -4385,7 +4385,7 @@ 
             return $this->mainPhase($token);
 
             /* An end-of-file token */
-        } elseif ($token['type'] === HTML5::EOF) {
+        } elseif ($token[ 'type' ] === HTML5::EOF) {
             /* OMG DONE!! */
         }
     }
@@ -4396,25 +4396,25 @@ 
         if ($check) {
             // Slightly modified HTML5 tag-name modification,
             // removing anything that's not an ASCII letter, digit, or hyphen
-            $token['name'] = preg_replace('/[^a-z0-9-]/i', '', $token['name']);
+            $token[ 'name' ] = preg_replace('/[^a-z0-9-]/i', '', $token[ 'name' ]);
             // Remove leading hyphens and numbers
-            $token['name'] = ltrim($token['name'], '-0..9');
+            $token[ 'name' ] = ltrim($token[ 'name' ], '-0..9');
             // In theory, this should ever be needed, but just in case
-            if ($token['name'] === '') {
-                $token['name'] = 'span';
+            if ($token[ 'name' ] === '') {
+                $token[ 'name' ] = 'span';
             } // arbitrary generic choice
         }
 
-        $el = $this->dom->createElement($token['name']);
+        $el = $this->dom->createElement($token[ 'name' ]);
 
-        foreach ($token['attr'] as $attr) {
-            if (!$el->hasAttribute($attr['name'])) {
-                $el->setAttribute($attr['name'], $attr['value']);
+        foreach ($token[ 'attr' ] as $attr) {
+            if (!$el->hasAttribute($attr[ 'name' ])) {
+                $el->setAttribute($attr[ 'name' ], $attr[ 'value' ]);
             }
         }
 
         $this->appendToRealParent($el);
-        $this->stack[] = $el;
+        $this->stack[ ] = $el;
 
         return $el;
     }
@@ -4444,10 +4444,10 @@ 
             otherwise, the new node must be appended to the foster parent
             element. */
             for ($n = count($this->stack) - 1; $n >= 0; $n--) {
-                if ($this->stack[$n]->nodeName === 'table' &&
-                    $this->stack[$n]->parentNode !== null
+                if ($this->stack[ $n ]->nodeName === 'table' &&
+                    $this->stack[ $n ]->parentNode !== null
                 ) {
-                    $table = $this->stack[$n];
+                    $table = $this->stack[ $n ];
                     break;
                 }
             }
@@ -4479,7 +4479,7 @@ 
         for ($n = 0; $n < $leng; $n++) {
             /* 1. Initialise node to be the current node (the bottommost node of
             the stack). */
-            $node = $this->stack[$leng - 1 - $n];
+            $node = $this->stack[ $leng - 1 - $n ];
 
             if ($node->tagName === $el) {
                 /* 2. If node is the target node, terminate in a match state. */
@@ -4555,7 +4555,7 @@ 
             /* 5. Let entry be the entry one earlier than entry in the list of
             active formatting elements. */
             $a--;
-            $entry = $this->a_formatting[$a];
+            $entry = $this->a_formatting[ $a ];
 
             /* 6. If entry is neither a marker nor an element that is also in
             thetack of open elements, go to step 4. */
@@ -4569,7 +4569,7 @@ 
             active formatting elements. */
             if (isset($step_seven) && $step_seven === true) {
                 $a++;
-                $entry = $this->a_formatting[$a];
+                $entry = $this->a_formatting[ $a ];
             }
 
             /* 8. Perform a shallow clone of the element entry to obtain clone. */
@@ -4578,11 +4578,11 @@ 
             /* 9. Append clone to the current node and push it onto the stack
             of open elements  so that it is the new current node. */
             end($this->stack)->appendChild($clone);
-            $this->stack[] = $clone;
+            $this->stack[ ] = $clone;
 
             /* 10. Replace the entry for entry in the list with an entry for
             clone. */
-            $this->a_formatting[$a] = $clone;
+            $this->a_formatting[ $a ] = $clone;
 
             /* 11. If the entry for clone in the list of active formatting
             elements is not the last entry in the list, return to step 7. */
@@ -4671,13 +4671,13 @@ 
 
         for ($n = $leng - 1; $n >= 0; $n--) {
             /* 2. Let node be the last node in the stack of open elements. */
-            $node = $this->stack[$n];
+            $node = $this->stack[ $n ];
 
             /* 3. If node is the first node in the stack of open elements, then
             set last to true. If the element whose innerHTML  attribute is being
             set is neither a td  element nor a th element, then set node to the
             element whose innerHTML  attribute is being set. (innerHTML  case) */
-            if ($this->stack[0]->isSameNode($node)) {
+            if ($this->stack[ 0 ]->isSameNode($node)) {
                 $last = true;
             }
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer.php

Doc Comments +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
     /**
      * Prints a simple key/value row in a table.
      * @param string $name Key
-     * @param mixed $value Value
+     * @param string $value Value
      * @return string
      */
     protected function row($name, $value)

Spacing +10 added lines, -10 removed lines

@@ -77,8 +77,8 @@ 
      */
     protected function element($tag, $contents, $attr = array(), $escape = true)
     {
-        return $this->start($tag, $attr) .
-            ($escape ? $this->escape($contents) : $contents) .
+        return $this->start($tag, $attr).
+            ($escape ? $this->escape($contents) : $contents).
             $this->end($tag);
     }
 
@@ -117,9 +117,9 @@ 
             $value = $value ? 'On' : 'Off';
         }
         return
-            $this->start('tr') . "\n" .
-            $this->element('th', $name) . "\n" .
-            $this->element('td', $value) . "\n" .
+            $this->start('tr')."\n".
+            $this->element('th', $name)."\n".
+            $this->element('td', $value)."\n".
             $this->end('tr');
     }
 
@@ -173,7 +173,7 @@ 
         if ($five === null) {
             $five = version_compare(PHP_VERSION, '5', '>=');
         }
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
+        $prefix = 'HTMLPurifier_'.$sec_prefix;
         if (!$five) {
             $prefix = strtolower($prefix);
         }
@@ -184,23 +184,23 @@ 
             case 'enum':
                 $values = array();
                 foreach ($obj->valid_values as $value => $bool) {
-                    $values[] = $value;
+                    $values[ ] = $value;
                 }
                 $class .= implode(', ', $values);
                 break;
             case 'css_composite':
                 $values = array();
                 foreach ($obj->defs as $def) {
-                    $values[] = $this->getClass($def, $sec_prefix);
+                    $values[ ] = $this->getClass($def, $sec_prefix);
                 }
                 $class .= implode(', ', $values);
                 break;
             case 'css_multiple':
-                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
+                $class .= $this->getClass($obj->single, $sec_prefix).', ';
                 $class .= $obj->max;
                 break;
             case 'css_denyelementdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
+                $class .= $this->getClass($obj->def, $sec_prefix).', ';
                 $class .= $obj->element;
                 break;
             case 'css_importantdecorator':

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php

Doc Comments +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
 
     /**
      * Sets default column and row size for textareas in sub-printers
-     * @param $cols Integer columns of textarea, null to use default
-     * @param $rows Integer rows of textarea, null to use default
+     * @param integer $cols Integer columns of textarea, null to use default
+     * @param integer $rows Integer rows of textarea, null to use default
      */
     public function setTextareaDimensions($cols = null, $rows = null)
     {
@@ -84,7 +84,7 @@ 
 
     /**
      * Returns HTML output for a configuration form
-     * @param HTMLPurifier_Config|array $config Configuration object of current form state, or an array
+     * @param HTMLPurifier_Config $config Configuration object of current form state, or an array
      *        where [0] has an HTML namespace and [1] is being rendered.
      * @param array|bool $allowed Optional namespace(s) and directives to restrict form to.
      * @param bool $render_controls

Spacing +44 added lines, -44 removed lines

@@ -47,8 +47,8 @@ 
         $this->name = $name;
         $this->compress = $compress;
         // initialize sub-printers
-        $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
+        $this->fields[ 0 ] = new HTMLPurifier_Printer_ConfigForm_default();
+        $this->fields[ HTMLPurifier_VarParser::BOOL ] = new HTMLPurifier_Printer_ConfigForm_bool();
     }
 
     /**
@@ -59,10 +59,10 @@ 
     public function setTextareaDimensions($cols = null, $rows = null)
     {
         if ($cols) {
-            $this->fields['default']->cols = $cols;
+            $this->fields[ 'default' ]->cols = $cols;
         }
         if ($rows) {
-            $this->fields['default']->rows = $rows;
+            $this->fields[ 'default' ]->rows = $rows;
         }
     }
 
@@ -71,7 +71,7 @@ 
      */
     public static function getCSS()
     {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
+        return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.css');
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public static function getJavaScript()
     {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
+        return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.js');
     }
 
     /**
@@ -92,9 +92,9 @@ 
      */
     public function render($config, $allowed = true, $render_controls = true)
     {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
+        if (is_array($config) && isset($config[ 0 ])) {
+            $gen_config = $config[ 0 ];
+            $config = $config[ 1 ];
         } else {
             $gen_config = $config;
         }
@@ -107,7 +107,7 @@ 
         $all = array();
         foreach ($allowed as $key) {
             list($ns, $directive) = $key;
-            $all[$ns][$directive] = $config->get($ns . '.' . $directive);
+            $all[ $ns ][ $directive ] = $config->get($ns.'.'.$directive);
         }
 
         $ret = '';
@@ -163,8 +163,8 @@ 
             if (!$this->compress || (strlen($directive) < $this->compress)) {
                 $directive_disp = $directive;
             } else {
-                $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
-                $attr['title'] = $directive;
+                $directive_disp = substr($directive, 0, $this->compress - 2).'...';
+                $attr[ 'title' ] = $directive;
             }
 
             $ret .= $this->element(
@@ -179,7 +179,7 @@ 
             $ret .= $this->end('th');
 
             $ret .= $this->start('td');
-            $def = $this->config->def->info["$ns.$directive"];
+            $def = $this->config->def->info[ "$ns.$directive" ];
             if (is_int($def)) {
                 $allow_null = $def < 0;
                 $type = abs($def);
@@ -187,10 +187,10 @@ 
                 $type = $def->type;
                 $allow_null = isset($def->allow_null);
             }
-            if (!isset($this->fields[$type])) {
+            if (!isset($this->fields[ $type ])) {
                 $type = 0;
             } // default
-            $type_obj = $this->fields[$type];
+            $type_obj = $this->fields[ $type ];
             if ($allow_null) {
                 $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
             }
@@ -234,9 +234,9 @@ 
      */
     public function render($ns, $directive, $value, $name, $config)
     {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
+        if (is_array($config) && isset($config[ 0 ])) {
+            $gen_config = $config[ 0 ];
+            $config = $config[ 1 ];
         } else {
             $gen_config = $config;
         }
@@ -251,18 +251,18 @@ 
             'type' => 'checkbox',
             'value' => '1',
             'class' => 'null-toggle',
-            'name' => "$name" . "[Null_$ns.$directive]",
+            'name' => "$name"."[Null_$ns.$directive]",
             'id' => "$name:Null_$ns.$directive",
             'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
         );
         if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
             // modify inline javascript slightly
-            $attr['onclick'] =
-                "toggleWriteability('$name:Yes_$ns.$directive',checked);" .
+            $attr[ 'onclick' ] =
+                "toggleWriteability('$name:Yes_$ns.$directive',checked);".
                 "toggleWriteability('$name:No_$ns.$directive',checked)";
         }
         if ($value === null) {
-            $attr['checked'] = 'checked';
+            $attr[ 'checked' ] = 'checked';
         }
         $ret .= $this->elementEmpty('input', $attr);
         $ret .= $this->text(' or ');
@@ -297,16 +297,16 @@ 
      */
     public function render($ns, $directive, $value, $name, $config)
     {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
+        if (is_array($config) && isset($config[ 0 ])) {
+            $gen_config = $config[ 0 ];
+            $config = $config[ 1 ];
         } else {
             $gen_config = $config;
         }
         $this->prepareGenerator($gen_config);
         // this should probably be split up a little
         $ret = '';
-        $def = $config->def->info["$ns.$directive"];
+        $def = $config->def->info[ "$ns.$directive" ];
         if (is_int($def)) {
             $type = abs($def);
         } else {
@@ -318,7 +318,7 @@ 
                     $array = $value;
                     $value = array();
                     foreach ($array as $val => $b) {
-                        $value[] = $val;
+                        $value[ ] = $val;
                     }
                     //TODO does this need a break?
                 case HTMLPurifier_VarParser::ALIST:
@@ -327,7 +327,7 @@ 
                 case HTMLPurifier_VarParser::HASH:
                     $nvalue = '';
                     foreach ($value as $i => $v) {
-                        $nvalue .= "$i:$v" . PHP_EOL;
+                        $nvalue .= "$i:$v".PHP_EOL;
                     }
                     $value = $nvalue;
                     break;
@@ -340,18 +340,18 @@ 
             $value = serialize($value);
         }
         $attr = array(
-            'name' => "$name" . "[$ns.$directive]",
+            'name' => "$name"."[$ns.$directive]",
             'id' => "$name:$ns.$directive"
         );
         if ($value === null) {
-            $attr['disabled'] = 'disabled';
+            $attr[ 'disabled' ] = 'disabled';
         }
         if (isset($def->allowed)) {
             $ret .= $this->start('select', $attr);
             foreach ($def->allowed as $val => $b) {
                 $attr = array();
                 if ($value == $val) {
-                    $attr['selected'] = 'selected';
+                    $attr[ 'selected' ] = 'selected';
                 }
                 $ret .= $this->element('option', $val, $attr);
             }
@@ -361,14 +361,14 @@ 
                 $type === HTMLPurifier_VarParser::ALIST ||
                 $type === HTMLPurifier_VarParser::HASH ||
                 $type === HTMLPurifier_VarParser::LOOKUP) {
-            $attr['cols'] = $this->cols;
-            $attr['rows'] = $this->rows;
+            $attr[ 'cols' ] = $this->cols;
+            $attr[ 'rows' ] = $this->rows;
             $ret .= $this->start('textarea', $attr);
             $ret .= $this->text($value);
             $ret .= $this->end('textarea');
         } else {
-            $attr['value'] = $value;
-            $attr['type'] = 'text';
+            $attr[ 'value' ] = $value;
+            $attr[ 'type' ] = 'text';
             $ret .= $this->elementEmpty('input', $attr);
         }
         return $ret;
@@ -390,9 +390,9 @@ 
      */
     public function render($ns, $directive, $value, $name, $config)
     {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
+        if (is_array($config) && isset($config[ 0 ])) {
+            $gen_config = $config[ 0 ];
+            $config = $config[ 1 ];
         } else {
             $gen_config = $config;
         }
@@ -407,15 +407,15 @@ 
 
         $attr = array(
             'type' => 'radio',
-            'name' => "$name" . "[$ns.$directive]",
+            'name' => "$name"."[$ns.$directive]",
             'id' => "$name:Yes_$ns.$directive",
             'value' => '1'
         );
         if ($value === true) {
-            $attr['checked'] = 'checked';
+            $attr[ 'checked' ] = 'checked';
         }
         if ($value === null) {
-            $attr['disabled'] = 'disabled';
+            $attr[ 'disabled' ] = 'disabled';
         }
         $ret .= $this->elementEmpty('input', $attr);
 
@@ -426,15 +426,15 @@ 
 
         $attr = array(
             'type' => 'radio',
-            'name' => "$name" . "[$ns.$directive]",
+            'name' => "$name"."[$ns.$directive]",
             'id' => "$name:No_$ns.$directive",
             'value' => '0'
         );
         if ($value === false) {
-            $attr['checked'] = 'checked';
+            $attr[ 'checked' ] = 'checked';
         }
         if ($value === null) {
-            $attr['disabled'] = 'disabled';
+            $attr[ 'disabled' ] = 'disabled';
         }
         $ret .= $this->elementEmpty('input', $attr);
 

vendor/ezyang/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php

Doc Comments +3 added lines, -1 removed lines

@@ -528,9 +528,10 @@ 
      * being the current one) will be deleted.
      *
      * @param HTMLPurifier_Token|array|int|bool $token Token substitution value
-     * @param HTMLPurifier_Injector|int $injector Injector that performed the substitution; default is if
+     * @param integer $injector Injector that performed the substitution; default is if
      *        this is not an injector related operation.
      * @throws HTMLPurifier_Exception
+     * @return HTMLPurifier_Token
      */
     protected function processToken($token, $injector = -1)
     {
@@ -577,6 +578,7 @@ 
      * Inserts a token before the current token. Cursor now points to
      * this token.  You must reprocess after this.
      * @param HTMLPurifier_Token $token
+     * @return HTMLPurifier_Token
      */
     private function insertBefore($token)
     {

Indentation +2 added lines, -2 removed lines

@@ -151,8 +151,8 @@
 
         // isset is in loop because $tokens size changes during loop exec
         for (;;
-             // only increment if we don't need to reprocess
-             $reprocess ? $reprocess = false : $token = $zipper->next($token)) {
+                // only increment if we don't need to reprocess
+                $reprocess ? $reprocess = false : $token = $zipper->next($token)) {
 
             // check for a rewind
             if (is_int($i)) {

Spacing +53 added lines, -53 removed lines

@@ -82,10 +82,10 @@ 
         $stack = array();
 
         // member variables
-        $this->stack =& $stack;
-        $this->tokens =& $tokens;
-        $this->token =& $token;
-        $this->zipper =& $zipper;
+        $this->stack = & $stack;
+        $this->tokens = & $tokens;
+        $this->token = & $token;
+        $this->zipper = & $zipper;
         $this->config = $config;
         $this->context = $context;
 
@@ -100,8 +100,8 @@ 
 
         $injectors = $config->getBatch('AutoFormat');
         $def_injectors = $definition->info_injector;
-        $custom_injectors = $injectors['Custom'];
-        unset($injectors['Custom']); // special case
+        $custom_injectors = $injectors[ 'Custom' ];
+        unset($injectors[ 'Custom' ]); // special case
         foreach ($injectors as $injector => $b) {
             // XXX: Fix with a legitimate lookup table of enabled filters
             if (strpos($injector, '.') !== false) {
@@ -111,11 +111,11 @@ 
             if (!$b) {
                 continue;
             }
-            $this->injectors[] = new $injector;
+            $this->injectors[ ] = new $injector;
         }
         foreach ($def_injectors as $injector) {
             // assumed to be objects
-            $this->injectors[] = $injector;
+            $this->injectors[ ] = $injector;
         }
         foreach ($custom_injectors as $injector) {
             if (!$injector) {
@@ -125,7 +125,7 @@ 
                 $injector = "HTMLPurifier_Injector_$injector";
                 $injector = new $injector;
             }
-            $this->injectors[] = $injector;
+            $this->injectors[ ] = $injector;
         }
 
         // give the injectors references to the definition and context
@@ -159,19 +159,19 @@ 
                 // possibility: disable rewinding if the current token has a
                 // rewind set on it already. This would offer protection from
                 // infinite loop, but might hinder some advanced rewinding.
-                $rewind_offset = $this->injectors[$i]->getRewindOffset();
+                $rewind_offset = $this->injectors[ $i ]->getRewindOffset();
                 if (is_int($rewind_offset)) {
                     for ($j = 0; $j < $rewind_offset; $j++) {
                         if (empty($zipper->front)) break;
                         $token = $zipper->prev($token);
                         // indicate that other injectors should not process this token,
                         // but we need to reprocess it
-                        unset($token->skip[$i]);
+                        unset($token->skip[ $i ]);
                         $token->rewind = $i;
                         if ($token instanceof HTMLPurifier_Token_Start) {
                             array_pop($this->stack);
                         } elseif ($token instanceof HTMLPurifier_Token_End) {
-                            $this->stack[] = $token->start;
+                            $this->stack[ ] = $token->start;
                         }
                     }
                 }
@@ -187,10 +187,10 @@ 
 
                 // peek
                 $top_nesting = array_pop($this->stack);
-                $this->stack[] = $top_nesting;
+                $this->stack[ ] = $top_nesting;
 
                 // send error [TagClosedSuppress]
-                if ($e && !isset($top_nesting->armor['MakeWellFormed_TagClosedError'])) {
+                if ($e && !isset($top_nesting->armor[ 'MakeWellFormed_TagClosedError' ])) {
                     $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by document end', $top_nesting);
                 }
 
@@ -209,7 +209,7 @@ 
             if (empty($token->is_tag)) {
                 if ($token instanceof HTMLPurifier_Token_Text) {
                     foreach ($this->injectors as $i => $injector) {
-                        if (isset($token->skip[$i])) {
+                        if (isset($token->skip[ $i ])) {
                             continue;
                         }
                         if ($token->rewind !== null && $token->rewind !== $i) {
@@ -227,8 +227,8 @@ 
                 continue;
             }
 
-            if (isset($definition->info[$token->name])) {
-                $type = $definition->info[$token->name]->child->type;
+            if (isset($definition->info[ $token->name ])) {
+                $type = $definition->info[ $token->name ]->child->type;
             } else {
                 $type = false; // Type is unknown, treat accordingly
             }
@@ -279,25 +279,25 @@ 
                     // of "easy")
 
                     $parent = array_pop($this->stack);
-                    $this->stack[] = $parent;
+                    $this->stack[ ] = $parent;
 
                     $parent_def = null;
                     $parent_elements = null;
                     $autoclose = false;
-                    if (isset($definition->info[$parent->name])) {
-                        $parent_def = $definition->info[$parent->name];
+                    if (isset($definition->info[ $parent->name ])) {
+                        $parent_def = $definition->info[ $parent->name ];
                         $parent_elements = $parent_def->child->getAllowedElements($config);
-                        $autoclose = !isset($parent_elements[$token->name]);
+                        $autoclose = !isset($parent_elements[ $token->name ]);
                     }
 
-                    if ($autoclose && $definition->info[$token->name]->wrap) {
+                    if ($autoclose && $definition->info[ $token->name ]->wrap) {
                         // Check if an element can be wrapped by another
                         // element to make it valid in a context (for
                         // example, <ul><ul> needs a <li> in between)
-                        $wrapname = $definition->info[$token->name]->wrap;
-                        $wrapdef = $definition->info[$wrapname];
+                        $wrapname = $definition->info[ $token->name ]->wrap;
+                        $wrapdef = $definition->info[ $wrapname ];
                         $elements = $wrapdef->child->getAllowedElements($config);
-                        if (isset($elements[$token->name]) && isset($parent_elements[$wrapname])) {
+                        if (isset($elements[ $token->name ]) && isset($parent_elements[ $wrapname ])) {
                             $newtoken = new HTMLPurifier_Token_Start($wrapname);
                             $token = $this->insertBefore($newtoken);
                             $reprocess = true;
@@ -313,19 +313,19 @@ 
                     if ($autoclose) {
                         // check if this autoclose is doomed to fail
                         // (this rechecks $parent, which his harmless)
-                        $autoclose_ok = isset($global_parent_allowed_elements[$token->name]);
+                        $autoclose_ok = isset($global_parent_allowed_elements[ $token->name ]);
                         if (!$autoclose_ok) {
                             foreach ($this->stack as $ancestor) {
-                                $elements = $definition->info[$ancestor->name]->child->getAllowedElements($config);
-                                if (isset($elements[$token->name])) {
+                                $elements = $definition->info[ $ancestor->name ]->child->getAllowedElements($config);
+                                if (isset($elements[ $token->name ])) {
                                     $autoclose_ok = true;
                                     break;
                                 }
-                                if ($definition->info[$token->name]->wrap) {
-                                    $wrapname = $definition->info[$token->name]->wrap;
-                                    $wrapdef = $definition->info[$wrapname];
+                                if ($definition->info[ $token->name ]->wrap) {
+                                    $wrapname = $definition->info[ $token->name ]->wrap;
+                                    $wrapdef = $definition->info[ $wrapname ];
                                     $wrap_elements = $wrapdef->child->getAllowedElements($config);
-                                    if (isset($wrap_elements[$token->name]) && isset($elements[$wrapname])) {
+                                    if (isset($wrap_elements[ $token->name ]) && isset($elements[ $wrapname ])) {
                                         $autoclose_ok = true;
                                         break;
                                     }
@@ -337,7 +337,7 @@ 
                             $new_token = new HTMLPurifier_Token_End($parent->name);
                             $new_token->start = $parent;
                             // [TagClosedSuppress]
-                            if ($e && !isset($parent->armor['MakeWellFormed_TagClosedError'])) {
+                            if ($e && !isset($parent->armor[ 'MakeWellFormed_TagClosedError' ])) {
                                 if (!$carryover) {
                                     $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag auto closed', $parent);
                                 } else {
@@ -347,7 +347,7 @@ 
                             if ($carryover) {
                                 $element = clone $parent;
                                 // [TagClosedAuto]
-                                $element->armor['MakeWellFormed_TagClosedError'] = true;
+                                $element->armor[ 'MakeWellFormed_TagClosedError' ] = true;
                                 $element->carryover = true;
                                 $token = $this->processToken(array($new_token, $token, $element));
                             } else {
@@ -366,7 +366,7 @@ 
 
             if ($ok) {
                 foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) {
+                    if (isset($token->skip[ $i ])) {
                         continue;
                     }
                     if ($token->rewind !== null && $token->rewind !== $i) {
@@ -381,7 +381,7 @@ 
                 if (!$reprocess) {
                     // ah, nothing interesting happened; do normal processing
                     if ($token instanceof HTMLPurifier_Token_Start) {
-                        $this->stack[] = $token;
+                        $this->stack[ ] = $token;
                     } elseif ($token instanceof HTMLPurifier_Token_End) {
                         throw new HTMLPurifier_Exception(
                             'Improper handling of end tag in start code; possible error in MakeWellFormed'
@@ -421,7 +421,7 @@ 
             if ($current_parent->name == $token->name) {
                 $token->start = $current_parent;
                 foreach ($this->injectors as $i => $injector) {
-                    if (isset($token->skip[$i])) {
+                    if (isset($token->skip[ $i ])) {
                         continue;
                     }
                     if ($token->rewind !== null && $token->rewind !== $i) {
@@ -430,7 +430,7 @@ 
                     $r = $token;
                     $injector->handleEnd($r);
                     $token = $this->processToken($r, $i);
-                    $this->stack[] = $current_parent;
+                    $this->stack[ ] = $current_parent;
                     $reprocess = true;
                     break;
                 }
@@ -440,7 +440,7 @@ 
             // okay, so we're trying to close the wrong tag
 
             // undo the pop previous pop
-            $this->stack[] = $current_parent;
+            $this->stack[ ] = $current_parent;
 
             // scroll back the entire nest, trying to find our tag.
             // (feature could be to specify how far you'd like to go)
@@ -448,7 +448,7 @@ 
             // -2 because -1 is the last element, but we already checked that
             $skipped_tags = false;
             for ($j = $size - 2; $j >= 0; $j--) {
-                if ($this->stack[$j]->name == $token->name) {
+                if ($this->stack[ $j ]->name == $token->name) {
                     $skipped_tags = array_slice($this->stack, $j);
                     break;
                 }
@@ -477,8 +477,8 @@ 
                 for ($j = $c - 1; $j > 0; $j--) {
                     // notice we exclude $j == 0, i.e. the current ending tag, from
                     // the errors... [TagClosedSuppress]
-                    if (!isset($skipped_tags[$j]->armor['MakeWellFormed_TagClosedError'])) {
-                        $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[$j]);
+                    if (!isset($skipped_tags[ $j ]->armor[ 'MakeWellFormed_TagClosedError' ])) {
+                        $e->send(E_NOTICE, 'Strategy_MakeWellFormed: Tag closed by element end', $skipped_tags[ $j ]);
                     }
                 }
             }
@@ -487,15 +487,15 @@ 
             $replace = array($token);
             for ($j = 1; $j < $c; $j++) {
                 // ...as well as from the insertions
-                $new_token = new HTMLPurifier_Token_End($skipped_tags[$j]->name);
-                $new_token->start = $skipped_tags[$j];
+                $new_token = new HTMLPurifier_Token_End($skipped_tags[ $j ]->name);
+                $new_token->start = $skipped_tags[ $j ];
                 array_unshift($replace, $new_token);
-                if (isset($definition->info[$new_token->name]) && $definition->info[$new_token->name]->formatting) {
+                if (isset($definition->info[ $new_token->name ]) && $definition->info[ $new_token->name ]->formatting) {
                     // [TagClosedAuto]
-                    $element = clone $skipped_tags[$j];
+                    $element = clone $skipped_tags[ $j ];
                     $element->carryover = true;
-                    $element->armor['MakeWellFormed_TagClosedError'] = true;
-                    $replace[] = $element;
+                    $element->armor[ 'MakeWellFormed_TagClosedError' ] = true;
+                    $replace[ ] = $element;
                 }
             }
             $token = $this->processToken($replace);
@@ -547,10 +547,10 @@ 
         if (!is_array($token)) {
             throw new HTMLPurifier_Exception('Invalid token type from injector');
         }
-        if (!is_int($token[0])) {
+        if (!is_int($token[ 0 ])) {
             array_unshift($token, 1);
         }
-        if ($token[0] === 0) {
+        if ($token[ 0 ] === 0) {
             throw new HTMLPurifier_Exception('Deleting zero tokens is not valid');
         }
 
@@ -562,10 +562,10 @@ 
 
         if ($injector > -1) {
             // determine appropriate skips
-            $oldskip = isset($old[0]) ? $old[0]->skip : array();
+            $oldskip = isset($old[ 0 ]) ? $old[ 0 ]->skip : array();
             foreach ($token as $object) {
                 $object->skip = $oldskip;
-                $object->skip[$injector] = true;
+                $object->skip[ $injector ] = true;
             }
         }
 
@@ -584,7 +584,7 @@ 
         // differences
         $splice = $this->zipper->splice($this->token, 0, array($token));
 
-        return $splice[1];
+        return $splice[ 1 ];
     }
 
     /**

Braces +3 added lines, -1 removed lines

@@ -162,7 +162,9 @@
                 $rewind_offset = $this->injectors[$i]->getRewindOffset();
                 if (is_int($rewind_offset)) {
                     for ($j = 0; $j < $rewind_offset; $j++) {
-                        if (empty($zipper->front)) break;
+                        if (empty($zipper->front)) {
+                            break;
+                        }
                         $token = $zipper->prev($token);
                         // indicate that other injectors should not process this token,
                         // but we need to reprocess it

vendor/michelf/php-markdown/Michelf/Markdown.php

Doc Comments +16 added lines

@@ -25,6 +25,9 @@ 
 
 	### Simple Function Interface ###
 
+	/**
+	 * @param string $text
+	 */
 	public static function defaultTransform($text) {
 	#
 	# Initialize the parser and return the result of its transform method.
@@ -931,6 +934,10 @@ 
 
 	protected $list_level = 0;
 
+	/**
+	 * @param string $list_str
+	 * @param string $marker_any_re
+	 */
 	protected function processListItems($list_str, $marker_any_re) {
 	#
 	#	Process the contents of a single ordered or unordered list, splitting it
@@ -1034,6 +1041,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function makeCodeSpan($code) {
 	#
 	# Create a code span markup for $code. Called from handleSpanToken.
@@ -1311,6 +1321,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	protected function encodeAttribute($text) {
 	#
 	# Encode text for a double-quoted HTML attribute. This function
@@ -1551,6 +1564,9 @@ 
 	# hanlde UTF-8 if the default function does not exist.
 	protected $utf8_strlen = 'mb_strlen';
 	
+	/**
+	 * @param string $text
+	 */
 	protected function detab($text) {
 	#
 	# Replace tabs with the appropriate amount of space.

Indentation +1159 added lines, -1159 removed lines

@@ -19,193 +19,193 @@ 
 
 class Markdown implements MarkdownInterface {
 
-	### Version ###
+    ### Version ###
 
-	const  MARKDOWNLIB_VERSION  =  "1.5.0";
+    const  MARKDOWNLIB_VERSION  =  "1.5.0";
 
-	### Simple Function Interface ###
+    ### Simple Function Interface ###
 
-	public static function defaultTransform($text) {
-	#
-	# Initialize the parser and return the result of its transform method.
-	# This will work fine for derived classes too.
-	#
-		# Take parser class on which this function was called.
-		$parser_class = \get_called_class();
+    public static function defaultTransform($text) {
+    #
+    # Initialize the parser and return the result of its transform method.
+    # This will work fine for derived classes too.
+    #
+        # Take parser class on which this function was called.
+        $parser_class = \get_called_class();
 
-		# try to take parser from the static parser list
-		static $parser_list;
-		$parser =& $parser_list[$parser_class];
+        # try to take parser from the static parser list
+        static $parser_list;
+        $parser =& $parser_list[$parser_class];
 
-		# create the parser it not already set
-		if (!$parser)
-			$parser = new $parser_class;
+        # create the parser it not already set
+        if (!$parser)
+            $parser = new $parser_class;
 
-		# Transform text using parser.
-		return $parser->transform($text);
-	}
+        # Transform text using parser.
+        return $parser->transform($text);
+    }
 
-	### Configuration Variables ###
+    ### Configuration Variables ###
 
-	# Change to ">" for HTML output.
-	public $empty_element_suffix = " />";
-	public $tab_width = 4;
+    # Change to ">" for HTML output.
+    public $empty_element_suffix = " />";
+    public $tab_width = 4;
 	
-	# Change to `true` to disallow markup or entities.
-	public $no_markup = false;
-	public $no_entities = false;
+    # Change to `true` to disallow markup or entities.
+    public $no_markup = false;
+    public $no_entities = false;
 	
-	# Predefined urls and titles for reference links and images.
-	public $predef_urls = array();
-	public $predef_titles = array();
-
-	# Optional filter function for URLs
-	public $url_filter_func = null;
-
-	# Optional header id="" generation callback function.
-	public $header_id_func = null;
-
-	# Class attribute to toggle "enhanced ordered list" behaviour
-	# setting this to true will allow ordered lists to start from the index
-	# number that is defined first.  For example:
-	# 2. List item two
-	# 3. List item three
-	# 
-	# becomes
-	# <ol start="2">
-	# <li>List item two</li>
-	# <li>List item three</li>
-	# </ol>
-	public $enhanced_ordered_list = false;
-
-	### Parser Implementation ###
-
-	# Regex to match balanced [brackets].
-	# Needed to insert a maximum bracked depth while converting to PHP.
-	protected $nested_brackets_depth = 6;
-	protected $nested_brackets_re;
+    # Predefined urls and titles for reference links and images.
+    public $predef_urls = array();
+    public $predef_titles = array();
+
+    # Optional filter function for URLs
+    public $url_filter_func = null;
+
+    # Optional header id="" generation callback function.
+    public $header_id_func = null;
+
+    # Class attribute to toggle "enhanced ordered list" behaviour
+    # setting this to true will allow ordered lists to start from the index
+    # number that is defined first.  For example:
+    # 2. List item two
+    # 3. List item three
+    # 
+    # becomes
+    # <ol start="2">
+    # <li>List item two</li>
+    # <li>List item three</li>
+    # </ol>
+    public $enhanced_ordered_list = false;
+
+    ### Parser Implementation ###
+
+    # Regex to match balanced [brackets].
+    # Needed to insert a maximum bracked depth while converting to PHP.
+    protected $nested_brackets_depth = 6;
+    protected $nested_brackets_re;
 	
-	protected $nested_url_parenthesis_depth = 4;
-	protected $nested_url_parenthesis_re;
+    protected $nested_url_parenthesis_depth = 4;
+    protected $nested_url_parenthesis_re;
 
-	# Table of hash values for escaped characters:
-	protected $escape_chars = '\`*_{}[]()>#+-.!';
-	protected $escape_chars_re;
+    # Table of hash values for escaped characters:
+    protected $escape_chars = '\`*_{}[]()>#+-.!';
+    protected $escape_chars_re;
 
 
-	public function __construct() {
-	#
-	# Constructor function. Initialize appropriate member variables.
-	#
-		$this->_initDetab();
-		$this->prepareItalicsAndBold();
+    public function __construct() {
+    #
+    # Constructor function. Initialize appropriate member variables.
+    #
+        $this->_initDetab();
+        $this->prepareItalicsAndBold();
 	
-		$this->nested_brackets_re = 
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
-			str_repeat('\])*', $this->nested_brackets_depth);
+        $this->nested_brackets_re = 
+            str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+            str_repeat('\])*', $this->nested_brackets_depth);
 	
-		$this->nested_url_parenthesis_re = 
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
-			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+        $this->nested_url_parenthesis_re = 
+            str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+            str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
 		
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+        $this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
 		
-		# Sort document, block, and span gamut in ascendent priority order.
-		asort($this->document_gamut);
-		asort($this->block_gamut);
-		asort($this->span_gamut);
-	}
+        # Sort document, block, and span gamut in ascendent priority order.
+        asort($this->document_gamut);
+        asort($this->block_gamut);
+        asort($this->span_gamut);
+    }
 
 
-	# Internal hashes used during transformation.
-	protected $urls = array();
-	protected $titles = array();
-	protected $html_hashes = array();
+    # Internal hashes used during transformation.
+    protected $urls = array();
+    protected $titles = array();
+    protected $html_hashes = array();
 	
-	# Status flag to avoid invalid nesting.
-	protected $in_anchor = false;
+    # Status flag to avoid invalid nesting.
+    protected $in_anchor = false;
 	
 	
-	protected function setup() {
-	#
-	# Called before the transformation process starts to setup parser 
-	# states.
-	#
-		# Clear global hashes.
-		$this->urls = $this->predef_urls;
-		$this->titles = $this->predef_titles;
-		$this->html_hashes = array();
+    protected function setup() {
+    #
+    # Called before the transformation process starts to setup parser 
+    # states.
+    #
+        # Clear global hashes.
+        $this->urls = $this->predef_urls;
+        $this->titles = $this->predef_titles;
+        $this->html_hashes = array();
 		
-		$this->in_anchor = false;
-	}
+        $this->in_anchor = false;
+    }
 	
-	protected function teardown() {
-	#
-	# Called after the transformation process to clear any variable 
-	# which may be taking up memory unnecessarly.
-	#
-		$this->urls = array();
-		$this->titles = array();
-		$this->html_hashes = array();
-	}
-
-
-	public function transform($text) {
-	#
-	# Main function. Performs some preprocessing on the input text
-	# and pass it through the document gamut.
-	#
-		$this->setup();
+    protected function teardown() {
+    #
+    # Called after the transformation process to clear any variable 
+    # which may be taking up memory unnecessarly.
+    #
+        $this->urls = array();
+        $this->titles = array();
+        $this->html_hashes = array();
+    }
+
+
+    public function transform($text) {
+    #
+    # Main function. Performs some preprocessing on the input text
+    # and pass it through the document gamut.
+    #
+        $this->setup();
 	
-		# Remove UTF-8 BOM and marker character in input, if present.
-		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+        # Remove UTF-8 BOM and marker character in input, if present.
+        $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
 
-		# Standardize line endings:
-		#   DOS to Unix and Mac to Unix
-		$text = preg_replace('{\r\n?}', "\n", $text);
+        # Standardize line endings:
+        #   DOS to Unix and Mac to Unix
+        $text = preg_replace('{\r\n?}', "\n", $text);
 
-		# Make sure $text ends with a couple of newlines:
-		$text .= "\n\n";
+        # Make sure $text ends with a couple of newlines:
+        $text .= "\n\n";
 
-		# Convert all tabs to spaces.
-		$text = $this->detab($text);
+        # Convert all tabs to spaces.
+        $text = $this->detab($text);
 
-		# Turn block-level HTML blocks into hash entries
-		$text = $this->hashHTMLBlocks($text);
+        # Turn block-level HTML blocks into hash entries
+        $text = $this->hashHTMLBlocks($text);
 
-		# Strip any lines consisting only of spaces and tabs.
-		# This makes subsequent regexen easier to write, because we can
-		# match consecutive blank lines with /\n+/ instead of something
-		# contorted like /[ ]*\n+/ .
-		$text = preg_replace('/^[ ]+$/m', '', $text);
+        # Strip any lines consisting only of spaces and tabs.
+        # This makes subsequent regexen easier to write, because we can
+        # match consecutive blank lines with /\n+/ instead of something
+        # contorted like /[ ]*\n+/ .
+        $text = preg_replace('/^[ ]+$/m', '', $text);
 
-		# Run document gamut methods.
-		foreach ($this->document_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
+        # Run document gamut methods.
+        foreach ($this->document_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
 		
-		$this->teardown();
+        $this->teardown();
 
-		return $text . "\n";
-	}
+        return $text . "\n";
+    }
 	
-	protected $document_gamut = array(
-		# Strip link definitions, store in hashes.
-		"stripLinkDefinitions" => 20,
+    protected $document_gamut = array(
+        # Strip link definitions, store in hashes.
+        "stripLinkDefinitions" => 20,
 		
-		"runBasicBlockGamut"   => 30,
-		);
+        "runBasicBlockGamut"   => 30,
+        );
 
 
-	protected function stripLinkDefinitions($text) {
-	#
-	# Strips link definitions from text, stores the URLs and titles in
-	# hash references.
-	#
-		$less_than_tab = $this->tab_width - 1;
+    protected function stripLinkDefinitions($text) {
+    #
+    # Strips link definitions from text, stores the URLs and titles in
+    # hash references.
+    #
+        $less_than_tab = $this->tab_width - 1;
 
-		# Link defs are in the form: ^[id]: url "optional title"
-		$text = preg_replace_callback('{
+        # Link defs are in the form: ^[id]: url "optional title"
+        $text = preg_replace_callback('{
 							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
@@ -227,46 +227,46 @@ 
 							)?	# title is optional
 							(?:\n+|\Z)
 			}xm',
-			array($this, '_stripLinkDefinitions_callback'),
-			$text);
-		return $text;
-	}
-	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		return ''; # String that will replace the block
-	}
-
-
-	protected function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
-
-		$less_than_tab = $this->tab_width - 1;
-
-		# Hashify HTML blocks:
-		# We only want to do this for block-level HTML tags, such as headers,
-		# lists, and tables. That's because we still want to wrap <p>s around
-		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
-		# phrase emphasis, and spans. The list of tags we're looking for is
-		# hard-coded:
-		#
-		# *  List "a" is made of tags which can be both inline or block-level.
-		#    These will be treated block-level when the start tag is alone on 
-		#    its line, otherwise they're not matched here and will be taken as 
-		#    inline later.
-		# *  List "b" is made of tags which are always block-level;
-		#
-		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|style|form|fieldset|iframe|math|svg|'.
-						   'article|section|nav|aside|hgroup|header|footer|'.
-						   'figure';
-
-		# Regular expression for the content of a block tag.
-		$nested_tags_level = 4;
-		$attr = '
+            array($this, '_stripLinkDefinitions_callback'),
+            $text);
+        return $text;
+    }
+    protected function _stripLinkDefinitions_callback($matches) {
+        $link_id = strtolower($matches[1]);
+        $url = $matches[2] == '' ? $matches[3] : $matches[2];
+        $this->urls[$link_id] = $url;
+        $this->titles[$link_id] =& $matches[4];
+        return ''; # String that will replace the block
+    }
+
+
+    protected function hashHTMLBlocks($text) {
+        if ($this->no_markup)  return $text;
+
+        $less_than_tab = $this->tab_width - 1;
+
+        # Hashify HTML blocks:
+        # We only want to do this for block-level HTML tags, such as headers,
+        # lists, and tables. That's because we still want to wrap <p>s around
+        # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+        # phrase emphasis, and spans. The list of tags we're looking for is
+        # hard-coded:
+        #
+        # *  List "a" is made of tags which can be both inline or block-level.
+        #    These will be treated block-level when the start tag is alone on 
+        #    its line, otherwise they're not matched here and will be taken as 
+        #    inline later.
+        # *  List "b" is made of tags which are always block-level;
+        #
+        $block_tags_a_re = 'ins|del';
+        $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+                            'script|noscript|style|form|fieldset|iframe|math|svg|'.
+                            'article|section|nav|aside|hgroup|header|footer|'.
+                            'figure';
+
+        # Regular expression for the content of a block tag.
+        $nested_tags_level = 4;
+        $attr = '
 			(?>				# optional tag attributes
 			  \s			# starts with whitespace
 			  (?>
@@ -280,8 +280,8 @@ 
 			  )*
 			)?	
 			';
-		$content =
-			str_repeat('
+        $content =
+            str_repeat('
 				(?>
 				  [^<]+			# content without tag
 				|
@@ -291,29 +291,29 @@ 
 					  />
 					|
 					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
-			str_repeat('
+                        '.*?'.					# last level nested tag content
+            str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
 				  |				
 					<(?!/\2\s*>	# other tags with a different name
 				  )
 				)*',
-				$nested_tags_level);
-		$content2 = str_replace('\2', '\3', $content);
-
-		# First, look for nested blocks, e.g.:
-		# 	<div>
-		# 		<div>
-		# 		tags for inner block must be indented.
-		# 		</div>
-		# 	</div>
-		#
-		# The outermost tags must start at the left margin for this to match, and
-		# the inner nested divs must be indented.
-		# We need to do this before the next, more liberal match, because the next
-		# match will start at the first `<div>` and stop at the first `</div>`.
-		$text = preg_replace_callback('{(?>
+                $nested_tags_level);
+        $content2 = str_replace('\2', '\3', $content);
+
+        # First, look for nested blocks, e.g.:
+        # 	<div>
+        # 		<div>
+        # 		tags for inner block must be indented.
+        # 		</div>
+        # 	</div>
+        #
+        # The outermost tags must start at the left margin for this to match, and
+        # the inner nested divs must be indented.
+        # We need to do this before the next, more liberal match, because the next
+        # match will start at the first `<div>` and stop at the first `</div>`.
+        $text = preg_replace_callback('{(?>
 			(?>
 				(?<=\n)			# Starting on its own line
 				|				# or
@@ -374,97 +374,97 @@ 
 					
 			)
 			)}Sxmi',
-			array($this, '_hashHTMLBlocks_callback'),
-			$text);
-
-		return $text;
-	}
-	protected function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
-		$key  = $this->hashBlock($text);
-		return "\n\n$key\n\n";
-	}
+            array($this, '_hashHTMLBlocks_callback'),
+            $text);
+
+        return $text;
+    }
+    protected function _hashHTMLBlocks_callback($matches) {
+        $text = $matches[1];
+        $key  = $this->hashBlock($text);
+        return "\n\n$key\n\n";
+    }
 	
 	
-	protected function hashPart($text, $boundary = 'X') {
-	#
-	# Called whenever a tag must be hashed when a function insert an atomic 
-	# element in the text stream. Passing $text to through this function gives
-	# a unique text-token which will be reverted back when calling unhash.
-	#
-	# The $boundary argument specify what character should be used to surround
-	# the token. By convension, "B" is used for block elements that needs not
-	# to be wrapped into paragraph tags at the end, ":" is used for elements
-	# that are word separators and "X" is used in the general case.
-	#
-		# Swap back any tag hash found in $text so we do not have to `unhash`
-		# multiple times at the end.
-		$text = $this->unhash($text);
+    protected function hashPart($text, $boundary = 'X') {
+    #
+    # Called whenever a tag must be hashed when a function insert an atomic 
+    # element in the text stream. Passing $text to through this function gives
+    # a unique text-token which will be reverted back when calling unhash.
+    #
+    # The $boundary argument specify what character should be used to surround
+    # the token. By convension, "B" is used for block elements that needs not
+    # to be wrapped into paragraph tags at the end, ":" is used for elements
+    # that are word separators and "X" is used in the general case.
+    #
+        # Swap back any tag hash found in $text so we do not have to `unhash`
+        # multiple times at the end.
+        $text = $this->unhash($text);
 		
-		# Then hash the block.
-		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
-		return $key; # String that will replace the tag.
-	}
-
-
-	protected function hashBlock($text) {
-	#
-	# Shortcut function for hashPart with block-level boundaries.
-	#
-		return $this->hashPart($text, 'B');
-	}
-
-
-	protected $block_gamut = array(
-	#
-	# These are all the transformations that form block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		"doHeaders"         => 10,
-		"doHorizontalRules" => 20,
+        # Then hash the block.
+        static $i = 0;
+        $key = "$boundary\x1A" . ++$i . $boundary;
+        $this->html_hashes[$key] = $text;
+        return $key; # String that will replace the tag.
+    }
+
+
+    protected function hashBlock($text) {
+    #
+    # Shortcut function for hashPart with block-level boundaries.
+    #
+        return $this->hashPart($text, 'B');
+    }
+
+
+    protected $block_gamut = array(
+    #
+    # These are all the transformations that form block-level
+    # tags like paragraphs, headers, and list items.
+    #
+        "doHeaders"         => 10,
+        "doHorizontalRules" => 20,
 		
-		"doLists"           => 40,
-		"doCodeBlocks"      => 50,
-		"doBlockQuotes"     => 60,
-		);
-
-	protected function runBlockGamut($text) {
-	#
-	# Run block gamut tranformations.
-	#
-		# We need to escape raw HTML in Markdown source before doing anything 
-		# else. This need to be done for each block, and not only at the 
-		# begining in the Markdown function since hashed blocks can be part of
-		# list items and could have been indented. Indented blocks would have 
-		# been seen as a code block in a previous pass of hashHTMLBlocks.
-		$text = $this->hashHTMLBlocks($text);
+        "doLists"           => 40,
+        "doCodeBlocks"      => 50,
+        "doBlockQuotes"     => 60,
+        );
+
+    protected function runBlockGamut($text) {
+    #
+    # Run block gamut tranformations.
+    #
+        # We need to escape raw HTML in Markdown source before doing anything 
+        # else. This need to be done for each block, and not only at the 
+        # begining in the Markdown function since hashed blocks can be part of
+        # list items and could have been indented. Indented blocks would have 
+        # been seen as a code block in a previous pass of hashHTMLBlocks.
+        $text = $this->hashHTMLBlocks($text);
 		
-		return $this->runBasicBlockGamut($text);
-	}
+        return $this->runBasicBlockGamut($text);
+    }
 	
-	protected function runBasicBlockGamut($text) {
-	#
-	# Run block gamut tranformations, without hashing HTML blocks. This is 
-	# useful when HTML blocks are known to be already hashed, like in the first
-	# whole-document pass.
-	#
-		foreach ($this->block_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
+    protected function runBasicBlockGamut($text) {
+    #
+    # Run block gamut tranformations, without hashing HTML blocks. This is 
+    # useful when HTML blocks are known to be already hashed, like in the first
+    # whole-document pass.
+    #
+        foreach ($this->block_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
 		
-		# Finally form paragraph and restore hashed blocks.
-		$text = $this->formParagraphs($text);
+        # Finally form paragraph and restore hashed blocks.
+        $text = $this->formParagraphs($text);
 
-		return $text;
-	}
+        return $text;
+    }
 	
 	
-	protected function doHorizontalRules($text) {
-		# Do Horizontal Rules:
-		return preg_replace(
-			'{
+    protected function doHorizontalRules($text) {
+        # Do Horizontal Rules:
+        return preg_replace(
+            '{
 				^[ ]{0,3}	# Leading space
 				([-*_])		# $1: First marker
 				(?>			# Repeated marker group
@@ -474,68 +474,68 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
-			$text);
-	}
-
-
-	protected $span_gamut = array(
-	#
-	# These are all the transformations that occur *within* block-level
-	# tags like paragraphs, headers, and list items.
-	#
-		# Process character escapes, code spans, and inline HTML
-		# in one shot.
-		"parseSpan"           => -30,
-
-		# Process anchor and image tags. Images must come first,
-		# because ![foo][f] looks like an anchor.
-		"doImages"            =>  10,
-		"doAnchors"           =>  20,
+            "\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+            $text);
+    }
+
+
+    protected $span_gamut = array(
+    #
+    # These are all the transformations that occur *within* block-level
+    # tags like paragraphs, headers, and list items.
+    #
+        # Process character escapes, code spans, and inline HTML
+        # in one shot.
+        "parseSpan"           => -30,
+
+        # Process anchor and image tags. Images must come first,
+        # because ![foo][f] looks like an anchor.
+        "doImages"            =>  10,
+        "doAnchors"           =>  20,
 		
-		# Make links out of things like `<http://example.com/>`
-		# Must come after doAnchors, because you can use < and >
-		# delimiters in inline links like [this](<url>).
-		"doAutoLinks"         =>  30,
-		"encodeAmpsAndAngles" =>  40,
-
-		"doItalicsAndBold"    =>  50,
-		"doHardBreaks"        =>  60,
-		);
-
-	protected function runSpanGamut($text) {
-	#
-	# Run span gamut tranformations.
-	#
-		foreach ($this->span_gamut as $method => $priority) {
-			$text = $this->$method($text);
-		}
-
-		return $text;
-	}
+        # Make links out of things like `<http://example.com/>`
+        # Must come after doAnchors, because you can use < and >
+        # delimiters in inline links like [this](<url>).
+        "doAutoLinks"         =>  30,
+        "encodeAmpsAndAngles" =>  40,
+
+        "doItalicsAndBold"    =>  50,
+        "doHardBreaks"        =>  60,
+        );
+
+    protected function runSpanGamut($text) {
+    #
+    # Run span gamut tranformations.
+    #
+        foreach ($this->span_gamut as $method => $priority) {
+            $text = $this->$method($text);
+        }
+
+        return $text;
+    }
 	
 	
-	protected function doHardBreaks($text) {
-		# Do hard breaks:
-		return preg_replace_callback('/ {2,}\n/', 
-			array($this, '_doHardBreaks_callback'), $text);
-	}
-	protected function _doHardBreaks_callback($matches) {
-		return $this->hashPart("<br$this->empty_element_suffix\n");
-	}
-
-
-	protected function doAnchors($text) {
-	#
-	# Turn Markdown link shortcuts into XHTML <a> tags.
-	#
-		if ($this->in_anchor) return $text;
-		$this->in_anchor = true;
+    protected function doHardBreaks($text) {
+        # Do hard breaks:
+        return preg_replace_callback('/ {2,}\n/', 
+            array($this, '_doHardBreaks_callback'), $text);
+    }
+    protected function _doHardBreaks_callback($matches) {
+        return $this->hashPart("<br$this->empty_element_suffix\n");
+    }
+
+
+    protected function doAnchors($text) {
+    #
+    # Turn Markdown link shortcuts into XHTML <a> tags.
+    #
+        if ($this->in_anchor) return $text;
+        $this->in_anchor = true;
 		
-		#
-		# First, handle reference-style links: [link text] [id]
-		#
-		$text = preg_replace_callback('{
+        #
+        # First, handle reference-style links: [link text] [id]
+        #
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -549,12 +549,12 @@ 
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
+            array($this, '_doAnchors_reference_callback'), $text);
 
-		#
-		# Next, inline-style links: [link text](url "optional title")
-		#
-		$text = preg_replace_callback('{
+        #
+        # Next, inline-style links: [link text](url "optional title")
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
 				('.$this->nested_brackets_re.')	# link text = $2
@@ -576,94 +576,94 @@ 
 			  \)
 			)
 			}xs',
-			array($this, '_doAnchors_inline_callback'), $text);
-
-		#
-		# Last, handle reference-style shortcuts: [link text]
-		# These must come last in case you've also got [link text][1]
-		# or [link text](/foo)
-		#
-		$text = preg_replace_callback('{
+            array($this, '_doAnchors_inline_callback'), $text);
+
+        #
+        # Last, handle reference-style shortcuts: [link text]
+        # These must come last in case you've also got [link text][1]
+        # or [link text](/foo)
+        #
+        $text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
 				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
 			  \]
 			)
 			}xs',
-			array($this, '_doAnchors_reference_callback'), $text);
-
-		$this->in_anchor = false;
-		return $text;
-	}
-	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
-
-		if ($link_id == "") {
-			# for shortcut links like [this][] or [this].
-			$link_id = $link_text;
-		}
+            array($this, '_doAnchors_reference_callback'), $text);
+
+        $this->in_anchor = false;
+        return $text;
+    }
+    protected function _doAnchors_reference_callback($matches) {
+        $whole_match =  $matches[1];
+        $link_text   =  $matches[2];
+        $link_id     =& $matches[3];
+
+        if ($link_id == "") {
+            # for shortcut links like [this][] or [this].
+            $link_id = $link_text;
+        }
 		
-		# lower-case and turn embedded newlines into spaces
-		$link_id = strtolower($link_id);
-		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+        # lower-case and turn embedded newlines into spaces
+        $link_id = strtolower($link_id);
+        $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
 
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
-			$url = $this->encodeURLAttribute($url);
+        if (isset($this->urls[$link_id])) {
+            $url = $this->urls[$link_id];
+            $url = $this->encodeURLAttribute($url);
 			
-			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
+            $result = "<a href=\"$url\"";
+            if ( isset( $this->titles[$link_id] ) ) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
 		
-			$link_text = $this->runSpanGamut($link_text);
-			$result .= ">$link_text</a>";
-			$result = $this->hashPart($result);
-		}
-		else {
-			$result = $whole_match;
-		}
-		return $result;
-	}
-	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		// if the URL was of the form <s p a c e s> it got caught by the HTML
-		// tag parser and hashed. Need to reverse the process before using the URL.
-		$unhashed = $this->unhash($url);
-		if ($unhashed != $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
-
-		$url = $this->encodeURLAttribute($url);
-
-		$result = "<a href=\"$url\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
-		}
+            $link_text = $this->runSpanGamut($link_text);
+            $result .= ">$link_text</a>";
+            $result = $this->hashPart($result);
+        }
+        else {
+            $result = $whole_match;
+        }
+        return $result;
+    }
+    protected function _doAnchors_inline_callback($matches) {
+        $whole_match	=  $matches[1];
+        $link_text		=  $this->runSpanGamut($matches[2]);
+        $url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        // if the URL was of the form <s p a c e s> it got caught by the HTML
+        // tag parser and hashed. Need to reverse the process before using the URL.
+        $unhashed = $this->unhash($url);
+        if ($unhashed != $url)
+            $url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+
+        $url = $this->encodeURLAttribute($url);
+
+        $result = "<a href=\"$url\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\"";
+        }
 		
-		$link_text = $this->runSpanGamut($link_text);
-		$result .= ">$link_text</a>";
+        $link_text = $this->runSpanGamut($link_text);
+        $result .= ">$link_text</a>";
 
-		return $this->hashPart($result);
-	}
+        return $this->hashPart($result);
+    }
 
 
-	protected function doImages($text) {
-	#
-	# Turn Markdown image shortcuts into <img> tags.
-	#
-		#
-		# First, handle reference-style labeled images: ![alt text][id]
-		#
-		$text = preg_replace_callback('{
+    protected function doImages($text) {
+    #
+    # Turn Markdown image shortcuts into <img> tags.
+    #
+        #
+        # First, handle reference-style labeled images: ![alt text][id]
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -678,13 +678,13 @@ 
 
 			)
 			}xs', 
-			array($this, '_doImages_reference_callback'), $text);
+            array($this, '_doImages_reference_callback'), $text);
 
-		#
-		# Next, handle inline images:  ![alt text](url "optional title")
-		# Don't forget: encode * and _
-		#
-		$text = preg_replace_callback('{
+        #
+        # Next, handle inline images:  ![alt text](url "optional title")
+        # Don't forget: encode * and _
+        #
+        $text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
 				('.$this->nested_brackets_re.')		# alt text = $2
@@ -707,76 +707,76 @@ 
 			  \)
 			)
 			}xs',
-			array($this, '_doImages_inline_callback'), $text);
-
-		return $text;
-	}
-	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
-
-		if ($link_id == "") {
-			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
-		}
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeURLAttribute($this->urls[$link_id]);
-			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
-				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
-			}
-			$result .= $this->empty_element_suffix;
-			$result = $this->hashPart($result);
-		}
-		else {
-			# If there's no such link ID, leave intact:
-			$result = $whole_match;
-		}
-
-		return $result;
-	}
-	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-
-		$alt_text = $this->encodeAttribute($alt_text);
-		$url = $this->encodeURLAttribute($url);
-		$result = "<img src=\"$url\" alt=\"$alt_text\"";
-		if (isset($title)) {
-			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
-		}
-		$result .= $this->empty_element_suffix;
-
-		return $this->hashPart($result);
-	}
-
-
-	protected function doHeaders($text) {
-		# Setext-style headers:
-		#	  Header 1
-		#	  ========
-		#  
-		#	  Header 2
-		#	  --------
-		#
-		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
-			array($this, '_doHeaders_callback_setext'), $text);
-
-		# atx-style headers:
-		#	# Header 1
-		#	## Header 2
-		#	## Header 2 with closing hashes ##
-		#	...
-		#	###### Header 6
-		#
-		$text = preg_replace_callback('{
+            array($this, '_doImages_inline_callback'), $text);
+
+        return $text;
+    }
+    protected function _doImages_reference_callback($matches) {
+        $whole_match = $matches[1];
+        $alt_text    = $matches[2];
+        $link_id     = strtolower($matches[3]);
+
+        if ($link_id == "") {
+            $link_id = strtolower($alt_text); # for shortcut links like ![this][].
+        }
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        if (isset($this->urls[$link_id])) {
+            $url = $this->encodeURLAttribute($this->urls[$link_id]);
+            $result = "<img src=\"$url\" alt=\"$alt_text\"";
+            if (isset($this->titles[$link_id])) {
+                $title = $this->titles[$link_id];
+                $title = $this->encodeAttribute($title);
+                $result .=  " title=\"$title\"";
+            }
+            $result .= $this->empty_element_suffix;
+            $result = $this->hashPart($result);
+        }
+        else {
+            # If there's no such link ID, leave intact:
+            $result = $whole_match;
+        }
+
+        return $result;
+    }
+    protected function _doImages_inline_callback($matches) {
+        $whole_match	= $matches[1];
+        $alt_text		= $matches[2];
+        $url			= $matches[3] == '' ? $matches[4] : $matches[3];
+        $title			=& $matches[7];
+
+        $alt_text = $this->encodeAttribute($alt_text);
+        $url = $this->encodeURLAttribute($url);
+        $result = "<img src=\"$url\" alt=\"$alt_text\"";
+        if (isset($title)) {
+            $title = $this->encodeAttribute($title);
+            $result .=  " title=\"$title\""; # $title already quoted
+        }
+        $result .= $this->empty_element_suffix;
+
+        return $this->hashPart($result);
+    }
+
+
+    protected function doHeaders($text) {
+        # Setext-style headers:
+        #	  Header 1
+        #	  ========
+        #  
+        #	  Header 2
+        #	  --------
+        #
+        $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+            array($this, '_doHeaders_callback_setext'), $text);
+
+        # atx-style headers:
+        #	# Header 1
+        #	## Header 2
+        #	## Header 2 with closing hashes ##
+        #	...
+        #	###### Header 6
+        #
+        $text = preg_replace_callback('{
 				^(\#{1,6})	# $1 = string of #\'s
 				[ ]*
 				(.+?)		# $2 = Header text
@@ -784,69 +784,69 @@ 
 				\#*			# optional closing #\'s (not counted)
 				\n+
 			}xm',
-			array($this, '_doHeaders_callback_atx'), $text);
+            array($this, '_doHeaders_callback_atx'), $text);
 
-		return $text;
-	}
+        return $text;
+    }
 
-	protected function _doHeaders_callback_setext($matches) {
-		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+    protected function _doHeaders_callback_setext($matches) {
+        # Terrible hack to check we haven't found an empty list item.
+        if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+            return $matches[0];
 		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
-
-		# id attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
-
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-	protected function _doHeaders_callback_atx($matches) {
-
-		# id attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[2]);
-
-		$level = strlen($matches[1]);
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
-	}
-
-	protected function _generateIdFromHeaderValue($headerValue) {
-
-		# if a header_id_func property is set, we can use it to automatically
-		# generate an id attribute.
-		#
-		# This method returns a string in the form id="foo", or an empty string
-		# otherwise.
-		if (!is_callable($this->header_id_func)) {
-			return "";
-		}
-		$idValue = call_user_func($this->header_id_func, $headerValue);
-		if (!$idValue) return "";
-
-		return ' id="' . $this->encodeAttribute($idValue) . '"';
-
-	}
-
-	protected function doLists($text) {
-	#
-	# Form HTML ordered (numbered) and unordered (bulleted) lists.
-	#
-		$less_than_tab = $this->tab_width - 1;
-
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-
-		$markers_relist = array(
-			$marker_ul_re => $marker_ol_re,
-			$marker_ol_re => $marker_ul_re,
-			);
-
-		foreach ($markers_relist as $marker_re => $other_marker_re) {
-			# Re-usable pattern to match any entirel ul or ol list:
-			$whole_list_re = '
+        $level = $matches[2]{0} == '=' ? 1 : 2;
+
+        # id attribute generation
+        $idAtt = $this->_generateIdFromHeaderValue($matches[1]);
+
+        $block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+    protected function _doHeaders_callback_atx($matches) {
+
+        # id attribute generation
+        $idAtt = $this->_generateIdFromHeaderValue($matches[2]);
+
+        $level = strlen($matches[1]);
+        $block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
+        return "\n" . $this->hashBlock($block) . "\n\n";
+    }
+
+    protected function _generateIdFromHeaderValue($headerValue) {
+
+        # if a header_id_func property is set, we can use it to automatically
+        # generate an id attribute.
+        #
+        # This method returns a string in the form id="foo", or an empty string
+        # otherwise.
+        if (!is_callable($this->header_id_func)) {
+            return "";
+        }
+        $idValue = call_user_func($this->header_id_func, $headerValue);
+        if (!$idValue) return "";
+
+        return ' id="' . $this->encodeAttribute($idValue) . '"';
+
+    }
+
+    protected function doLists($text) {
+    #
+    # Form HTML ordered (numbered) and unordered (bulleted) lists.
+    #
+        $less_than_tab = $this->tab_width - 1;
+
+        # Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[\.]';
+
+        $markers_relist = array(
+            $marker_ul_re => $marker_ol_re,
+            $marker_ol_re => $marker_ul_re,
+            );
+
+        foreach ($markers_relist as $marker_re => $other_marker_re) {
+            # Re-usable pattern to match any entirel ul or ol list:
+            $whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
 					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
@@ -873,96 +873,96 @@ 
 				)
 			'; // mx
 			
-			# We use a different prefix before nested lists than top-level lists.
-			# See extended comment in _ProcessListItems().
+            # We use a different prefix before nested lists than top-level lists.
+            # See extended comment in _ProcessListItems().
 		
-			if ($this->list_level) {
-				$text = preg_replace_callback('{
+            if ($this->list_level) {
+                $text = preg_replace_callback('{
 						^
 						'.$whole_list_re.'
 					}mx',
-					array($this, '_doLists_callback'), $text);
-			}
-			else {
-				$text = preg_replace_callback('{
+                    array($this, '_doLists_callback'), $text);
+            }
+            else {
+                $text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
 					}mx',
-					array($this, '_doLists_callback'), $text);
-			}
-		}
-
-		return $text;
-	}
-	protected function _doLists_callback($matches) {
-		# Re-usable patterns to match list item bullets and number markers:
-		$marker_ul_re  = '[*+-]';
-		$marker_ol_re  = '\d+[\.]';
-		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-		$marker_ol_start_re = '[0-9]+';
-
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-
-		$list .= "\n";
-		$result = $this->processListItems($list, $marker_any_re);
-
-		$ol_start = 1;
-		if ($this->enhanced_ordered_list) {
-			# Get the start number for ordered list.
-			if ($list_type == 'ol') {
-				$ol_start_array = array();
-				$ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
-				if ($ol_start_check){
-					$ol_start = $ol_start_array[0];
-				}
-			}
-		}
-
-		if ($ol_start > 1 && $list_type == 'ol'){
-			$result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
-		} else {
-			$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		}
-		return "\n". $result ."\n\n";
-	}
-
-	protected $list_level = 0;
-
-	protected function processListItems($list_str, $marker_any_re) {
-	#
-	#	Process the contents of a single ordered or unordered list, splitting it
-	#	into individual list items.
-	#
-		# The $this->list_level global keeps track of when we're inside a list.
-		# Each time we enter a list, we increment it; when we leave a list,
-		# we decrement. If it's zero, we're not in a list anymore.
-		#
-		# We do this because when we're not inside a list, we want to treat
-		# something like this:
-		#
-		#		I recommend upgrading to version
-		#		8. Oops, now this line is treated
-		#		as a sub-list.
-		#
-		# As a single paragraph, despite the fact that the second line starts
-		# with a digit-period-space sequence.
-		#
-		# Whereas when we're inside a list (or sub-list), that line will be
-		# treated as the start of a sub-list. What a kludge, huh? This is
-		# an aspect of Markdown's syntax that's hard to parse perfectly
-		# without resorting to mind-reading. Perhaps the solution is to
-		# change the syntax rules such that sub-lists must start with a
-		# starting cardinal number; e.g. "1." or "a.".
+                    array($this, '_doLists_callback'), $text);
+            }
+        }
+
+        return $text;
+    }
+    protected function _doLists_callback($matches) {
+        # Re-usable patterns to match list item bullets and number markers:
+        $marker_ul_re  = '[*+-]';
+        $marker_ol_re  = '\d+[\.]';
+        $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+        $marker_ol_start_re = '[0-9]+';
+
+        $list = $matches[1];
+        $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
+
+        $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+
+        $list .= "\n";
+        $result = $this->processListItems($list, $marker_any_re);
+
+        $ol_start = 1;
+        if ($this->enhanced_ordered_list) {
+            # Get the start number for ordered list.
+            if ($list_type == 'ol') {
+                $ol_start_array = array();
+                $ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
+                if ($ol_start_check){
+                    $ol_start = $ol_start_array[0];
+                }
+            }
+        }
+
+        if ($ol_start > 1 && $list_type == 'ol'){
+            $result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
+        } else {
+            $result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+        }
+        return "\n". $result ."\n\n";
+    }
+
+    protected $list_level = 0;
+
+    protected function processListItems($list_str, $marker_any_re) {
+    #
+    #	Process the contents of a single ordered or unordered list, splitting it
+    #	into individual list items.
+    #
+        # The $this->list_level global keeps track of when we're inside a list.
+        # Each time we enter a list, we increment it; when we leave a list,
+        # we decrement. If it's zero, we're not in a list anymore.
+        #
+        # We do this because when we're not inside a list, we want to treat
+        # something like this:
+        #
+        #		I recommend upgrading to version
+        #		8. Oops, now this line is treated
+        #		as a sub-list.
+        #
+        # As a single paragraph, despite the fact that the second line starts
+        # with a digit-period-space sequence.
+        #
+        # Whereas when we're inside a list (or sub-list), that line will be
+        # treated as the start of a sub-list. What a kludge, huh? This is
+        # an aspect of Markdown's syntax that's hard to parse perfectly
+        # without resorting to mind-reading. Perhaps the solution is to
+        # change the syntax rules such that sub-lists must start with a
+        # starting cardinal number; e.g. "1." or "a.".
 		
-		$this->list_level++;
+        $this->list_level++;
 
-		# trim trailing blank lines:
-		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+        # trim trailing blank lines:
+        $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
 
-		$list_str = preg_replace_callback('{
+        $list_str = preg_replace_callback('{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
 			('.$marker_any_re.'				# list marker and space = $3
@@ -972,41 +972,41 @@ 
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
 			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
 			}xm',
-			array($this, '_processListItems_callback'), $list_str);
-
-		$this->list_level--;
-		return $list_str;
-	}
-	protected function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
-
-		if ($leading_line || $tailing_blank_line || 
-			preg_match('/\n{2,}/', $item))
-		{
-			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
-			# Recursion for sub-lists:
-			$item = $this->doLists($this->outdent($item));
-			$item = preg_replace('/\n+$/', '', $item);
-			$item = $this->runSpanGamut($item);
-		}
-
-		return "<li>" . $item . "</li>\n";
-	}
-
-
-	protected function doCodeBlocks($text) {
-	#
-	#	Process Markdown `<pre><code>` blocks.
-	#
-		$text = preg_replace_callback('{
+            array($this, '_processListItems_callback'), $list_str);
+
+        $this->list_level--;
+        return $list_str;
+    }
+    protected function _processListItems_callback($matches) {
+        $item = $matches[4];
+        $leading_line =& $matches[1];
+        $leading_space =& $matches[2];
+        $marker_space = $matches[3];
+        $tailing_blank_line =& $matches[5];
+
+        if ($leading_line || $tailing_blank_line || 
+            preg_match('/\n{2,}/', $item))
+        {
+            # Replace marker with the appropriate whitespace indentation
+            $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+            $item = $this->runBlockGamut($this->outdent($item)."\n");
+        }
+        else {
+            # Recursion for sub-lists:
+            $item = $this->doLists($this->outdent($item));
+            $item = preg_replace('/\n+$/', '', $item);
+            $item = $this->runSpanGamut($item);
+        }
+
+        return "<li>" . $item . "</li>\n";
+    }
+
+
+    protected function doCodeBlocks($text) {
+    #
+    #	Process Markdown `<pre><code>` blocks.
+    #
+        $text = preg_replace_callback('{
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
 				  (?>
@@ -1016,197 +1016,197 @@ 
 				)
 				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
-			array($this, '_doCodeBlocks_callback'), $text);
-
-		return $text;
-	}
-	protected function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
-
-		$codeblock = $this->outdent($codeblock);
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
-		# trim leading newlines and trailing newlines
-		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
-		$codeblock = "<pre><code>$codeblock\n</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
-	}
-
-
-	protected function makeCodeSpan($code) {
-	#
-	# Create a code span markup for $code. Called from handleSpanToken.
-	#
-		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
-		return $this->hashPart("<code>$code</code>");
-	}
-
-
-	protected $em_relist = array(
-		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?![\.,:;]?\s)',
-		'*' => '(?<![\s*])\*(?!\*)',
-		'_' => '(?<![\s_])_(?!_)',
-		);
-	protected $strong_relist = array(
-		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?![\.,:;]?\s)',
-		'**' => '(?<![\s*])\*\*(?!\*)',
-		'__' => '(?<![\s_])__(?!_)',
-		);
-	protected $em_strong_relist = array(
-		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?![\.,:;]?\s)',
-		'***' => '(?<![\s*])\*\*\*(?!\*)',
-		'___' => '(?<![\s_])___(?!_)',
-		);
-	protected $em_strong_prepared_relist;
+            array($this, '_doCodeBlocks_callback'), $text);
+
+        return $text;
+    }
+    protected function _doCodeBlocks_callback($matches) {
+        $codeblock = $matches[1];
+
+        $codeblock = $this->outdent($codeblock);
+        $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+        # trim leading newlines and trailing newlines
+        $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+        $codeblock = "<pre><code>$codeblock\n</code></pre>";
+        return "\n\n".$this->hashBlock($codeblock)."\n\n";
+    }
+
+
+    protected function makeCodeSpan($code) {
+    #
+    # Create a code span markup for $code. Called from handleSpanToken.
+    #
+        $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+        return $this->hashPart("<code>$code</code>");
+    }
+
+
+    protected $em_relist = array(
+        ''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?![\.,:;]?\s)',
+        '*' => '(?<![\s*])\*(?!\*)',
+        '_' => '(?<![\s_])_(?!_)',
+        );
+    protected $strong_relist = array(
+        ''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?![\.,:;]?\s)',
+        '**' => '(?<![\s*])\*\*(?!\*)',
+        '__' => '(?<![\s_])__(?!_)',
+        );
+    protected $em_strong_relist = array(
+        ''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?![\.,:;]?\s)',
+        '***' => '(?<![\s*])\*\*\*(?!\*)',
+        '___' => '(?<![\s_])___(?!_)',
+        );
+    protected $em_strong_prepared_relist;
 	
-	protected function prepareItalicsAndBold() {
-	#
-	# Prepare regular expressions for searching emphasis tokens in any
-	# context.
-	#
-		foreach ($this->em_relist as $em => $em_re) {
-			foreach ($this->strong_relist as $strong => $strong_re) {
-				# Construct list of allowed token expressions.
-				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
-				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
+    protected function prepareItalicsAndBold() {
+    #
+    # Prepare regular expressions for searching emphasis tokens in any
+    # context.
+    #
+        foreach ($this->em_relist as $em => $em_re) {
+            foreach ($this->strong_relist as $strong => $strong_re) {
+                # Construct list of allowed token expressions.
+                $token_relist = array();
+                if (isset($this->em_strong_relist["$em$strong"])) {
+                    $token_relist[] = $this->em_strong_relist["$em$strong"];
+                }
+                $token_relist[] = $em_re;
+                $token_relist[] = $strong_re;
 				
-				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
-			}
-		}
-	}
+                # Construct master expression from list.
+                $token_re = '{('. implode('|', $token_relist) .')}';
+                $this->em_strong_prepared_relist["$em$strong"] = $token_re;
+            }
+        }
+    }
 	
-	protected function doItalicsAndBold($text) {
-		$token_stack = array('');
-		$text_stack = array('');
-		$em = '';
-		$strong = '';
-		$tree_char_em = false;
+    protected function doItalicsAndBold($text) {
+        $token_stack = array('');
+        $text_stack = array('');
+        $em = '';
+        $strong = '';
+        $tree_char_em = false;
 		
-		while (1) {
-			#
-			# Get prepared regular expression for seraching emphasis tokens
-			# in current context.
-			#
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+        while (1) {
+            #
+            # Get prepared regular expression for seraching emphasis tokens
+            # in current context.
+            #
+            $token_re = $this->em_strong_prepared_relist["$em$strong"];
 			
-			#
-			# Each loop iteration search for the next emphasis token. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+            #
+            # Each loop iteration search for the next emphasis token. 
+            # Each token is then passed to handleSpanToken.
+            #
+            $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+            $text_stack[0] .= $parts[0];
+            $token =& $parts[1];
+            $text =& $parts[2];
 			
-			if (empty($token)) {
-				# Reached end of text span: empty stack without emitting.
-				# any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
-				}
-				break;
-			}
+            if (empty($token)) {
+                # Reached end of text span: empty stack without emitting.
+                # any more emphasis.
+                while ($token_stack[0]) {
+                    $text_stack[1] .= array_shift($token_stack);
+                    $text_stack[0] .= array_shift($text_stack);
+                }
+                break;
+            }
 			
-			$token_len = strlen($token);
-			if ($tree_char_em) {
-				# Reached closing marker while inside a three-char emphasis.
-				if ($token_len == 3) {
-					# Three-char closing marker, close em and strong.
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong><em>$span</em></strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$em = '';
-					$strong = '';
-				} else {
-					# Other closing marker: close one em or strong and
-					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
-					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
-					$span = $this->runSpanGamut($span);
-					$span = "<$tag>$span</$tag>";
-					$text_stack[0] = $this->hashPart($span);
-					$$tag = ''; # $$tag stands for $em or $strong
-				}
-				$tree_char_em = false;
-			} else if ($token_len == 3) {
-				if ($em) {
-					# Reached closing marker for both em and strong.
-					# Closing strong marker:
-					for ($i = 0; $i < 2; ++$i) {
-						$shifted_token = array_shift($token_stack);
-						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<$tag>$span</$tag>";
-						$text_stack[0] .= $this->hashPart($span);
-						$$tag = ''; # $$tag stands for $em or $strong
-					}
-				} else {
-					# Reached opening three-char emphasis marker. Push on token 
-					# stack; will be handled by the special condition above.
-					$em = $token{0};
-					$strong = "$em$em";
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$tree_char_em = true;
-				}
-			} else if ($token_len == 2) {
-				if ($strong) {
-					# Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
-					}
-					# Closing strong marker:
-					array_shift($token_stack);
-					$span = array_shift($text_stack);
-					$span = $this->runSpanGamut($span);
-					$span = "<strong>$span</strong>";
-					$text_stack[0] .= $this->hashPart($span);
-					$strong = '';
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$strong = $token;
-				}
-			} else {
-				# Here $token_len == 1
-				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
-						# Closing emphasis marker:
-						array_shift($token_stack);
-						$span = array_shift($text_stack);
-						$span = $this->runSpanGamut($span);
-						$span = "<em>$span</em>";
-						$text_stack[0] .= $this->hashPart($span);
-						$em = '';
-					} else {
-						$text_stack[0] .= $token;
-					}
-				} else {
-					array_unshift($token_stack, $token);
-					array_unshift($text_stack, '');
-					$em = $token;
-				}
-			}
-		}
-		return $text_stack[0];
-	}
-
-
-	protected function doBlockQuotes($text) {
-		$text = preg_replace_callback('/
+            $token_len = strlen($token);
+            if ($tree_char_em) {
+                # Reached closing marker while inside a three-char emphasis.
+                if ($token_len == 3) {
+                    # Three-char closing marker, close em and strong.
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong><em>$span</em></strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $em = '';
+                    $strong = '';
+                } else {
+                    # Other closing marker: close one em or strong and
+                    # change current token state to match the other
+                    $token_stack[0] = str_repeat($token{0}, 3-$token_len);
+                    $tag = $token_len == 2 ? "strong" : "em";
+                    $span = $text_stack[0];
+                    $span = $this->runSpanGamut($span);
+                    $span = "<$tag>$span</$tag>";
+                    $text_stack[0] = $this->hashPart($span);
+                    $$tag = ''; # $$tag stands for $em or $strong
+                }
+                $tree_char_em = false;
+            } else if ($token_len == 3) {
+                if ($em) {
+                    # Reached closing marker for both em and strong.
+                    # Closing strong marker:
+                    for ($i = 0; $i < 2; ++$i) {
+                        $shifted_token = array_shift($token_stack);
+                        $tag = strlen($shifted_token) == 2 ? "strong" : "em";
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<$tag>$span</$tag>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $$tag = ''; # $$tag stands for $em or $strong
+                    }
+                } else {
+                    # Reached opening three-char emphasis marker. Push on token 
+                    # stack; will be handled by the special condition above.
+                    $em = $token{0};
+                    $strong = "$em$em";
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $tree_char_em = true;
+                }
+            } else if ($token_len == 2) {
+                if ($strong) {
+                    # Unwind any dangling emphasis marker:
+                    if (strlen($token_stack[0]) == 1) {
+                        $text_stack[1] .= array_shift($token_stack);
+                        $text_stack[0] .= array_shift($text_stack);
+                    }
+                    # Closing strong marker:
+                    array_shift($token_stack);
+                    $span = array_shift($text_stack);
+                    $span = $this->runSpanGamut($span);
+                    $span = "<strong>$span</strong>";
+                    $text_stack[0] .= $this->hashPart($span);
+                    $strong = '';
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $strong = $token;
+                }
+            } else {
+                # Here $token_len == 1
+                if ($em) {
+                    if (strlen($token_stack[0]) == 1) {
+                        # Closing emphasis marker:
+                        array_shift($token_stack);
+                        $span = array_shift($text_stack);
+                        $span = $this->runSpanGamut($span);
+                        $span = "<em>$span</em>";
+                        $text_stack[0] .= $this->hashPart($span);
+                        $em = '';
+                    } else {
+                        $text_stack[0] .= $token;
+                    }
+                } else {
+                    array_unshift($token_stack, $token);
+                    array_unshift($text_stack, '');
+                    $em = $token;
+                }
+            }
+        }
+        return $text_stack[0];
+    }
+
+
+    protected function doBlockQuotes($text) {
+        $text = preg_replace_callback('/
 			  (								# Wrap whole match in $1
 				(?>
 				  ^[ ]*>[ ]?			# ">" at the start of a line
@@ -1216,58 +1216,58 @@ 
 				)+
 			  )
 			/xm',
-			array($this, '_doBlockQuotes_callback'), $text);
-
-		return $text;
-	}
-	protected function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
-		# trim one level of quoting - trim whitespace-only lines
-		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
-
-		$bq = preg_replace('/^/m', "  ", $bq);
-		# These leading spaces cause problem with <pre> content, 
-		# so we need to fix that:
-		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
-			array($this, '_doBlockQuotes_callback2'), $bq);
-
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
-	}
-	protected function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
-		$pre = preg_replace('/^  /m', '', $pre);
-		return $pre;
-	}
-
-
-	protected function formParagraphs($text) {
-	#
-	#	Params:
-	#		$text - string to process with html <p> tags
-	#
-		# Strip leading and trailing lines:
-		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
-		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
-		#
-		# Wrap <p> tags and unhashify HTML blocks
-		#
-		foreach ($grafs as $key => $value) {
-			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
-				# Is a paragraph.
-				$value = $this->runSpanGamut($value);
-				$value = preg_replace('/^([ ]*)/', "<p>", $value);
-				$value .= "</p>";
-				$grafs[$key] = $this->unhash($value);
-			}
-			else {
-				# Is a block.
-				# Modify elements of @grafs in-place...
-				$graf = $value;
-				$block = $this->html_hashes[$graf];
-				$graf = $block;
+            array($this, '_doBlockQuotes_callback'), $text);
+
+        return $text;
+    }
+    protected function _doBlockQuotes_callback($matches) {
+        $bq = $matches[1];
+        # trim one level of quoting - trim whitespace-only lines
+        $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+        $bq = $this->runBlockGamut($bq);		# recurse
+
+        $bq = preg_replace('/^/m', "  ", $bq);
+        # These leading spaces cause problem with <pre> content, 
+        # so we need to fix that:
+        $bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
+            array($this, '_doBlockQuotes_callback2'), $bq);
+
+        return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+    }
+    protected function _doBlockQuotes_callback2($matches) {
+        $pre = $matches[1];
+        $pre = preg_replace('/^  /m', '', $pre);
+        return $pre;
+    }
+
+
+    protected function formParagraphs($text) {
+    #
+    #	Params:
+    #		$text - string to process with html <p> tags
+    #
+        # Strip leading and trailing lines:
+        $text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+        $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+        #
+        # Wrap <p> tags and unhashify HTML blocks
+        #
+        foreach ($grafs as $key => $value) {
+            if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+                # Is a paragraph.
+                $value = $this->runSpanGamut($value);
+                $value = preg_replace('/^([ ]*)/', "<p>", $value);
+                $value .= "</p>";
+                $grafs[$key] = $this->unhash($value);
+            }
+            else {
+                # Is a block.
+                # Modify elements of @grafs in-place...
+                $graf = $value;
+                $block = $this->html_hashes[$graf];
+                $graf = $block;
 //				if (preg_match('{
 //					\A
 //					(							# $1 = <div> tag
@@ -1303,79 +1303,79 @@ 
 //
 //					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
 //				}
-				$grafs[$key] = $graf;
-			}
-		}
-
-		return implode("\n\n", $grafs);
-	}
-
-
-	protected function encodeAttribute($text) {
-	#
-	# Encode text for a double-quoted HTML attribute. This function
-	# is *not* suitable for attributes enclosed in single quotes.
-	#
-		$text = $this->encodeAmpsAndAngles($text);
-		$text = str_replace('"', '&quot;', $text);
-		return $text;
-	}
-
-
-	protected function encodeURLAttribute($url, &$text = null) {
-	#
-	# Encode text for a double-quoted HTML attribute containing a URL,
-	# applying the URL filter if set. Also generates the textual
-	# representation for the URL (removing mailto: or tel:) storing it in $text.
-	# This function is *not* suitable for attributes enclosed in single quotes.
-	#
-		if ($this->url_filter_func)
-			$url = call_user_func($this->url_filter_func, $url);
-
-		if (preg_match('{^mailto:}i', $url))
-			$url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
-		else if (preg_match('{^tel:}i', $url))
-		{
-			$url = $this->encodeAttribute($url);
-			$text = substr($url, 4);
-		}
-		else
-		{
-			$url = $this->encodeAttribute($url);
-			$text = $url;
-		}
-
-		return $url;
-	}
+                $grafs[$key] = $graf;
+            }
+        }
+
+        return implode("\n\n", $grafs);
+    }
+
+
+    protected function encodeAttribute($text) {
+    #
+    # Encode text for a double-quoted HTML attribute. This function
+    # is *not* suitable for attributes enclosed in single quotes.
+    #
+        $text = $this->encodeAmpsAndAngles($text);
+        $text = str_replace('"', '&quot;', $text);
+        return $text;
+    }
+
+
+    protected function encodeURLAttribute($url, &$text = null) {
+    #
+    # Encode text for a double-quoted HTML attribute containing a URL,
+    # applying the URL filter if set. Also generates the textual
+    # representation for the URL (removing mailto: or tel:) storing it in $text.
+    # This function is *not* suitable for attributes enclosed in single quotes.
+    #
+        if ($this->url_filter_func)
+            $url = call_user_func($this->url_filter_func, $url);
+
+        if (preg_match('{^mailto:}i', $url))
+            $url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
+        else if (preg_match('{^tel:}i', $url))
+        {
+            $url = $this->encodeAttribute($url);
+            $text = substr($url, 4);
+        }
+        else
+        {
+            $url = $this->encodeAttribute($url);
+            $text = $url;
+        }
+
+        return $url;
+    }
 	
 	
-	protected function encodeAmpsAndAngles($text) {
-	#
-	# Smart processing for ampersands and angle brackets that need to 
-	# be encoded. Valid character entities are left alone unless the
-	# no-entities mode is set.
-	#
-		if ($this->no_entities) {
-			$text = str_replace('&', '&amp;', $text);
-		} else {
-			# Ampersand-encoding based entirely on Nat Irons's Amputator
-			# MT plugin: <http://bumppo.net/projects/amputator/>
-			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
-								'&amp;', $text);
-		}
-		# Encode remaining <'s
-		$text = str_replace('<', '&lt;', $text);
-
-		return $text;
-	}
-
-
-	protected function doAutoLinks($text) {
-		$text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i',
-			array($this, '_doAutoLinks_url_callback'), $text);
-
-		# Email addresses: <address@domain.foo>
-		$text = preg_replace_callback('{
+    protected function encodeAmpsAndAngles($text) {
+    #
+    # Smart processing for ampersands and angle brackets that need to 
+    # be encoded. Valid character entities are left alone unless the
+    # no-entities mode is set.
+    #
+        if ($this->no_entities) {
+            $text = str_replace('&', '&amp;', $text);
+        } else {
+            # Ampersand-encoding based entirely on Nat Irons's Amputator
+            # MT plugin: <http://bumppo.net/projects/amputator/>
+            $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/', 
+                                '&amp;', $text);
+        }
+        # Encode remaining <'s
+        $text = str_replace('<', '&lt;', $text);
+
+        return $text;
+    }
+
+
+    protected function doAutoLinks($text) {
+        $text = preg_replace_callback('{<((https?|ftp|dict|tel):[^\'">\s]+)>}i',
+            array($this, '_doAutoLinks_url_callback'), $text);
+
+        # Email addresses: <address@domain.foo>
+        $text = preg_replace_callback('{
 			<
 			(?:mailto:)?
 			(
@@ -1393,76 +1393,76 @@ 
 			)
 			>
 			}xi',
-			array($this, '_doAutoLinks_email_callback'), $text);
-
-		return $text;
-	}
-	protected function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeURLAttribute($matches[1], $text);
-		$link = "<a href=\"$url\">$text</a>";
-		return $this->hashPart($link);
-	}
-	protected function _doAutoLinks_email_callback($matches) {
-		$addr = $matches[1];
-		$url = $this->encodeURLAttribute("mailto:$addr", $text);
-		$link = "<a href=\"$url\">$text</a>";
-		return $this->hashPart($link);
-	}
-
-
-	protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) {
-	#
-	#	Input: some text to obfuscate, e.g. "mailto:foo@example.com"
-	#
-	#	Output: the same text but with most characters encoded as either a
-	#		decimal or hex entity, in the hopes of foiling most address
-	#		harvesting spam bots. E.g.:
-	#
-	#        &#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
-	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
-	#        &#x6d;
-	#
-	#	Note: the additional output $tail is assigned the same value as the
-	#	ouput, minus the number of characters specified by $head_length.
-	#
-	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
-	#   With some optimizations by Milian Wolff. Forced encoding of HTML
-	#	attribute special characters by Allan Odgaard.
-	#
-		if ($text == "") return $tail = "";
-
-		$chars = preg_split('/(?<!^)(?!$)/', $text);
-		$seed = (int)abs(crc32($text) / strlen($text)); # Deterministic seed.
-
-		foreach ($chars as $key => $char) {
-			$ord = ord($char);
-			# Ignore non-ascii chars.
-			if ($ord < 128) {
-				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
-				# roughly 10% raw, 45% hex, 45% dec
-				# '@' *must* be encoded. I insist.
-				# '"' and '>' have to be encoded inside the attribute
-				if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
-			}
-		}
-
-		$text = implode('', $chars);
-		$tail = $head_length ? implode('', array_slice($chars, $head_length)) : $text;
-
-		return $text;
-	}
-
-
-	protected function parseSpan($str) {
-	#
-	# Take the string $str and parse it into tokens, hashing embeded HTML,
-	# escaped characters and handling code spans.
-	#
-		$output = '';
+            array($this, '_doAutoLinks_email_callback'), $text);
+
+        return $text;
+    }
+    protected function _doAutoLinks_url_callback($matches) {
+        $url = $this->encodeURLAttribute($matches[1], $text);
+        $link = "<a href=\"$url\">$text</a>";
+        return $this->hashPart($link);
+    }
+    protected function _doAutoLinks_email_callback($matches) {
+        $addr = $matches[1];
+        $url = $this->encodeURLAttribute("mailto:$addr", $text);
+        $link = "<a href=\"$url\">$text</a>";
+        return $this->hashPart($link);
+    }
+
+
+    protected function encodeEntityObfuscatedAttribute($text, &$tail = null, $head_length = 0) {
+    #
+    #	Input: some text to obfuscate, e.g. "mailto:foo@example.com"
+    #
+    #	Output: the same text but with most characters encoded as either a
+    #		decimal or hex entity, in the hopes of foiling most address
+    #		harvesting spam bots. E.g.:
+    #
+    #        &#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+    #        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+    #        &#x6d;
+    #
+    #	Note: the additional output $tail is assigned the same value as the
+    #	ouput, minus the number of characters specified by $head_length.
+    #
+    #	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+    #   With some optimizations by Milian Wolff. Forced encoding of HTML
+    #	attribute special characters by Allan Odgaard.
+    #
+        if ($text == "") return $tail = "";
+
+        $chars = preg_split('/(?<!^)(?!$)/', $text);
+        $seed = (int)abs(crc32($text) / strlen($text)); # Deterministic seed.
+
+        foreach ($chars as $key => $char) {
+            $ord = ord($char);
+            # Ignore non-ascii chars.
+            if ($ord < 128) {
+                $r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+                # roughly 10% raw, 45% hex, 45% dec
+                # '@' *must* be encoded. I insist.
+                # '"' and '>' have to be encoded inside the attribute
+                if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */;
+                else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+                else              $chars[$key] = '&#'.$ord.';';
+            }
+        }
+
+        $text = implode('', $chars);
+        $tail = $head_length ? implode('', array_slice($chars, $head_length)) : $text;
+
+        return $text;
+    }
+
+
+    protected function parseSpan($str) {
+    #
+    # Take the string $str and parse it into tokens, hashing embeded HTML,
+    # escaped characters and handling code spans.
+    #
+        $output = '';
 		
-		$span_re = '{
+        $span_re = '{
 				(
 					\\\\'.$this->escape_chars_re.'
 				|
@@ -1488,122 +1488,122 @@ 
 				)
 				}xs';
 
-		while (1) {
-			#
-			# Each loop iteration seach for either the next tag, the next 
-			# openning code span marker, or the next escaped character. 
-			# Each token is then passed to handleSpanToken.
-			#
-			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+        while (1) {
+            #
+            # Each loop iteration seach for either the next tag, the next 
+            # openning code span marker, or the next escaped character. 
+            # Each token is then passed to handleSpanToken.
+            #
+            $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
 			
-			# Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
-			}
+            # Create token from text preceding tag.
+            if ($parts[0] != "") {
+                $output .= $parts[0];
+            }
 			
-			# Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
-			}
-			else {
-				break;
-			}
-		}
+            # Check if we reach the end.
+            if (isset($parts[1])) {
+                $output .= $this->handleSpanToken($parts[1], $parts[2]);
+                $str = $parts[2];
+            }
+            else {
+                break;
+            }
+        }
 		
-		return $output;
-	}
+        return $output;
+    }
 	
 	
-	protected function handleSpanToken($token, &$str) {
-	#
-	# Handle $token provided by parseSpan by determining its nature and 
-	# returning the corresponding value that should replace it.
-	#
-		switch ($token{0}) {
-			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
-			case "`":
-				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
-					$str, $matches))
-				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
-					return $this->hashPart($codespan);
-				}
-				return $token; // return as text since no ending marker found.
-			default:
-				return $this->hashPart($token);
-		}
-	}
-
-
-	protected function outdent($text) {
-	#
-	# Remove one level of line-leading tabs or spaces
-	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
-	}
-
-
-	# String length function for detab. `_initDetab` will create a function to 
-	# hanlde UTF-8 if the default function does not exist.
-	protected $utf8_strlen = 'mb_strlen';
+    protected function handleSpanToken($token, &$str) {
+    #
+    # Handle $token provided by parseSpan by determining its nature and 
+    # returning the corresponding value that should replace it.
+    #
+        switch ($token{0}) {
+            case "\\":
+                return $this->hashPart("&#". ord($token{1}). ";");
+            case "`":
+                # Search for end marker in remaining text.
+                if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+                    $str, $matches))
+                {
+                    $str = $matches[2];
+                    $codespan = $this->makeCodeSpan($matches[1]);
+                    return $this->hashPart($codespan);
+                }
+                return $token; // return as text since no ending marker found.
+            default:
+                return $this->hashPart($token);
+        }
+    }
+
+
+    protected function outdent($text) {
+    #
+    # Remove one level of line-leading tabs or spaces
+    #
+        return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+    }
+
+
+    # String length function for detab. `_initDetab` will create a function to 
+    # hanlde UTF-8 if the default function does not exist.
+    protected $utf8_strlen = 'mb_strlen';
 	
-	protected function detab($text) {
-	#
-	# Replace tabs with the appropriate amount of space.
-	#
-		# For each line we separate the line in blocks delemited by
-		# tab characters. Then we reconstruct every line by adding the 
-		# appropriate number of space between each blocks.
+    protected function detab($text) {
+    #
+    # Replace tabs with the appropriate amount of space.
+    #
+        # For each line we separate the line in blocks delemited by
+        # tab characters. Then we reconstruct every line by adding the 
+        # appropriate number of space between each blocks.
 		
-		$text = preg_replace_callback('/^.*\t.*$/m',
-			array($this, '_detab_callback'), $text);
-
-		return $text;
-	}
-	protected function _detab_callback($matches) {
-		$line = $matches[0];
-		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+        $text = preg_replace_callback('/^.*\t.*$/m',
+            array($this, '_detab_callback'), $text);
+
+        return $text;
+    }
+    protected function _detab_callback($matches) {
+        $line = $matches[0];
+        $strlen = $this->utf8_strlen; # strlen function for UTF-8.
 		
-		# Split in blocks.
-		$blocks = explode("\t", $line);
-		# Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
-		foreach ($blocks as $block) {
-			# Calculate amount of space, insert spaces, insert block.
-			$amount = $this->tab_width - 
-				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
-		}
-		return $line;
-	}
-	protected function _initDetab() {
-	#
-	# Check for the availability of the function in the `utf8_strlen` property
-	# (initially `mb_strlen`). If the function is not available, create a 
-	# function that will loosely count the number of UTF-8 characters with a
-	# regular expression.
-	#
-		if (function_exists($this->utf8_strlen)) return;
-		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+        # Split in blocks.
+        $blocks = explode("\t", $line);
+        # Add each blocks to the line.
+        $line = $blocks[0];
+        unset($blocks[0]); # Do not add first block twice.
+        foreach ($blocks as $block) {
+            # Calculate amount of space, insert spaces, insert block.
+            $amount = $this->tab_width - 
+                $strlen($line, 'UTF-8') % $this->tab_width;
+            $line .= str_repeat(" ", $amount) . $block;
+        }
+        return $line;
+    }
+    protected function _initDetab() {
+    #
+    # Check for the availability of the function in the `utf8_strlen` property
+    # (initially `mb_strlen`). If the function is not available, create a 
+    # function that will loosely count the number of UTF-8 characters with a
+    # regular expression.
+    #
+        if (function_exists($this->utf8_strlen)) return;
+        $this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
 			$text, $m);');
-	}
-
-
-	protected function unhash($text) {
-	#
-	# Swap back in all the tags hashed by _HashHTMLBlocks.
-	#
-		return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
-			array($this, '_unhash_callback'), $text);
-	}
-	protected function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
-	}
+    }
+
+
+    protected function unhash($text) {
+    #
+    # Swap back in all the tags hashed by _HashHTMLBlocks.
+    #
+        return preg_replace_callback('/(.)\x1A[0-9]+\1/', 
+            array($this, '_unhash_callback'), $text);
+    }
+    protected function _unhash_callback($matches) {
+        return $this->html_hashes[$matches[0]];
+    }
 
 }

Spacing +119 added lines, -119 removed lines

@@ -21,7 +21,7 @@ 
 
 	### Version ###
 
-	const  MARKDOWNLIB_VERSION  =  "1.5.0";
+	const  MARKDOWNLIB_VERSION = "1.5.0";
 
 	### Simple Function Interface ###
 
@@ -35,7 +35,7 @@ 
 
 		# try to take parser from the static parser list
 		static $parser_list;
-		$parser =& $parser_list[$parser_class];
+		$parser = & $parser_list[ $parser_class ];
 
 		# create the parser it not already set
 		if (!$parser)
@@ -186,7 +186,7 @@ 
 		
 		$this->teardown();
 
-		return $text . "\n";
+		return $text."\n";
 	}
 	
 	protected $document_gamut = array(
@@ -232,10 +232,10 @@ 
 		return $text;
 	}
 	protected function _stripLinkDefinitions_callback($matches) {
-		$link_id = strtolower($matches[1]);
-		$url = $matches[2] == '' ? $matches[3] : $matches[2];
-		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
+		$link_id = strtolower($matches[ 1 ]);
+		$url = $matches[ 2 ] == '' ? $matches[ 3 ] : $matches[ 2 ];
+		$this->urls[ $link_id ] = $url;
+		$this->titles[ $link_id ] = & $matches[ 4 ];
 		return ''; # String that will replace the block
 	}
 
@@ -290,8 +290,8 @@ 
 					(?>
 					  />
 					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
+					  >', $nested_tags_level).# end of opening tag
+					  '.*?'.# last level nested tag content
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
@@ -380,7 +380,7 @@ 
 		return $text;
 	}
 	protected function _hashHTMLBlocks_callback($matches) {
-		$text = $matches[1];
+		$text = $matches[ 1 ];
 		$key  = $this->hashBlock($text);
 		return "\n\n$key\n\n";
 	}
@@ -403,8 +403,8 @@ 
 		
 		# Then hash the block.
 		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
-		$this->html_hashes[$key] = $text;
+		$key = "$boundary\x1A".++$i.$boundary;
+		$this->html_hashes[ $key ] = $text;
 		return $key; # String that will replace the tag.
 	}
 
@@ -596,9 +596,9 @@ 
 		return $text;
 	}
 	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[ 1 ];
+		$link_text   = $matches[ 2 ];
+		$link_id     = & $matches[ 3 ];
 
 		if ($link_id == "") {
 			# for shortcut links like [this][] or [this].
@@ -609,15 +609,15 @@ 
 		$link_id = strtolower($link_id);
 		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
 
-		if (isset($this->urls[$link_id])) {
-			$url = $this->urls[$link_id];
+		if (isset($this->urls[ $link_id ])) {
+			$url = $this->urls[ $link_id ];
 			$url = $this->encodeURLAttribute($url);
 			
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
-				$title = $this->titles[$link_id];
+			if (isset($this->titles[ $link_id ])) {
+				$title = $this->titles[ $link_id ];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 		
 			$link_text = $this->runSpanGamut($link_text);
@@ -630,10 +630,10 @@ 
 		return $result;
 	}
 	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[ 1 ];
+		$link_text = $this->runSpanGamut($matches[ 2 ]);
+		$url = $matches[ 3 ] == '' ? $matches[ 4 ] : $matches[ 3 ];
+		$title = & $matches[ 7 ];
 
 		// if the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using the URL.
@@ -646,7 +646,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		
 		$link_text = $this->runSpanGamut($link_text);
@@ -712,22 +712,22 @@ 
 		return $text;
 	}
 	protected function _doImages_reference_callback($matches) {
-		$whole_match = $matches[1];
-		$alt_text    = $matches[2];
-		$link_id     = strtolower($matches[3]);
+		$whole_match = $matches[ 1 ];
+		$alt_text    = $matches[ 2 ];
+		$link_id     = strtolower($matches[ 3 ]);
 
 		if ($link_id == "") {
 			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
 		}
 
 		$alt_text = $this->encodeAttribute($alt_text);
-		if (isset($this->urls[$link_id])) {
-			$url = $this->encodeURLAttribute($this->urls[$link_id]);
+		if (isset($this->urls[ $link_id ])) {
+			$url = $this->encodeURLAttribute($this->urls[ $link_id ]);
 			$result = "<img src=\"$url\" alt=\"$alt_text\"";
-			if (isset($this->titles[$link_id])) {
-				$title = $this->titles[$link_id];
+			if (isset($this->titles[ $link_id ])) {
+				$title = $this->titles[ $link_id ];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
@@ -740,17 +740,17 @@ 
 		return $result;
 	}
 	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[ 1 ];
+		$alt_text = $matches[ 2 ];
+		$url = $matches[ 3 ] == '' ? $matches[ 4 ] : $matches[ 3 ];
+		$title = & $matches[ 7 ];
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeURLAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -791,25 +791,25 @@ 
 
 	protected function _doHeaders_callback_setext($matches) {
 		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+		if ($matches[ 2 ] == '-' && preg_match('{^-(?: |$)}', $matches[ 1 ]))
+			return $matches[ 0 ];
 		
-		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$level = $matches[ 2 ]{0} == '=' ? 1 : 2;
 
 		# id attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[1]);
+		$idAtt = $this->_generateIdFromHeaderValue($matches[ 1 ]);
 
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[ 1 ])."</h$level>";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	protected function _doHeaders_callback_atx($matches) {
 
 		# id attribute generation
-		$idAtt = $this->_generateIdFromHeaderValue($matches[2]);
+		$idAtt = $this->_generateIdFromHeaderValue($matches[ 2 ]);
 
-		$level = strlen($matches[1]);
-		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		$level = strlen($matches[ 1 ]);
+		$block = "<h$level$idAtt>".$this->runSpanGamut($matches[ 2 ])."</h$level>";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 	protected function _generateIdFromHeaderValue($headerValue) {
@@ -825,7 +825,7 @@ 
 		$idValue = call_user_func($this->header_id_func, $headerValue);
 		if (!$idValue) return "";
 
-		return ' id="' . $this->encodeAttribute($idValue) . '"';
+		return ' id="'.$this->encodeAttribute($idValue).'"';
 
 	}
 
@@ -901,10 +901,10 @@ 
 		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
 		$marker_ol_start_re = '[0-9]+';
 
-		$list = $matches[1];
-		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
+		$list = $matches[ 1 ];
+		$list_type = preg_match("/$marker_ul_re/", $matches[ 4 ]) ? "ul" : "ol";
 
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		$marker_any_re = ($list_type == "ul" ? $marker_ul_re : $marker_ol_re);
 
 		$list .= "\n";
 		$result = $this->processListItems($list, $marker_any_re);
@@ -914,19 +914,19 @@ 
 			# Get the start number for ordered list.
 			if ($list_type == 'ol') {
 				$ol_start_array = array();
-				$ol_start_check = preg_match("/$marker_ol_start_re/", $matches[4], $ol_start_array);
-				if ($ol_start_check){
-					$ol_start = $ol_start_array[0];
+				$ol_start_check = preg_match("/$marker_ol_start_re/", $matches[ 4 ], $ol_start_array);
+				if ($ol_start_check) {
+					$ol_start = $ol_start_array[ 0 ];
 				}
 			}
 		}
 
-		if ($ol_start > 1 && $list_type == 'ol'){
-			$result = $this->hashBlock("<$list_type start=\"$ol_start\">\n" . $result . "</$list_type>");
+		if ($ol_start > 1 && $list_type == 'ol') {
+			$result = $this->hashBlock("<$list_type start=\"$ol_start\">\n".$result."</$list_type>");
 		} else {
-			$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+			$result = $this->hashBlock("<$list_type>\n".$result."</$list_type>");
 		}
-		return "\n". $result ."\n\n";
+		return "\n".$result."\n\n";
 	}
 
 	protected $list_level = 0;
@@ -978,17 +978,17 @@ 
 		return $list_str;
 	}
 	protected function _processListItems_callback($matches) {
-		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
-		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
+		$item = $matches[ 4 ];
+		$leading_line = & $matches[ 1 ];
+		$leading_space = & $matches[ 2 ];
+		$marker_space = $matches[ 3 ];
+		$tailing_blank_line = & $matches[ 5 ];
 
 		if ($leading_line || $tailing_blank_line || 
 			preg_match('/\n{2,}/', $item))
 		{
 			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $leading_space.str_repeat(' ', strlen($marker_space)).$item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
 		}
 		else {
@@ -998,7 +998,7 @@ 
 			$item = $this->runSpanGamut($item);
 		}
 
-		return "<li>" . $item . "</li>\n";
+		return "<li>".$item."</li>\n";
 	}
 
 
@@ -1021,7 +1021,7 @@ 
 		return $text;
 	}
 	protected function _doCodeBlocks_callback($matches) {
-		$codeblock = $matches[1];
+		$codeblock = $matches[ 1 ];
 
 		$codeblock = $this->outdent($codeblock);
 		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
@@ -1069,15 +1069,15 @@ 
 			foreach ($this->strong_relist as $strong => $strong_re) {
 				# Construct list of allowed token expressions.
 				$token_relist = array();
-				if (isset($this->em_strong_relist["$em$strong"])) {
-					$token_relist[] = $this->em_strong_relist["$em$strong"];
+				if (isset($this->em_strong_relist[ "$em$strong" ])) {
+					$token_relist[ ] = $this->em_strong_relist[ "$em$strong" ];
 				}
-				$token_relist[] = $em_re;
-				$token_relist[] = $strong_re;
+				$token_relist[ ] = $em_re;
+				$token_relist[ ] = $strong_re;
 				
 				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
-				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+				$token_re = '{('.implode('|', $token_relist).')}';
+				$this->em_strong_prepared_relist[ "$em$strong" ] = $token_re;
 			}
 		}
 	}
@@ -1094,23 +1094,23 @@ 
 			# Get prepared regular expression for seraching emphasis tokens
 			# in current context.
 			#
-			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+			$token_re = $this->em_strong_prepared_relist[ "$em$strong" ];
 			
 			#
 			# Each loop iteration search for the next emphasis token. 
 			# Each token is then passed to handleSpanToken.
 			#
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+			$text_stack[ 0 ] .= $parts[ 0 ];
+			$token = & $parts[ 1 ];
+			$text = & $parts[ 2 ];
 			
 			if (empty($token)) {
 				# Reached end of text span: empty stack without emitting.
 				# any more emphasis.
-				while ($token_stack[0]) {
-					$text_stack[1] .= array_shift($token_stack);
-					$text_stack[0] .= array_shift($text_stack);
+				while ($token_stack[ 0 ]) {
+					$text_stack[ 1 ] .= array_shift($token_stack);
+					$text_stack[ 0 ] .= array_shift($text_stack);
 				}
 				break;
 			}
@@ -1124,18 +1124,18 @@ 
 					$span = array_shift($text_stack);
 					$span = $this->runSpanGamut($span);
 					$span = "<strong><em>$span</em></strong>";
-					$text_stack[0] .= $this->hashPart($span);
+					$text_stack[ 0 ] .= $this->hashPart($span);
 					$em = '';
 					$strong = '';
 				} else {
 					# Other closing marker: close one em or strong and
 					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$token_stack[ 0 ] = str_repeat($token{0}, 3 - $token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
-					$span = $text_stack[0];
+					$span = $text_stack[ 0 ];
 					$span = $this->runSpanGamut($span);
 					$span = "<$tag>$span</$tag>";
-					$text_stack[0] = $this->hashPart($span);
+					$text_stack[ 0 ] = $this->hashPart($span);
 					$$tag = ''; # $$tag stands for $em or $strong
 				}
 				$tree_char_em = false;
@@ -1149,7 +1149,7 @@ 
 						$span = array_shift($text_stack);
 						$span = $this->runSpanGamut($span);
 						$span = "<$tag>$span</$tag>";
-						$text_stack[0] .= $this->hashPart($span);
+						$text_stack[ 0 ] .= $this->hashPart($span);
 						$$tag = ''; # $$tag stands for $em or $strong
 					}
 				} else {
@@ -1164,16 +1164,16 @@ 
 			} else if ($token_len == 2) {
 				if ($strong) {
 					# Unwind any dangling emphasis marker:
-					if (strlen($token_stack[0]) == 1) {
-						$text_stack[1] .= array_shift($token_stack);
-						$text_stack[0] .= array_shift($text_stack);
+					if (strlen($token_stack[ 0 ]) == 1) {
+						$text_stack[ 1 ] .= array_shift($token_stack);
+						$text_stack[ 0 ] .= array_shift($text_stack);
 					}
 					# Closing strong marker:
 					array_shift($token_stack);
 					$span = array_shift($text_stack);
 					$span = $this->runSpanGamut($span);
 					$span = "<strong>$span</strong>";
-					$text_stack[0] .= $this->hashPart($span);
+					$text_stack[ 0 ] .= $this->hashPart($span);
 					$strong = '';
 				} else {
 					array_unshift($token_stack, $token);
@@ -1183,16 +1183,16 @@ 
 			} else {
 				# Here $token_len == 1
 				if ($em) {
-					if (strlen($token_stack[0]) == 1) {
+					if (strlen($token_stack[ 0 ]) == 1) {
 						# Closing emphasis marker:
 						array_shift($token_stack);
 						$span = array_shift($text_stack);
 						$span = $this->runSpanGamut($span);
 						$span = "<em>$span</em>";
-						$text_stack[0] .= $this->hashPart($span);
+						$text_stack[ 0 ] .= $this->hashPart($span);
 						$em = '';
 					} else {
-						$text_stack[0] .= $token;
+						$text_stack[ 0 ] .= $token;
 					}
 				} else {
 					array_unshift($token_stack, $token);
@@ -1201,7 +1201,7 @@ 
 				}
 			}
 		}
-		return $text_stack[0];
+		return $text_stack[ 0 ];
 	}
 
 
@@ -1221,10 +1221,10 @@ 
 		return $text;
 	}
 	protected function _doBlockQuotes_callback($matches) {
-		$bq = $matches[1];
+		$bq = $matches[ 1 ];
 		# trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); # recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
 		# These leading spaces cause problem with <pre> content, 
@@ -1232,10 +1232,10 @@ 
 		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
 			array($this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+		return "\n".$this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
 	}
 	protected function _doBlockQuotes_callback2($matches) {
-		$pre = $matches[1];
+		$pre = $matches[ 1 ];
 		$pre = preg_replace('/^  /m', '', $pre);
 		return $pre;
 	}
@@ -1260,13 +1260,13 @@ 
 				$value = $this->runSpanGamut($value);
 				$value = preg_replace('/^([ ]*)/', "<p>", $value);
 				$value .= "</p>";
-				$grafs[$key] = $this->unhash($value);
+				$grafs[ $key ] = $this->unhash($value);
 			}
 			else {
 				# Is a block.
 				# Modify elements of @grafs in-place...
 				$graf = $value;
-				$block = $this->html_hashes[$graf];
+				$block = $this->html_hashes[ $graf ];
 				$graf = $block;
 //				if (preg_match('{
 //					\A
@@ -1303,7 +1303,7 @@ 
 //
 //					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
 //				}
-				$grafs[$key] = $graf;
+				$grafs[ $key ] = $graf;
 			}
 		}
 
@@ -1398,12 +1398,12 @@ 
 		return $text;
 	}
 	protected function _doAutoLinks_url_callback($matches) {
-		$url = $this->encodeURLAttribute($matches[1], $text);
+		$url = $this->encodeURLAttribute($matches[ 1 ], $text);
 		$link = "<a href=\"$url\">$text</a>";
 		return $this->hashPart($link);
 	}
 	protected function _doAutoLinks_email_callback($matches) {
-		$addr = $matches[1];
+		$addr = $matches[ 1 ];
 		$url = $this->encodeURLAttribute("mailto:$addr", $text);
 		$link = "<a href=\"$url\">$text</a>";
 		return $this->hashPart($link);
@@ -1432,7 +1432,7 @@ 
 		if ($text == "") return $tail = "";
 
 		$chars = preg_split('/(?<!^)(?!$)/', $text);
-		$seed = (int)abs(crc32($text) / strlen($text)); # Deterministic seed.
+		$seed = (int) abs(crc32($text) / strlen($text)); # Deterministic seed.
 
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
@@ -1443,8 +1443,8 @@ 
 				# '@' *must* be encoded. I insist.
 				# '"' and '>' have to be encoded inside the attribute
 				if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				else if ($r < 45) $chars[ $key ] = '&#x'.dechex($ord).';';
+				else              $chars[ $key ] = '&#'.$ord.';';
 			}
 		}
 
@@ -1468,7 +1468,7 @@ 
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1497,14 +1497,14 @@ 
 			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
 			
 			# Create token from text preceding tag.
-			if ($parts[0] != "") {
-				$output .= $parts[0];
+			if ($parts[ 0 ] != "") {
+				$output .= $parts[ 0 ];
 			}
 			
 			# Check if we reach the end.
-			if (isset($parts[1])) {
-				$output .= $this->handleSpanToken($parts[1], $parts[2]);
-				$str = $parts[2];
+			if (isset($parts[ 1 ])) {
+				$output .= $this->handleSpanToken($parts[ 1 ], $parts[ 2 ]);
+				$str = $parts[ 2 ];
 			}
 			else {
 				break;
@@ -1522,14 +1522,14 @@ 
 	#
 		switch ($token{0}) {
 			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
+				return $this->hashPart("&#".ord($token{1}).";");
 			case "`":
 				# Search for end marker in remaining text.
 				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
 					$str, $matches))
 				{
-					$str = $matches[2];
-					$codespan = $this->makeCodeSpan($matches[1]);
+					$str = $matches[ 2 ];
+					$codespan = $this->makeCodeSpan($matches[ 1 ]);
 					return $this->hashPart($codespan);
 				}
 				return $token; // return as text since no ending marker found.
@@ -1565,19 +1565,19 @@ 
 		return $text;
 	}
 	protected function _detab_callback($matches) {
-		$line = $matches[0];
+		$line = $matches[ 0 ];
 		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
 		
 		# Split in blocks.
 		$blocks = explode("\t", $line);
 		# Add each blocks to the line.
-		$line = $blocks[0];
-		unset($blocks[0]); # Do not add first block twice.
+		$line = $blocks[ 0 ];
+		unset($blocks[ 0 ]); # Do not add first block twice.
 		foreach ($blocks as $block) {
 			# Calculate amount of space, insert spaces, insert block.
 			$amount = $this->tab_width - 
 				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
+			$line .= str_repeat(" ", $amount).$block;
 		}
 		return $line;
 	}
@@ -1603,7 +1603,7 @@ 
 			array($this, '_unhash_callback'), $text);
 	}
 	protected function _unhash_callback($matches) {
-		return $this->html_hashes[$matches[0]];
+		return $this->html_hashes[ $matches[ 0 ] ];
 	}
 
 }

Braces +42 added lines, -32 removed lines

@@ -38,8 +38,9 @@ 
 		$parser =& $parser_list[$parser_class];
 
 		# create the parser it not already set
-		if (!$parser)
-			$parser = new $parser_class;
+		if (!$parser) {
+					$parser = new $parser_class;
+		}
 
 		# Transform text using parser.
 		return $parser->transform($text);
@@ -241,7 +242,9 @@ 
 
 
 	protected function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
+		if ($this->no_markup) {
+		    return $text;
+		}
 
 		$less_than_tab = $this->tab_width - 1;
 
@@ -529,7 +532,9 @@ 
 	#
 	# Turn Markdown link shortcuts into XHTML <a> tags.
 	#
-		if ($this->in_anchor) return $text;
+		if ($this->in_anchor) {
+		    return $text;
+		}
 		$this->in_anchor = true;
 		
 		#
@@ -623,8 +628,7 @@ 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -638,8 +642,9 @@ 
 		// if the URL was of the form <s p a c e s> it got caught by the HTML
 		// tag parser and hashed. Need to reverse the process before using the URL.
 		$unhashed = $this->unhash($url);
-		if ($unhashed != $url)
-			$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		if ($unhashed != $url) {
+					$url = preg_replace('/^<(.*)>$/', '\1', $unhashed);
+		}
 
 		$url = $this->encodeURLAttribute($url);
 
@@ -731,8 +736,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			# If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -791,8 +795,9 @@ 
 
 	protected function _doHeaders_callback_setext($matches) {
 		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
+					return $matches[0];
+		}
 		
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 
@@ -823,7 +828,9 @@ 
 			return "";
 		}
 		$idValue = call_user_func($this->header_id_func, $headerValue);
-		if (!$idValue) return "";
+		if (!$idValue) {
+		    return "";
+		}
 
 		return ' id="' . $this->encodeAttribute($idValue) . '"';
 
@@ -882,8 +889,7 @@ 
 						'.$whole_list_re.'
 					}mx',
 					array($this, '_doLists_callback'), $text);
-			}
-			else {
+			} else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
@@ -990,8 +996,7 @@ 
 			# Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
+		} else {
 			# Recursion for sub-lists:
 			$item = $this->doLists($this->outdent($item));
 			$item = preg_replace('/\n+$/', '', $item);
@@ -1261,8 +1266,7 @@ 
 				$value = preg_replace('/^([ ]*)/', "<p>", $value);
 				$value .= "</p>";
 				$grafs[$key] = $this->unhash($value);
-			}
-			else {
+			} else {
 				# Is a block.
 				# Modify elements of @grafs in-place...
 				$graf = $value;
@@ -1329,17 +1333,17 @@ 
 	# representation for the URL (removing mailto: or tel:) storing it in $text.
 	# This function is *not* suitable for attributes enclosed in single quotes.
 	#
-		if ($this->url_filter_func)
-			$url = call_user_func($this->url_filter_func, $url);
+		if ($this->url_filter_func) {
+					$url = call_user_func($this->url_filter_func, $url);
+		}
 
-		if (preg_match('{^mailto:}i', $url))
-			$url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
-		else if (preg_match('{^tel:}i', $url))
+		if (preg_match('{^mailto:}i', $url)) {
+					$url = $this->encodeEntityObfuscatedAttribute($url, $text, 7);
+		} else if (preg_match('{^tel:}i', $url))
 		{
 			$url = $this->encodeAttribute($url);
 			$text = substr($url, 4);
-		}
-		else
+		} else
 		{
 			$url = $this->encodeAttribute($url);
 			$text = $url;
@@ -1429,7 +1433,9 @@ 
 	#   With some optimizations by Milian Wolff. Forced encoding of HTML
 	#	attribute special characters by Allan Odgaard.
 	#
-		if ($text == "") return $tail = "";
+		if ($text == "") {
+		    return $tail = "";
+		}
 
 		$chars = preg_split('/(?<!^)(?!$)/', $text);
 		$seed = (int)abs(crc32($text) / strlen($text)); # Deterministic seed.
@@ -1443,8 +1449,11 @@ 
 				# '@' *must* be encoded. I insist.
 				# '"' and '>' have to be encoded inside the attribute
 				if ($r > 90 && strpos('@"&>', $char) === false) /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				else if ($r < 45) {
+				    $chars[$key] = '&#x'.dechex($ord).';';
+				} else {
+				    $chars[$key] = '&#'.$ord.';';
+				}
 			}
 		}
 
@@ -1505,8 +1514,7 @@ 
 			if (isset($parts[1])) {
 				$output .= $this->handleSpanToken($parts[1], $parts[2]);
 				$str = $parts[2];
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -1588,7 +1596,9 @@ 
 	# function that will loosely count the number of UTF-8 characters with a
 	# regular expression.
 	#
-		if (function_exists($this->utf8_strlen)) return;
+		if (function_exists($this->utf8_strlen)) {
+		    return;
+		}
 		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/", 
 			$text, $m);');