xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php

Doc Comments +1 added lines, -2 removed lines

@@ -385,8 +385,7 @@
      * separate lists for processing. Format is element[attr1|attr2],element2...
      * @warning Although it's largely drawn from TinyMCE's implementation,
      *      it is different, and you'll probably have to modify your lists
-     * @param $list String list to parse
-     * @param array($allowed_elements, $allowed_attributes)
+     * @param string $list String list to parse
      * @todo Give this its own class, probably static interface
      */
     public function parseTinyMCEAllowedList($list) {

Indentation +392 added lines, -392 removed lines

@@ -26,398 +26,398 @@
 class HTMLPurifier_HTMLDefinition extends HTMLPurifier_Definition
 {
 
-    // FULLY-PUBLIC VARIABLES ---------------------------------------------
-
-    /**
-     * Associative array of element names to HTMLPurifier_ElementDef
-     */
-    public $info = array();
-
-    /**
-     * Associative array of global attribute name to attribute definition.
-     */
-    public $info_global_attr = array();
-
-    /**
-     * String name of parent element HTML will be going into.
-     */
-    public $info_parent = 'div';
-
-    /**
-     * Definition for parent element, allows parent element to be a
-     * tag that's not allowed inside the HTML fragment.
-     */
-    public $info_parent_def;
-
-    /**
-     * String name of element used to wrap inline elements in block context
-     * @note This is rarely used except for BLOCKQUOTEs in strict mode
-     */
-    public $info_block_wrapper = 'p';
-
-    /**
-     * Associative array of deprecated tag name to HTMLPurifier_TagTransform
-     */
-    public $info_tag_transform = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
-     */
-    public $info_attr_transform_pre = array();
-
-    /**
-     * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
-     */
-    public $info_attr_transform_post = array();
-
-    /**
-     * Nested lookup array of content set name (Block, Inline) to
-     * element name to whether or not it belongs in that content set.
-     */
-    public $info_content_sets = array();
-
-    /**
-     * Indexed list of HTMLPurifier_Injector to be used.
-     */
-    public $info_injector = array();
-
-    /**
-     * Doctype object
-     */
-    public $doctype;
-
-
-
-    // RAW CUSTOMIZATION STUFF --------------------------------------------
-
-    /**
-     * Adds a custom attribute to a pre-existing element
-     * @note This is strictly convenience, and does not have a corresponding
-     *       method in HTMLPurifier_HTMLModule
-     * @param $element_name String element name to add attribute to
-     * @param $attr_name String name of attribute
-     * @param $def Attribute definition, can be string or object, see
-     *             HTMLPurifier_AttrTypes for details
-     */
-    public function addAttribute($element_name, $attr_name, $def) {
-        $module = $this->getAnonymousModule();
-        if (!isset($module->info[$element_name])) {
-            $element = $module->addBlankElement($element_name);
-        } else {
-            $element = $module->info[$element_name];
-        }
-        $element->attr[$attr_name] = $def;
-    }
-
-    /**
-     * Adds a custom element to your HTML definition
-     * @note See HTMLPurifier_HTMLModule::addElement for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array()) {
-        $module = $this->getAnonymousModule();
-        // assume that if the user is calling this, the element
-        // is safe. This may not be a good idea
-        $element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
-        return $element;
-    }
-
-    /**
-     * Adds a blank element to your HTML definition, for overriding
-     * existing behavior
-     * @note See HTMLPurifier_HTMLModule::addBlankElement for detailed
-     *       parameter and return value descriptions.
-     */
-    public function addBlankElement($element_name) {
-        $module  = $this->getAnonymousModule();
-        $element = $module->addBlankElement($element_name);
-        return $element;
-    }
-
-    /**
-     * Retrieves a reference to the anonymous module, so you can
-     * bust out advanced features without having to make your own
-     * module.
-     */
-    public function getAnonymousModule() {
-        if (!$this->_anonModule) {
-            $this->_anonModule = new HTMLPurifier_HTMLModule();
-            $this->_anonModule->name = 'Anonymous';
-        }
-        return $this->_anonModule;
-    }
-
-    private $_anonModule = null;
-
-
-    // PUBLIC BUT INTERNAL VARIABLES --------------------------------------
-
-    public $type = 'HTML';
-    public $manager; /**< Instance of HTMLPurifier_HTMLModuleManager */
-
-    /**
-     * Performs low-cost, preliminary initialization.
-     */
-    public function __construct() {
-        $this->manager = new HTMLPurifier_HTMLModuleManager();
-    }
-
-    protected function doSetup($config) {
-        $this->processModules($config);
-        $this->setupConfigStuff($config);
-        unset($this->manager);
-
-        // cleanup some of the element definitions
-        foreach ($this->info as $k => $v) {
-            unset($this->info[$k]->content_model);
-            unset($this->info[$k]->content_model_type);
-        }
-    }
-
-    /**
-     * Extract out the information from the manager
-     */
-    protected function processModules($config) {
-
-        if ($this->_anonModule) {
-            // for user specific changes
-            // this is late-loaded so we don't have to deal with PHP4
-            // reference wonky-ness
-            $this->manager->addModule($this->_anonModule);
-            unset($this->_anonModule);
-        }
-
-        $this->manager->setup($config);
-        $this->doctype = $this->manager->doctype;
-
-        foreach ($this->manager->modules as $module) {
-            foreach($module->info_tag_transform as $k => $v) {
-                if ($v === false) unset($this->info_tag_transform[$k]);
-                else $this->info_tag_transform[$k] = $v;
-            }
-            foreach($module->info_attr_transform_pre as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_pre[$k]);
-                else $this->info_attr_transform_pre[$k] = $v;
-            }
-            foreach($module->info_attr_transform_post as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_post[$k]);
-                else $this->info_attr_transform_post[$k] = $v;
-            }
-            foreach ($module->info_injector as $k => $v) {
-                if ($v === false) unset($this->info_injector[$k]);
-                else $this->info_injector[$k] = $v;
-            }
-        }
-
-        $this->info = $this->manager->getElements();
-        $this->info_content_sets = $this->manager->contentSets->lookup;
-
-    }
-
-    /**
-     * Sets up stuff based on config. We need a better way of doing this.
-     */
-    protected function setupConfigStuff($config) {
-
-        $block_wrapper = $config->get('HTML.BlockWrapper');
-        if (isset($this->info_content_sets['Block'][$block_wrapper])) {
-            $this->info_block_wrapper = $block_wrapper;
-        } else {
-            trigger_error('Cannot use non-block element as block wrapper',
-                E_USER_ERROR);
-        }
-
-        $parent = $config->get('HTML.Parent');
-        $def = $this->manager->getElement($parent, true);
-        if ($def) {
-            $this->info_parent = $parent;
-            $this->info_parent_def = $def;
-        } else {
-            trigger_error('Cannot use unrecognized element as parent',
-                E_USER_ERROR);
-            $this->info_parent_def = $this->manager->getElement($this->info_parent, true);
-        }
-
-        // support template text
-        $support = "(for information on implementing this, see the ".
-                   "support forums) ";
-
-        // setup allowed elements -----------------------------------------
-
-        $allowed_elements = $config->get('HTML.AllowedElements');
-        $allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
-
-        if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
-            $allowed = $config->get('HTML.Allowed');
-            if (is_string($allowed)) {
-                list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
-            }
-        }
-
-        if (is_array($allowed_elements)) {
-            foreach ($this->info as $name => $d) {
-                if(!isset($allowed_elements[$name])) unset($this->info[$name]);
-                unset($allowed_elements[$name]);
-            }
-            // emit errors
-            foreach ($allowed_elements as $element => $d) {
-                $element = htmlspecialchars($element, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); // PHP doesn't escape errors, be careful!
-                trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
-            }
-        }
-
-        // setup allowed attributes ---------------------------------------
-
-        $allowed_attributes_mutable = $allowed_attributes; // by copy!
-        if (is_array($allowed_attributes)) {
-
-            // This actually doesn't do anything, since we went away from
-            // global attributes. It's possible that userland code uses
-            // it, but HTMLModuleManager doesn't!
-            foreach ($this->info_global_attr as $attr => $x) {
-                $keys = array($attr, "*@$attr", "*.$attr");
-                $delete = true;
-                foreach ($keys as $key) {
-                    if ($delete && isset($allowed_attributes[$key])) {
-                        $delete = false;
-                    }
-                    if (isset($allowed_attributes_mutable[$key])) {
-                        unset($allowed_attributes_mutable[$key]);
-                    }
-                }
-                if ($delete) unset($this->info_global_attr[$attr]);
-            }
-
-            foreach ($this->info as $tag => $info) {
-                foreach ($info->attr as $attr => $x) {
-                    $keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
-                    $delete = true;
-                    foreach ($keys as $key) {
-                        if ($delete && isset($allowed_attributes[$key])) {
-                            $delete = false;
-                        }
-                        if (isset($allowed_attributes_mutable[$key])) {
-                            unset($allowed_attributes_mutable[$key]);
-                        }
-                    }
-                    if ($delete) {
-                        if ($this->info[$tag]->attr[$attr]->required) {
-                            trigger_error("Required attribute '$attr' in element '$tag' was not allowed, which means '$tag' will not be allowed either", E_USER_WARNING);
-                        }
-                        unset($this->info[$tag]->attr[$attr]);
-                    }
-                }
-            }
-            // emit errors
-            foreach ($allowed_attributes_mutable as $elattr => $d) {
-                $bits = preg_split('/[.@]/', $elattr, 2);
-                $c = count($bits);
-                switch ($c) {
-                    case 2:
-                        if ($bits[0] !== '*') {
-                            $element = htmlspecialchars($bits[0], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                            $attribute = htmlspecialchars($bits[1], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                            if (!isset($this->info[$element])) {
-                                trigger_error("Cannot allow attribute '$attribute' if element '$element' is not allowed/supported $support");
-                            } else {
-                                trigger_error("Attribute '$attribute' in element '$element' not supported $support",
-                                    E_USER_WARNING);
-                            }
-                            break;
-                        }
-                        // otherwise fall through
-                    case 1:
-                        $attribute = htmlspecialchars($bits[0], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-                        trigger_error("Global attribute '$attribute' is not ".
-                            "supported in any elements $support",
-                            E_USER_WARNING);
-                        break;
-                }
-            }
-
-        }
-
-        // setup forbidden elements ---------------------------------------
-
-        $forbidden_elements   = $config->get('HTML.ForbiddenElements');
-        $forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
-
-        foreach ($this->info as $tag => $info) {
-            if (isset($forbidden_elements[$tag])) {
-                unset($this->info[$tag]);
-                continue;
-            }
-            foreach ($info->attr as $attr => $x) {
-                if (
-                    isset($forbidden_attributes["$tag@$attr"]) ||
-                    isset($forbidden_attributes["*@$attr"]) ||
-                    isset($forbidden_attributes[$attr])
-                ) {
-                    unset($this->info[$tag]->attr[$attr]);
-                    continue;
-                } // this segment might get removed eventually
-                elseif (isset($forbidden_attributes["$tag.$attr"])) {
-                    // $tag.$attr are not user supplied, so no worries!
-                    trigger_error("Error with $tag.$attr: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead", E_USER_WARNING);
-                }
-            }
-        }
-        foreach ($forbidden_attributes as $key => $v) {
-            if (strlen($key) < 2) continue;
-            if ($key[0] != '*') continue;
-            if ($key[1] == '.') {
-                trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
-            }
-        }
-
-        // setup injectors -----------------------------------------------------
-        foreach ($this->info_injector as $i => $injector) {
-            if ($injector->checkNeeded($config) !== false) {
-                // remove injector that does not have it's required
-                // elements/attributes present, and is thus not needed.
-                unset($this->info_injector[$i]);
-            }
-        }
-    }
-
-    /**
-     * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
-     * separate lists for processing. Format is element[attr1|attr2],element2...
-     * @warning Although it's largely drawn from TinyMCE's implementation,
-     *      it is different, and you'll probably have to modify your lists
-     * @param $list String list to parse
-     * @param array($allowed_elements, $allowed_attributes)
-     * @todo Give this its own class, probably static interface
-     */
-    public function parseTinyMCEAllowedList($list) {
-
-        $list = str_replace(array(' ', "\t"), '', $list);
-
-        $elements = array();
-        $attributes = array();
-
-        $chunks = preg_split('/(,|[\n\r]+)/', $list);
-        foreach ($chunks as $chunk) {
-            if (empty($chunk)) continue;
-            // remove TinyMCE element control characters
-            if (!strpos($chunk, '[')) {
-                $element = $chunk;
-                $attr = false;
-            } else {
-                list($element, $attr) = explode('[', $chunk);
-            }
-            if ($element !== '*') $elements[$element] = true;
-            if (!$attr) continue;
-            $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
-            $attr = explode('|', $attr);
-            foreach ($attr as $key) {
-                $attributes["$element.$key"] = true;
-            }
-        }
-
-        return array($elements, $attributes);
-
-    }
+	// FULLY-PUBLIC VARIABLES ---------------------------------------------
+
+	/**
+	 * Associative array of element names to HTMLPurifier_ElementDef
+	 */
+	public $info = array();
+
+	/**
+	 * Associative array of global attribute name to attribute definition.
+	 */
+	public $info_global_attr = array();
+
+	/**
+	 * String name of parent element HTML will be going into.
+	 */
+	public $info_parent = 'div';
+
+	/**
+	 * Definition for parent element, allows parent element to be a
+	 * tag that's not allowed inside the HTML fragment.
+	 */
+	public $info_parent_def;
+
+	/**
+	 * String name of element used to wrap inline elements in block context
+	 * @note This is rarely used except for BLOCKQUOTEs in strict mode
+	 */
+	public $info_block_wrapper = 'p';
+
+	/**
+	 * Associative array of deprecated tag name to HTMLPurifier_TagTransform
+	 */
+	public $info_tag_transform = array();
+
+	/**
+	 * Indexed list of HTMLPurifier_AttrTransform to be performed before validation.
+	 */
+	public $info_attr_transform_pre = array();
+
+	/**
+	 * Indexed list of HTMLPurifier_AttrTransform to be performed after validation.
+	 */
+	public $info_attr_transform_post = array();
+
+	/**
+	 * Nested lookup array of content set name (Block, Inline) to
+	 * element name to whether or not it belongs in that content set.
+	 */
+	public $info_content_sets = array();
+
+	/**
+	 * Indexed list of HTMLPurifier_Injector to be used.
+	 */
+	public $info_injector = array();
+
+	/**
+	 * Doctype object
+	 */
+	public $doctype;
+
+
+
+	// RAW CUSTOMIZATION STUFF --------------------------------------------
+
+	/**
+	 * Adds a custom attribute to a pre-existing element
+	 * @note This is strictly convenience, and does not have a corresponding
+	 *       method in HTMLPurifier_HTMLModule
+	 * @param $element_name String element name to add attribute to
+	 * @param $attr_name String name of attribute
+	 * @param $def Attribute definition, can be string or object, see
+	 *             HTMLPurifier_AttrTypes for details
+	 */
+	public function addAttribute($element_name, $attr_name, $def) {
+		$module = $this->getAnonymousModule();
+		if (!isset($module->info[$element_name])) {
+			$element = $module->addBlankElement($element_name);
+		} else {
+			$element = $module->info[$element_name];
+		}
+		$element->attr[$attr_name] = $def;
+	}
+
+	/**
+	 * Adds a custom element to your HTML definition
+	 * @note See HTMLPurifier_HTMLModule::addElement for detailed
+	 *       parameter and return value descriptions.
+	 */
+	public function addElement($element_name, $type, $contents, $attr_collections, $attributes = array()) {
+		$module = $this->getAnonymousModule();
+		// assume that if the user is calling this, the element
+		// is safe. This may not be a good idea
+		$element = $module->addElement($element_name, $type, $contents, $attr_collections, $attributes);
+		return $element;
+	}
+
+	/**
+	 * Adds a blank element to your HTML definition, for overriding
+	 * existing behavior
+	 * @note See HTMLPurifier_HTMLModule::addBlankElement for detailed
+	 *       parameter and return value descriptions.
+	 */
+	public function addBlankElement($element_name) {
+		$module  = $this->getAnonymousModule();
+		$element = $module->addBlankElement($element_name);
+		return $element;
+	}
+
+	/**
+	 * Retrieves a reference to the anonymous module, so you can
+	 * bust out advanced features without having to make your own
+	 * module.
+	 */
+	public function getAnonymousModule() {
+		if (!$this->_anonModule) {
+			$this->_anonModule = new HTMLPurifier_HTMLModule();
+			$this->_anonModule->name = 'Anonymous';
+		}
+		return $this->_anonModule;
+	}
+
+	private $_anonModule = null;
+
+
+	// PUBLIC BUT INTERNAL VARIABLES --------------------------------------
+
+	public $type = 'HTML';
+	public $manager; /**< Instance of HTMLPurifier_HTMLModuleManager */
+
+	/**
+	 * Performs low-cost, preliminary initialization.
+	 */
+	public function __construct() {
+		$this->manager = new HTMLPurifier_HTMLModuleManager();
+	}
+
+	protected function doSetup($config) {
+		$this->processModules($config);
+		$this->setupConfigStuff($config);
+		unset($this->manager);
+
+		// cleanup some of the element definitions
+		foreach ($this->info as $k => $v) {
+			unset($this->info[$k]->content_model);
+			unset($this->info[$k]->content_model_type);
+		}
+	}
+
+	/**
+	 * Extract out the information from the manager
+	 */
+	protected function processModules($config) {
+
+		if ($this->_anonModule) {
+			// for user specific changes
+			// this is late-loaded so we don't have to deal with PHP4
+			// reference wonky-ness
+			$this->manager->addModule($this->_anonModule);
+			unset($this->_anonModule);
+		}
+
+		$this->manager->setup($config);
+		$this->doctype = $this->manager->doctype;
+
+		foreach ($this->manager->modules as $module) {
+			foreach($module->info_tag_transform as $k => $v) {
+				if ($v === false) unset($this->info_tag_transform[$k]);
+				else $this->info_tag_transform[$k] = $v;
+			}
+			foreach($module->info_attr_transform_pre as $k => $v) {
+				if ($v === false) unset($this->info_attr_transform_pre[$k]);
+				else $this->info_attr_transform_pre[$k] = $v;
+			}
+			foreach($module->info_attr_transform_post as $k => $v) {
+				if ($v === false) unset($this->info_attr_transform_post[$k]);
+				else $this->info_attr_transform_post[$k] = $v;
+			}
+			foreach ($module->info_injector as $k => $v) {
+				if ($v === false) unset($this->info_injector[$k]);
+				else $this->info_injector[$k] = $v;
+			}
+		}
+
+		$this->info = $this->manager->getElements();
+		$this->info_content_sets = $this->manager->contentSets->lookup;
+
+	}
+
+	/**
+	 * Sets up stuff based on config. We need a better way of doing this.
+	 */
+	protected function setupConfigStuff($config) {
+
+		$block_wrapper = $config->get('HTML.BlockWrapper');
+		if (isset($this->info_content_sets['Block'][$block_wrapper])) {
+			$this->info_block_wrapper = $block_wrapper;
+		} else {
+			trigger_error('Cannot use non-block element as block wrapper',
+				E_USER_ERROR);
+		}
+
+		$parent = $config->get('HTML.Parent');
+		$def = $this->manager->getElement($parent, true);
+		if ($def) {
+			$this->info_parent = $parent;
+			$this->info_parent_def = $def;
+		} else {
+			trigger_error('Cannot use unrecognized element as parent',
+				E_USER_ERROR);
+			$this->info_parent_def = $this->manager->getElement($this->info_parent, true);
+		}
+
+		// support template text
+		$support = "(for information on implementing this, see the ".
+				   "support forums) ";
+
+		// setup allowed elements -----------------------------------------
+
+		$allowed_elements = $config->get('HTML.AllowedElements');
+		$allowed_attributes = $config->get('HTML.AllowedAttributes'); // retrieve early
+
+		if (!is_array($allowed_elements) && !is_array($allowed_attributes)) {
+			$allowed = $config->get('HTML.Allowed');
+			if (is_string($allowed)) {
+				list($allowed_elements, $allowed_attributes) = $this->parseTinyMCEAllowedList($allowed);
+			}
+		}
+
+		if (is_array($allowed_elements)) {
+			foreach ($this->info as $name => $d) {
+				if(!isset($allowed_elements[$name])) unset($this->info[$name]);
+				unset($allowed_elements[$name]);
+			}
+			// emit errors
+			foreach ($allowed_elements as $element => $d) {
+				$element = htmlspecialchars($element, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); // PHP doesn't escape errors, be careful!
+				trigger_error("Element '$element' is not supported $support", E_USER_WARNING);
+			}
+		}
+
+		// setup allowed attributes ---------------------------------------
+
+		$allowed_attributes_mutable = $allowed_attributes; // by copy!
+		if (is_array($allowed_attributes)) {
+
+			// This actually doesn't do anything, since we went away from
+			// global attributes. It's possible that userland code uses
+			// it, but HTMLModuleManager doesn't!
+			foreach ($this->info_global_attr as $attr => $x) {
+				$keys = array($attr, "*@$attr", "*.$attr");
+				$delete = true;
+				foreach ($keys as $key) {
+					if ($delete && isset($allowed_attributes[$key])) {
+						$delete = false;
+					}
+					if (isset($allowed_attributes_mutable[$key])) {
+						unset($allowed_attributes_mutable[$key]);
+					}
+				}
+				if ($delete) unset($this->info_global_attr[$attr]);
+			}
+
+			foreach ($this->info as $tag => $info) {
+				foreach ($info->attr as $attr => $x) {
+					$keys = array("$tag@$attr", $attr, "*@$attr", "$tag.$attr", "*.$attr");
+					$delete = true;
+					foreach ($keys as $key) {
+						if ($delete && isset($allowed_attributes[$key])) {
+							$delete = false;
+						}
+						if (isset($allowed_attributes_mutable[$key])) {
+							unset($allowed_attributes_mutable[$key]);
+						}
+					}
+					if ($delete) {
+						if ($this->info[$tag]->attr[$attr]->required) {
+							trigger_error("Required attribute '$attr' in element '$tag' was not allowed, which means '$tag' will not be allowed either", E_USER_WARNING);
+						}
+						unset($this->info[$tag]->attr[$attr]);
+					}
+				}
+			}
+			// emit errors
+			foreach ($allowed_attributes_mutable as $elattr => $d) {
+				$bits = preg_split('/[.@]/', $elattr, 2);
+				$c = count($bits);
+				switch ($c) {
+					case 2:
+						if ($bits[0] !== '*') {
+							$element = htmlspecialchars($bits[0], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+							$attribute = htmlspecialchars($bits[1], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+							if (!isset($this->info[$element])) {
+								trigger_error("Cannot allow attribute '$attribute' if element '$element' is not allowed/supported $support");
+							} else {
+								trigger_error("Attribute '$attribute' in element '$element' not supported $support",
+									E_USER_WARNING);
+							}
+							break;
+						}
+						// otherwise fall through
+					case 1:
+						$attribute = htmlspecialchars($bits[0], ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+						trigger_error("Global attribute '$attribute' is not ".
+							"supported in any elements $support",
+							E_USER_WARNING);
+						break;
+				}
+			}
+
+		}
+
+		// setup forbidden elements ---------------------------------------
+
+		$forbidden_elements   = $config->get('HTML.ForbiddenElements');
+		$forbidden_attributes = $config->get('HTML.ForbiddenAttributes');
+
+		foreach ($this->info as $tag => $info) {
+			if (isset($forbidden_elements[$tag])) {
+				unset($this->info[$tag]);
+				continue;
+			}
+			foreach ($info->attr as $attr => $x) {
+				if (
+					isset($forbidden_attributes["$tag@$attr"]) ||
+					isset($forbidden_attributes["*@$attr"]) ||
+					isset($forbidden_attributes[$attr])
+				) {
+					unset($this->info[$tag]->attr[$attr]);
+					continue;
+				} // this segment might get removed eventually
+				elseif (isset($forbidden_attributes["$tag.$attr"])) {
+					// $tag.$attr are not user supplied, so no worries!
+					trigger_error("Error with $tag.$attr: tag.attr syntax not supported for HTML.ForbiddenAttributes; use tag@attr instead", E_USER_WARNING);
+				}
+			}
+		}
+		foreach ($forbidden_attributes as $key => $v) {
+			if (strlen($key) < 2) continue;
+			if ($key[0] != '*') continue;
+			if ($key[1] == '.') {
+				trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
+			}
+		}
+
+		// setup injectors -----------------------------------------------------
+		foreach ($this->info_injector as $i => $injector) {
+			if ($injector->checkNeeded($config) !== false) {
+				// remove injector that does not have it's required
+				// elements/attributes present, and is thus not needed.
+				unset($this->info_injector[$i]);
+			}
+		}
+	}
+
+	/**
+	 * Parses a TinyMCE-flavored Allowed Elements and Attributes list into
+	 * separate lists for processing. Format is element[attr1|attr2],element2...
+	 * @warning Although it's largely drawn from TinyMCE's implementation,
+	 *      it is different, and you'll probably have to modify your lists
+	 * @param $list String list to parse
+	 * @param array($allowed_elements, $allowed_attributes)
+	 * @todo Give this its own class, probably static interface
+	 */
+	public function parseTinyMCEAllowedList($list) {
+
+		$list = str_replace(array(' ', "\t"), '', $list);
+
+		$elements = array();
+		$attributes = array();
+
+		$chunks = preg_split('/(,|[\n\r]+)/', $list);
+		foreach ($chunks as $chunk) {
+			if (empty($chunk)) continue;
+			// remove TinyMCE element control characters
+			if (!strpos($chunk, '[')) {
+				$element = $chunk;
+				$attr = false;
+			} else {
+				list($element, $attr) = explode('[', $chunk);
+			}
+			if ($element !== '*') $elements[$element] = true;
+			if (!$attr) continue;
+			$attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
+			$attr = explode('|', $attr);
+			foreach ($attr as $key) {
+				$attributes["$element.$key"] = true;
+			}
+		}
+
+		return array($elements, $attributes);
+
+	}
 
 
 }

Braces +41 added lines, -15 removed lines

@@ -192,20 +192,32 @@ 
 
         foreach ($this->manager->modules as $module) {
             foreach($module->info_tag_transform as $k => $v) {
-                if ($v === false) unset($this->info_tag_transform[$k]);
-                else $this->info_tag_transform[$k] = $v;
+                if ($v === false) {
+                	unset($this->info_tag_transform[$k]);
+                } else {
+                	$this->info_tag_transform[$k] = $v;
+                }
             }
             foreach($module->info_attr_transform_pre as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_pre[$k]);
-                else $this->info_attr_transform_pre[$k] = $v;
+                if ($v === false) {
+                	unset($this->info_attr_transform_pre[$k]);
+                } else {
+                	$this->info_attr_transform_pre[$k] = $v;
+                }
             }
             foreach($module->info_attr_transform_post as $k => $v) {
-                if ($v === false) unset($this->info_attr_transform_post[$k]);
-                else $this->info_attr_transform_post[$k] = $v;
+                if ($v === false) {
+                	unset($this->info_attr_transform_post[$k]);
+                } else {
+                	$this->info_attr_transform_post[$k] = $v;
+                }
             }
             foreach ($module->info_injector as $k => $v) {
-                if ($v === false) unset($this->info_injector[$k]);
-                else $this->info_injector[$k] = $v;
+                if ($v === false) {
+                	unset($this->info_injector[$k]);
+                } else {
+                	$this->info_injector[$k] = $v;
+                }
             }
         }
 
@@ -256,7 +268,9 @@ 
 
         if (is_array($allowed_elements)) {
             foreach ($this->info as $name => $d) {
-                if(!isset($allowed_elements[$name])) unset($this->info[$name]);
+                if(!isset($allowed_elements[$name])) {
+                	unset($this->info[$name]);
+                }
                 unset($allowed_elements[$name]);
             }
             // emit errors
@@ -285,7 +299,9 @@ 
                         unset($allowed_attributes_mutable[$key]);
                     }
                 }
-                if ($delete) unset($this->info_global_attr[$attr]);
+                if ($delete) {
+                	unset($this->info_global_attr[$attr]);
+                }
             }
 
             foreach ($this->info as $tag => $info) {
@@ -363,8 +379,12 @@ 
             }
         }
         foreach ($forbidden_attributes as $key => $v) {
-            if (strlen($key) < 2) continue;
-            if ($key[0] != '*') continue;
+            if (strlen($key) < 2) {
+            	continue;
+            }
+            if ($key[0] != '*') {
+            	continue;
+            }
             if ($key[1] == '.') {
                 trigger_error("Error with $key: *.attr syntax not supported for HTML.ForbiddenAttributes; use attr instead", E_USER_WARNING);
             }
@@ -398,7 +418,9 @@ 
 
         $chunks = preg_split('/(,|[\n\r]+)/', $list);
         foreach ($chunks as $chunk) {
-            if (empty($chunk)) continue;
+            if (empty($chunk)) {
+            	continue;
+            }
             // remove TinyMCE element control characters
             if (!strpos($chunk, '[')) {
                 $element = $chunk;
@@ -406,8 +428,12 @@ 
             } else {
                 list($element, $attr) = explode('[', $chunk);
             }
-            if ($element !== '*') $elements[$element] = true;
-            if (!$attr) continue;
+            if ($element !== '*') {
+            	$elements[$element] = true;
+            }
+            if (!$attr) {
+            	continue;
+            }
             $attr = substr($attr, 0, strlen($attr) - 1); // remove trailing ]
             $attr = explode('|', $attr);
             foreach ($attr as $key) {

Spacing +4 added lines, -4 removed lines

@@ -191,15 +191,15 @@ 
         $this->doctype = $this->manager->doctype;
 
         foreach ($this->manager->modules as $module) {
-            foreach($module->info_tag_transform as $k => $v) {
+            foreach ($module->info_tag_transform as $k => $v) {
                 if ($v === false) unset($this->info_tag_transform[$k]);
                 else $this->info_tag_transform[$k] = $v;
             }
-            foreach($module->info_attr_transform_pre as $k => $v) {
+            foreach ($module->info_attr_transform_pre as $k => $v) {
                 if ($v === false) unset($this->info_attr_transform_pre[$k]);
                 else $this->info_attr_transform_pre[$k] = $v;
             }
-            foreach($module->info_attr_transform_post as $k => $v) {
+            foreach ($module->info_attr_transform_post as $k => $v) {
                 if ($v === false) unset($this->info_attr_transform_post[$k]);
                 else $this->info_attr_transform_post[$k] = $v;
             }
@@ -256,7 +256,7 @@ 
 
         if (is_array($allowed_elements)) {
             foreach ($this->info as $name => $d) {
-                if(!isset($allowed_elements[$name])) unset($this->info[$name]);
+                if (!isset($allowed_elements[$name])) unset($this->info[$name]);
                 unset($allowed_elements[$name]);
             }
             // emit errors

classes/security/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php

Doc Comments +2 added lines, -1 removed lines

@@ -179,6 +179,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) {
         $this->registerModule($module);
@@ -325,7 +326,7 @@ 
     /**
      * Retrieves a single merged element definition
      * @param $name Name of element
-     * @param $trusted Boolean trusted overriding parameter: set to true
+     * @param boolean $trusted Boolean trusted overriding parameter: set to true
      *                 if you want the full version of an element
      * @return Merged HTMLPurifier_ElementDef
      * @note You may notice that modules are getting iterated over twice (once

Indentation +406 added lines, -406 removed lines

@@ -3,412 +3,412 @@
 class HTMLPurifier_HTMLModuleManager
 {
 
-    /**
-     * Instance of HTMLPurifier_DoctypeRegistry
-     */
-    public $doctypes;
-
-    /**
-     * Instance of current doctype
-     */
-    public $doctype;
-
-    /**
-     * Instance of HTMLPurifier_AttrTypes
-     */
-    public $attrTypes;
-
-    /**
-     * Active instances of modules for the specified doctype are
-     * indexed, by name, in this array.
-     */
-    public $modules = array();
-
-    /**
-     * Array of recognized HTMLPurifier_Module instances, indexed by
-     * module's class name. This array is usually lazy loaded, but a
-     * user can overload a module by pre-emptively registering it.
-     */
-    public $registeredModules = array();
-
-    /**
-     * List of extra modules that were added by the user using addModule().
-     * These get unconditionally merged into the current doctype, whatever
-     * it may be.
-     */
-    public $userModules = array();
-
-    /**
-     * Associative array of element name to list of modules that have
-     * definitions for the element; this array is dynamically filled.
-     */
-    public $elementLookup = array();
-
-    /** List of prefixes we should use for registering small names */
-    public $prefixes = array('HTMLPurifier_HTMLModule_');
-
-    public $contentSets;     /**< Instance of HTMLPurifier_ContentSets */
-    public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
-
-    /** If set to true, unsafe elements and attributes will be allowed */
-    public $trusted = false;
-
-    public function __construct() {
-
-        // editable internal objects
-        $this->attrTypes = new HTMLPurifier_AttrTypes();
-        $this->doctypes  = new HTMLPurifier_DoctypeRegistry();
-
-        // setup basic modules
-        $common = array(
-            'CommonAttributes', 'Text', 'Hypertext', 'List',
-            'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
-            'StyleAttribute',
-            // Unsafe:
-            'Scripting', 'Object', 'Forms',
-            // Sorta legacy, but present in strict:
-            'Name',
-        );
-        $transitional = array('Legacy', 'Target', 'Iframe');
-        $xml = array('XMLCommonAttributes');
-        $non_xml = array('NonXMLCommonAttributes');
-
-        // setup basic doctypes
-        $this->doctypes->register(
-            'HTML 4.01 Transitional', false,
-            array_merge($common, $transitional, $non_xml),
-            array('Tidy_Transitional', 'Tidy_Proprietary'),
-            array(),
-            '-//W3C//DTD HTML 4.01 Transitional//EN',
-            'http://www.w3.org/TR/html4/loose.dtd'
-        );
-
-        $this->doctypes->register(
-            'HTML 4.01 Strict', false,
-            array_merge($common, $non_xml),
-            array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD HTML 4.01//EN',
-            'http://www.w3.org/TR/html4/strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Transitional', true,
-            array_merge($common, $transitional, $xml, $non_xml),
-            array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Transitional//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.0 Strict', true,
-            array_merge($common, $xml, $non_xml),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
-            array(),
-            '-//W3C//DTD XHTML 1.0 Strict//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
-        );
-
-        $this->doctypes->register(
-            'XHTML 1.1', true,
-            // Iframe is a real XHTML 1.1 module, despite being
-            // "transitional"!
-            array_merge($common, $xml, array('Ruby', 'Iframe')),
-            array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
-            array(),
-            '-//W3C//DTD XHTML 1.1//EN',
-            'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
-        );
-
-    }
-
-    /**
-     * Registers a module to the recognized module list, useful for
-     * overloading pre-existing modules.
-     * @param $module Mixed: string module name, with or without
-     *                HTMLPurifier_HTMLModule prefix, or instance of
-     *                subclass of HTMLPurifier_HTMLModule.
-     * @param $overload Boolean whether or not to overload previous modules.
-     *                  If this is not set, and you do overload a module,
-     *                  HTML Purifier will complain with a warning.
-     * @note This function will not call autoload, you must instantiate
-     *       (and thus invoke) autoload outside the method.
-     * @note If a string is passed as a module name, different variants
-     *       will be tested in this order:
-     *          - Check for HTMLPurifier_HTMLModule_$name
-     *          - Check all prefixes with $name in order they were added
-     *          - Check for literal object name
-     *          - Throw fatal error
-     *       If your object name collides with an internal class, specify
-     *       your module manually. All modules must have been included
-     *       externally: registerModule will not perform inclusions for you!
-     */
-    public function registerModule($module, $overload = false) {
-        if (is_string($module)) {
-            // attempt to load the module
-            $original_module = $module;
-            $ok = false;
-            foreach ($this->prefixes as $prefix) {
-                $module = $prefix . $original_module;
-                if (class_exists($module)) {
-                    $ok = true;
-                    break;
-                }
-            }
-            if (!$ok) {
-                $module = $original_module;
-                if (!class_exists($module)) {
-                    trigger_error($original_module . ' module does not exist',
-                        E_USER_ERROR);
-                    return;
-                }
-            }
-            $module = new $module();
-        }
-        if (empty($module->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);
-        }
-        $this->registeredModules[$module->name] = $module;
-    }
-
-    /**
-     * Adds a module to the current doctype by first registering it,
-     * and then tacking it on to the active doctype
-     */
-    public function addModule($module) {
-        $this->registerModule($module);
-        if (is_object($module)) $module = $module->name;
-        $this->userModules[] = $module;
-    }
-
-    /**
-     * Adds a class prefix that registerModule() will use to resolve a
-     * string name to a concrete class
-     */
-    public function addPrefix($prefix) {
-        $this->prefixes[] = $prefix;
-    }
-
-    /**
-     * Performs processing on modules, after being called you may
-     * use getElement() and getElements()
-     * @param $config Instance of HTMLPurifier_Config
-     */
-    public function setup($config) {
-
-        $this->trusted = $config->get('HTML.Trusted');
-
-        // generate
-        $this->doctype = $this->doctypes->make($config);
-        $modules = $this->doctype->modules;
-
-        // take out the default modules that aren't allowed
-        $lookup = $config->get('HTML.AllowedModules');
-        $special_cases = $config->get('HTML.CoreModules');
-
-        if (is_array($lookup)) {
-            foreach ($modules as $k => $m) {
-                if (isset($special_cases[$m])) continue;
-                if (!isset($lookup[$m])) unset($modules[$k]);
-            }
-        }
-
-        // custom modules
-        if ($config->get('HTML.Proprietary')) {
-            $modules[] = 'Proprietary';
-        }
-        if ($config->get('HTML.SafeObject')) {
-            $modules[] = 'SafeObject';
-        }
-        if ($config->get('HTML.SafeEmbed')) {
-            $modules[] = 'SafeEmbed';
-        }
-        if ($config->get('HTML.Nofollow')) {
-            $modules[] = 'Nofollow';
-        }
-        if ($config->get('HTML.TargetBlank')) {
-            $modules[] = 'TargetBlank';
-        }
-
-        // merge in custom modules
-        $modules = array_merge($modules, $this->userModules);
-
-        foreach ($modules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        foreach ($this->doctype->tidyModules as $module) {
-            $this->processModule($module);
-            $this->modules[$module]->setup($config);
-        }
-
-        // prepare any injectors
-        foreach ($this->modules as $module) {
-            $n = array();
-            foreach ($module->info_injector as $i => $injector) {
-                if (!is_object($injector)) {
-                    $class = "HTMLPurifier_Injector_$injector";
-                    $injector = new $class;
-                }
-                $n[$injector->name] = $injector;
-            }
-            $module->info_injector = $n;
-        }
-
-        // 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();
-                }
-                $this->elementLookup[$name][] = $module->name;
-            }
-        }
-
-        // note the different choice
-        $this->contentSets = new HTMLPurifier_ContentSets(
-            // content set assembly deals with all possible modules,
-            // not just ones deemed to be "safe"
-            $this->modules
-        );
-        $this->attrCollections = new HTMLPurifier_AttrCollections(
-            $this->attrTypes,
-            // there is no way to directly disable a global attribute,
-            // but using AllowedAttributes or simply not including
-            // the module in your custom doctype should be sufficient
-            $this->modules
-        );
-    }
-
-    /**
-     * Takes a module and adds it to the active module collection,
-     * registering it if necessary.
-     */
-    public function processModule($module) {
-        if (!isset($this->registeredModules[$module]) || is_object($module)) {
-            $this->registerModule($module);
-        }
-        $this->modules[$module] = $this->registeredModules[$module];
-    }
-
-    /**
-     * Retrieves merged element definitions.
-     * @return Array of HTMLPurifier_ElementDef
-     */
-    public function getElements() {
-
-        $elements = array();
-        foreach ($this->modules as $module) {
-            if (!$this->trusted && !$module->safe) continue;
-            foreach ($module->info as $name => $v) {
-                if (isset($elements[$name])) continue;
-                $elements[$name] = $this->getElement($name);
-            }
-        }
-
-        // remove dud elements, this happens when an element that
-        // appeared to be safe actually wasn't
-        foreach ($elements as $n => $v) {
-            if ($v === false) unset($elements[$n]);
-        }
-
-        return $elements;
-
-    }
-
-    /**
-     * Retrieves a single merged element definition
-     * @param $name Name of element
-     * @param $trusted Boolean trusted overriding parameter: set to true
-     *                 if you want the full version of an element
-     * @return Merged HTMLPurifier_ElementDef
-     * @note You may notice that modules are getting iterated over twice (once
-     *       in getElements() and once here). This
-     *       is because
-     */
-    public function getElement($name, $trusted = null) {
-
-        if (!isset($this->elementLookup[$name])) {
-            return false;
-        }
-
-        // setup global state variables
-        $def = false;
-        if ($trusted === null) $trusted = $this->trusted;
-
-        // iterate through each module that has registered itself to this
-        // element
-        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.
-            if (!$trusted && !$module->safe) {
-                continue;
-            }
-
-            // 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];
-
-            if (!$def && $new_def->standalone) {
-                $def = $new_def;
-            } elseif ($def) {
-                // This will occur even if $new_def is standalone. In practice,
-                // this will usually result in a full replacement.
-                $def->mergeIn($new_def);
-            } else {
-                // :TODO:
-                // non-standalone definitions that don't have a standalone
-                // to merge into could be deferred to the end
-                // HOWEVER, it is perfectly valid for a non-standalone
-                // definition to lack a standalone definition, even
-                // after all processing: this allows us to safely
-                // specify extra attributes for elements that may not be
-                // enabled all in one place.  In particular, this might
-                // be the case for trusted elements.  WARNING: care must
-                // be taken that the /extra/ definitions are all safe.
-                continue;
-            }
-
-            // attribute value expansions
-            $this->attrCollections->performInclusions($def->attr);
-            $this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
-
-            // descendants_are_inline, for ChildDef_Chameleon
-            if (is_string($def->content_model) &&
-                strpos($def->content_model, 'Inline') !== false) {
-                if ($name != 'del' && $name != 'ins') {
-                    // this is for you, ins/del
-                    $def->descendants_are_inline = true;
-                }
-            }
-
-            $this->contentSets->generateChildDef($def, $module);
-        }
-
-        // This can occur if there is a blank definition, but no base to
-        // mix it in with
-        if (!$def) return false;
-
-        // add information on required attributes
-        foreach ($def->attr as $attr_name => $attr_def) {
-            if ($attr_def->required) {
-                $def->required_attr[] = $attr_name;
-            }
-        }
-
-        return $def;
-
-    }
+	/**
+	 * Instance of HTMLPurifier_DoctypeRegistry
+	 */
+	public $doctypes;
+
+	/**
+	 * Instance of current doctype
+	 */
+	public $doctype;
+
+	/**
+	 * Instance of HTMLPurifier_AttrTypes
+	 */
+	public $attrTypes;
+
+	/**
+	 * Active instances of modules for the specified doctype are
+	 * indexed, by name, in this array.
+	 */
+	public $modules = array();
+
+	/**
+	 * Array of recognized HTMLPurifier_Module instances, indexed by
+	 * module's class name. This array is usually lazy loaded, but a
+	 * user can overload a module by pre-emptively registering it.
+	 */
+	public $registeredModules = array();
+
+	/**
+	 * List of extra modules that were added by the user using addModule().
+	 * These get unconditionally merged into the current doctype, whatever
+	 * it may be.
+	 */
+	public $userModules = array();
+
+	/**
+	 * Associative array of element name to list of modules that have
+	 * definitions for the element; this array is dynamically filled.
+	 */
+	public $elementLookup = array();
+
+	/** List of prefixes we should use for registering small names */
+	public $prefixes = array('HTMLPurifier_HTMLModule_');
+
+	public $contentSets;     /**< Instance of HTMLPurifier_ContentSets */
+	public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
+
+	/** If set to true, unsafe elements and attributes will be allowed */
+	public $trusted = false;
+
+	public function __construct() {
+
+		// editable internal objects
+		$this->attrTypes = new HTMLPurifier_AttrTypes();
+		$this->doctypes  = new HTMLPurifier_DoctypeRegistry();
+
+		// setup basic modules
+		$common = array(
+			'CommonAttributes', 'Text', 'Hypertext', 'List',
+			'Presentation', 'Edit', 'Bdo', 'Tables', 'Image',
+			'StyleAttribute',
+			// Unsafe:
+			'Scripting', 'Object', 'Forms',
+			// Sorta legacy, but present in strict:
+			'Name',
+		);
+		$transitional = array('Legacy', 'Target', 'Iframe');
+		$xml = array('XMLCommonAttributes');
+		$non_xml = array('NonXMLCommonAttributes');
+
+		// setup basic doctypes
+		$this->doctypes->register(
+			'HTML 4.01 Transitional', false,
+			array_merge($common, $transitional, $non_xml),
+			array('Tidy_Transitional', 'Tidy_Proprietary'),
+			array(),
+			'-//W3C//DTD HTML 4.01 Transitional//EN',
+			'http://www.w3.org/TR/html4/loose.dtd'
+		);
+
+		$this->doctypes->register(
+			'HTML 4.01 Strict', false,
+			array_merge($common, $non_xml),
+			array('Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+			array(),
+			'-//W3C//DTD HTML 4.01//EN',
+			'http://www.w3.org/TR/html4/strict.dtd'
+		);
+
+		$this->doctypes->register(
+			'XHTML 1.0 Transitional', true,
+			array_merge($common, $transitional, $xml, $non_xml),
+			array('Tidy_Transitional', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Name'),
+			array(),
+			'-//W3C//DTD XHTML 1.0 Transitional//EN',
+			'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
+		);
+
+		$this->doctypes->register(
+			'XHTML 1.0 Strict', true,
+			array_merge($common, $xml, $non_xml),
+			array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Strict', 'Tidy_Proprietary', 'Tidy_Name'),
+			array(),
+			'-//W3C//DTD XHTML 1.0 Strict//EN',
+			'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+		);
+
+		$this->doctypes->register(
+			'XHTML 1.1', true,
+			// Iframe is a real XHTML 1.1 module, despite being
+			// "transitional"!
+			array_merge($common, $xml, array('Ruby', 'Iframe')),
+			array('Tidy_Strict', 'Tidy_XHTML', 'Tidy_Proprietary', 'Tidy_Strict', 'Tidy_Name'), // Tidy_XHTML1_1
+			array(),
+			'-//W3C//DTD XHTML 1.1//EN',
+			'http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd'
+		);
+
+	}
+
+	/**
+	 * Registers a module to the recognized module list, useful for
+	 * overloading pre-existing modules.
+	 * @param $module Mixed: string module name, with or without
+	 *                HTMLPurifier_HTMLModule prefix, or instance of
+	 *                subclass of HTMLPurifier_HTMLModule.
+	 * @param $overload Boolean whether or not to overload previous modules.
+	 *                  If this is not set, and you do overload a module,
+	 *                  HTML Purifier will complain with a warning.
+	 * @note This function will not call autoload, you must instantiate
+	 *       (and thus invoke) autoload outside the method.
+	 * @note If a string is passed as a module name, different variants
+	 *       will be tested in this order:
+	 *          - Check for HTMLPurifier_HTMLModule_$name
+	 *          - Check all prefixes with $name in order they were added
+	 *          - Check for literal object name
+	 *          - Throw fatal error
+	 *       If your object name collides with an internal class, specify
+	 *       your module manually. All modules must have been included
+	 *       externally: registerModule will not perform inclusions for you!
+	 */
+	public function registerModule($module, $overload = false) {
+		if (is_string($module)) {
+			// attempt to load the module
+			$original_module = $module;
+			$ok = false;
+			foreach ($this->prefixes as $prefix) {
+				$module = $prefix . $original_module;
+				if (class_exists($module)) {
+					$ok = true;
+					break;
+				}
+			}
+			if (!$ok) {
+				$module = $original_module;
+				if (!class_exists($module)) {
+					trigger_error($original_module . ' module does not exist',
+						E_USER_ERROR);
+					return;
+				}
+			}
+			$module = new $module();
+		}
+		if (empty($module->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);
+		}
+		$this->registeredModules[$module->name] = $module;
+	}
+
+	/**
+	 * Adds a module to the current doctype by first registering it,
+	 * and then tacking it on to the active doctype
+	 */
+	public function addModule($module) {
+		$this->registerModule($module);
+		if (is_object($module)) $module = $module->name;
+		$this->userModules[] = $module;
+	}
+
+	/**
+	 * Adds a class prefix that registerModule() will use to resolve a
+	 * string name to a concrete class
+	 */
+	public function addPrefix($prefix) {
+		$this->prefixes[] = $prefix;
+	}
+
+	/**
+	 * Performs processing on modules, after being called you may
+	 * use getElement() and getElements()
+	 * @param $config Instance of HTMLPurifier_Config
+	 */
+	public function setup($config) {
+
+		$this->trusted = $config->get('HTML.Trusted');
+
+		// generate
+		$this->doctype = $this->doctypes->make($config);
+		$modules = $this->doctype->modules;
+
+		// take out the default modules that aren't allowed
+		$lookup = $config->get('HTML.AllowedModules');
+		$special_cases = $config->get('HTML.CoreModules');
+
+		if (is_array($lookup)) {
+			foreach ($modules as $k => $m) {
+				if (isset($special_cases[$m])) continue;
+				if (!isset($lookup[$m])) unset($modules[$k]);
+			}
+		}
+
+		// custom modules
+		if ($config->get('HTML.Proprietary')) {
+			$modules[] = 'Proprietary';
+		}
+		if ($config->get('HTML.SafeObject')) {
+			$modules[] = 'SafeObject';
+		}
+		if ($config->get('HTML.SafeEmbed')) {
+			$modules[] = 'SafeEmbed';
+		}
+		if ($config->get('HTML.Nofollow')) {
+			$modules[] = 'Nofollow';
+		}
+		if ($config->get('HTML.TargetBlank')) {
+			$modules[] = 'TargetBlank';
+		}
+
+		// merge in custom modules
+		$modules = array_merge($modules, $this->userModules);
+
+		foreach ($modules as $module) {
+			$this->processModule($module);
+			$this->modules[$module]->setup($config);
+		}
+
+		foreach ($this->doctype->tidyModules as $module) {
+			$this->processModule($module);
+			$this->modules[$module]->setup($config);
+		}
+
+		// prepare any injectors
+		foreach ($this->modules as $module) {
+			$n = array();
+			foreach ($module->info_injector as $i => $injector) {
+				if (!is_object($injector)) {
+					$class = "HTMLPurifier_Injector_$injector";
+					$injector = new $class;
+				}
+				$n[$injector->name] = $injector;
+			}
+			$module->info_injector = $n;
+		}
+
+		// 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();
+				}
+				$this->elementLookup[$name][] = $module->name;
+			}
+		}
+
+		// note the different choice
+		$this->contentSets = new HTMLPurifier_ContentSets(
+			// content set assembly deals with all possible modules,
+			// not just ones deemed to be "safe"
+			$this->modules
+		);
+		$this->attrCollections = new HTMLPurifier_AttrCollections(
+			$this->attrTypes,
+			// there is no way to directly disable a global attribute,
+			// but using AllowedAttributes or simply not including
+			// the module in your custom doctype should be sufficient
+			$this->modules
+		);
+	}
+
+	/**
+	 * Takes a module and adds it to the active module collection,
+	 * registering it if necessary.
+	 */
+	public function processModule($module) {
+		if (!isset($this->registeredModules[$module]) || is_object($module)) {
+			$this->registerModule($module);
+		}
+		$this->modules[$module] = $this->registeredModules[$module];
+	}
+
+	/**
+	 * Retrieves merged element definitions.
+	 * @return Array of HTMLPurifier_ElementDef
+	 */
+	public function getElements() {
+
+		$elements = array();
+		foreach ($this->modules as $module) {
+			if (!$this->trusted && !$module->safe) continue;
+			foreach ($module->info as $name => $v) {
+				if (isset($elements[$name])) continue;
+				$elements[$name] = $this->getElement($name);
+			}
+		}
+
+		// remove dud elements, this happens when an element that
+		// appeared to be safe actually wasn't
+		foreach ($elements as $n => $v) {
+			if ($v === false) unset($elements[$n]);
+		}
+
+		return $elements;
+
+	}
+
+	/**
+	 * Retrieves a single merged element definition
+	 * @param $name Name of element
+	 * @param $trusted Boolean trusted overriding parameter: set to true
+	 *                 if you want the full version of an element
+	 * @return Merged HTMLPurifier_ElementDef
+	 * @note You may notice that modules are getting iterated over twice (once
+	 *       in getElements() and once here). This
+	 *       is because
+	 */
+	public function getElement($name, $trusted = null) {
+
+		if (!isset($this->elementLookup[$name])) {
+			return false;
+		}
+
+		// setup global state variables
+		$def = false;
+		if ($trusted === null) $trusted = $this->trusted;
+
+		// iterate through each module that has registered itself to this
+		// element
+		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.
+			if (!$trusted && !$module->safe) {
+				continue;
+			}
+
+			// 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];
+
+			if (!$def && $new_def->standalone) {
+				$def = $new_def;
+			} elseif ($def) {
+				// This will occur even if $new_def is standalone. In practice,
+				// this will usually result in a full replacement.
+				$def->mergeIn($new_def);
+			} else {
+				// :TODO:
+				// non-standalone definitions that don't have a standalone
+				// to merge into could be deferred to the end
+				// HOWEVER, it is perfectly valid for a non-standalone
+				// definition to lack a standalone definition, even
+				// after all processing: this allows us to safely
+				// specify extra attributes for elements that may not be
+				// enabled all in one place.  In particular, this might
+				// be the case for trusted elements.  WARNING: care must
+				// be taken that the /extra/ definitions are all safe.
+				continue;
+			}
+
+			// attribute value expansions
+			$this->attrCollections->performInclusions($def->attr);
+			$this->attrCollections->expandIdentifiers($def->attr, $this->attrTypes);
+
+			// descendants_are_inline, for ChildDef_Chameleon
+			if (is_string($def->content_model) &&
+				strpos($def->content_model, 'Inline') !== false) {
+				if ($name != 'del' && $name != 'ins') {
+					// this is for you, ins/del
+					$def->descendants_are_inline = true;
+				}
+			}
+
+			$this->contentSets->generateChildDef($def, $module);
+		}
+
+		// This can occur if there is a blank definition, but no base to
+		// mix it in with
+		if (!$def) return false;
+
+		// add information on required attributes
+		foreach ($def->attr as $attr_name => $attr_def) {
+			if ($attr_def->required) {
+				$def->required_attr[] = $attr_name;
+			}
+		}
+
+		return $def;
+
+	}
 
 }
 

Braces +24 added lines, -8 removed lines

@@ -182,7 +182,9 @@ 
      */
     public function addModule($module) {
         $this->registerModule($module);
-        if (is_object($module)) $module = $module->name;
+        if (is_object($module)) {
+        	$module = $module->name;
+        }
         $this->userModules[] = $module;
     }
 
@@ -213,8 +215,12 @@ 
 
         if (is_array($lookup)) {
             foreach ($modules as $k => $m) {
-                if (isset($special_cases[$m])) continue;
-                if (!isset($lookup[$m])) unset($modules[$k]);
+                if (isset($special_cases[$m])) {
+                	continue;
+                }
+                if (!isset($lookup[$m])) {
+                	unset($modules[$k]);
+                }
             }
         }
 
@@ -305,9 +311,13 @@ 
 
         $elements = array();
         foreach ($this->modules as $module) {
-            if (!$this->trusted && !$module->safe) continue;
+            if (!$this->trusted && !$module->safe) {
+            	continue;
+            }
             foreach ($module->info as $name => $v) {
-                if (isset($elements[$name])) continue;
+                if (isset($elements[$name])) {
+                	continue;
+                }
                 $elements[$name] = $this->getElement($name);
             }
         }
@@ -315,7 +325,9 @@ 
         // remove dud elements, this happens when an element that
         // appeared to be safe actually wasn't
         foreach ($elements as $n => $v) {
-            if ($v === false) unset($elements[$n]);
+            if ($v === false) {
+            	unset($elements[$n]);
+            }
         }
 
         return $elements;
@@ -340,7 +352,9 @@ 
 
         // setup global state variables
         $def = false;
-        if ($trusted === null) $trusted = $this->trusted;
+        if ($trusted === null) {
+        	$trusted = $this->trusted;
+        }
 
         // iterate through each module that has registered itself to this
         // element
@@ -397,7 +411,9 @@ 
 
         // This can occur if there is a blank definition, but no base to
         // mix it in with
-        if (!$def) return false;
+        if (!$def) {
+        	return false;
+        }
 
         // add information on required attributes
         foreach ($def->attr as $attr_name => $attr_def) {

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
     /** List of prefixes we should use for registering small names */
     public $prefixes = array('HTMLPurifier_HTMLModule_');
 
-    public $contentSets;     /**< Instance of HTMLPurifier_ContentSets */
+    public $contentSets; /**< Instance of HTMLPurifier_ContentSets */
     public $attrCollections; /**< Instance of HTMLPurifier_AttrCollections */
 
     /** If set to true, unsafe elements and attributes will be allowed */
@@ -150,7 +150,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;
@@ -159,7 +159,7 @@ 
             if (!$ok) {
                 $module = $original_module;
                 if (!class_exists($module)) {
-                    trigger_error($original_module . ' module does not exist',
+                    trigger_error($original_module.' module does not exist',
                         E_USER_ERROR);
                     return;
                 }
@@ -167,11 +167,11 @@ 
             $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);
+            trigger_error('Overloading '.$module->name.' without explicit overload parameter', E_USER_WARNING);
         }
         $this->registeredModules[$module->name] = $module;
     }
@@ -344,7 +344,7 @@ 
 
         // iterate through each module that has registered itself to this
         // element
-        foreach($this->elementLookup[$name] as $module_name) {
+        foreach ($this->elementLookup[$name] as $module_name) {
 
             $module = $this->modules[$module_name];
 

classes/security/htmlpurifier/library/HTMLPurifier/IDAccumulator.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      * Builds an IDAccumulator, also initializing the default blacklist
      * @param $config Instance of HTMLPurifier_Config
      * @param $context Instance of HTMLPurifier_Context
-     * @return Fully initialized HTMLPurifier_IDAccumulator
+     * @return HTMLPurifier_IDAccumulator initialized HTMLPurifier_IDAccumulator
      */
     public static function build($config, $context) {
         $id_accumulator = new HTMLPurifier_IDAccumulator();

Indentation +35 added lines, -35 removed lines

@@ -9,44 +9,44 @@
 class HTMLPurifier_IDAccumulator
 {
 
-    /**
-     * Lookup table of IDs we've accumulated.
-     * @public
-     */
-    public $ids = array();
+	/**
+	 * Lookup table of IDs we've accumulated.
+	 * @public
+	 */
+	public $ids = array();
 
-    /**
-     * Builds an IDAccumulator, also initializing the default blacklist
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Fully initialized HTMLPurifier_IDAccumulator
-     */
-    public static function build($config, $context) {
-        $id_accumulator = new HTMLPurifier_IDAccumulator();
-        $id_accumulator->load($config->get('Attr.IDBlacklist'));
-        return $id_accumulator;
-    }
+	/**
+	 * Builds an IDAccumulator, also initializing the default blacklist
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return Fully initialized HTMLPurifier_IDAccumulator
+	 */
+	public static function build($config, $context) {
+		$id_accumulator = new HTMLPurifier_IDAccumulator();
+		$id_accumulator->load($config->get('Attr.IDBlacklist'));
+		return $id_accumulator;
+	}
 
-    /**
-     * Add an ID to the lookup table.
-     * @param $id ID to be added.
-     * @return Bool status, true if success, false if there's a dupe
-     */
-    public function add($id) {
-        if (isset($this->ids[$id])) return false;
-        return $this->ids[$id] = true;
-    }
+	/**
+	 * Add an ID to the lookup table.
+	 * @param $id ID to be added.
+	 * @return Bool status, true if success, false if there's a dupe
+	 */
+	public function add($id) {
+		if (isset($this->ids[$id])) return false;
+		return $this->ids[$id] = true;
+	}
 
-    /**
-     * Load a list of IDs into the lookup table
-     * @param $array_of_ids Array of IDs to load
-     * @note This function doesn't care about duplicates
-     */
-    public function load($array_of_ids) {
-        foreach ($array_of_ids as $id) {
-            $this->ids[$id] = true;
-        }
-    }
+	/**
+	 * Load a list of IDs into the lookup table
+	 * @param $array_of_ids Array of IDs to load
+	 * @note This function doesn't care about duplicates
+	 */
+	public function load($array_of_ids) {
+		foreach ($array_of_ids as $id) {
+			$this->ids[$id] = true;
+		}
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
      * @return Bool status, true if success, false if there's a dupe
      */
     public function add($id) {
-        if (isset($this->ids[$id])) return false;
+        if (isset($this->ids[$id])) {
+        	return false;
+        }
         return $this->ids[$id] = true;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/Injector.php

Doc Comments +3 added lines, -2 removed lines

@@ -64,6 +64,7 @@ 
      * result in infinite loops if not used carefully.
      * @warning HTML Purifier will prevent you from fast-forwarding with this
      *          function.
+     * @param integer $index
      */
     public function rewind($index) {
         $this->rewind = $index;
@@ -123,8 +124,8 @@ 
 
     /**
      * Tests if the context node allows a certain element
-     * @param $name Name of element to test for
-     * @return True if element is allowed, false if it is not
+     * @param string $name Name of element to test for
+     * @return boolean if element is allowed, false if it is not
      */
     public function allowsElement($name) {
         if (!empty($this->currentNesting)) {

Indentation +216 added lines, -216 removed lines

@@ -16,222 +16,222 @@
 abstract class HTMLPurifier_Injector
 {
 
-    /**
-     * Advisory name of injector, this is for friendly error messages
-     */
-    public $name;
-
-    /**
-     * Instance of HTMLPurifier_HTMLDefinition
-     */
-    protected $htmlDefinition;
-
-    /**
-     * Reference to CurrentNesting variable in Context. This is an array
-     * list of tokens that we are currently "inside"
-     */
-    protected $currentNesting;
-
-    /**
-     * Reference to InputTokens variable in Context. This is an array
-     * list of the input tokens that are being processed.
-     */
-    protected $inputTokens;
-
-    /**
-     * Reference to InputIndex variable in Context. This is an integer
-     * array index for $this->inputTokens that indicates what token
-     * is currently being processed.
-     */
-    protected $inputIndex;
-
-    /**
-     * Array of elements and attributes this injector creates and therefore
-     * need to be allowed by the definition. Takes form of
-     * array('element' => array('attr', 'attr2'), 'element2')
-     */
-    public $needed = array();
-
-    /**
-     * Index of inputTokens to rewind to.
-     */
-    protected $rewind = false;
-
-    /**
-     * Rewind to a spot to re-perform processing. This is useful if you
-     * 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.
-     * @warning HTML Purifier will prevent you from fast-forwarding with this
-     *          function.
-     */
-    public function rewind($index) {
-        $this->rewind = $index;
-    }
-
-    /**
-     * Retrieves rewind, and then unsets it.
-     */
-    public function getRewind() {
-        $r = $this->rewind;
-        $this->rewind = false;
-        return $r;
-    }
-
-    /**
-     * Prepares the injector by giving it the config and context objects:
-     * this allows references to important variables to be made within
-     * the injector. This function also checks if the HTML environment
-     * will work with the Injector (see checkNeeded()).
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function prepare($config, $context) {
-        $this->htmlDefinition = $config->getHTMLDefinition();
-        // Even though this might fail, some unit tests ignore this and
-        // still test checkNeeded, so be careful. Maybe get rid of that
-        // dependency.
-        $result = $this->checkNeeded($config);
-        if ($result !== false) return $result;
-        $this->currentNesting =& $context->get('CurrentNesting');
-        $this->inputTokens    =& $context->get('InputTokens');
-        $this->inputIndex     =& $context->get('InputIndex');
-        return false;
-    }
-
-    /**
-     * This function checks if the HTML environment
-     * will work with the Injector: if p tags are not allowed, the
-     * Auto-Paragraphing injector should not be enabled.
-     * @param $config Instance of HTMLPurifier_Config
-     * @param $context Instance of HTMLPurifier_Context
-     * @return Boolean false if success, string of missing needed element/attribute if failure
-     */
-    public function checkNeeded($config) {
-        $def = $config->getHTMLDefinition();
-        foreach ($this->needed as $element => $attributes) {
-            if (is_int($element)) $element = $attributes;
-            if (!isset($def->info[$element])) return $element;
-            if (!is_array($attributes)) continue;
-            foreach ($attributes as $name) {
-                if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests if the context node allows a certain element
-     * @param $name Name of element to test for
-     * @return True if element is allowed, false if it is not
-     */
-    public function allowsElement($name) {
-        if (!empty($this->currentNesting)) {
-            $parent_token = array_pop($this->currentNesting);
-            $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])) {
-            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])) return false;
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, which starts with the next token and continues until
-     * you reach the end of the input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function forward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex + 1;
-        else $i++;
-        if (!isset($this->inputTokens[$i])) return false;
-        $current = $this->inputTokens[$i];
-        return true;
-    }
-
-    /**
-     * Similar to _forward, but accepts a third parameter $nesting (which
-     * should be initialized at 0) and stops when we hit the end tag
-     * for the node $this->inputIndex starts in.
-     */
-    protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
-        $result = $this->forward($i, $current);
-        if (!$result) return false;
-        if ($nesting === null) $nesting = 0;
-        if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
-        elseif ($current instanceof HTMLPurifier_Token_End) {
-            if ($nesting <= 0) return false;
-            $nesting--;
-        }
-        return true;
-    }
-
-    /**
-     * Iterator function, starts with the previous token and continues until
-     * you reach the beginning of input tokens.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function backward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex - 1;
-        else $i--;
-        if ($i < 0) return false;
-        $current = $this->inputTokens[$i];
-        return true;
-    }
-
-    /**
-     * Initializes the iterator at the current position. Use in a do {} while;
-     * loop to force the _forward and _backward functions to start at the
-     * current location.
-     * @warning Please prevent previous references from interfering with this
-     *          functions by setting $i = null beforehand!
-     * @param &$i Current integer index variable for inputTokens
-     * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
-     */
-    protected function current(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex;
-        $current = $this->inputTokens[$i];
-    }
-
-    /**
-     * Handler that is called when a text token is processed
-     */
-    public function handleText(&$token) {}
-
-    /**
-     * Handler that is called when a start or empty token is processed
-     */
-    public function handleElement(&$token) {}
-
-    /**
-     * Handler that is called when an end token is processed
-     */
-    public function handleEnd(&$token) {
-        $this->notifyEnd($token);
-    }
-
-    /**
-     * Notifier that is called when an end token is processed
-     * @note This differs from handlers in that the token is read-only
-     * @deprecated
-     */
-    public function notifyEnd($token) {}
+	/**
+	 * Advisory name of injector, this is for friendly error messages
+	 */
+	public $name;
+
+	/**
+	 * Instance of HTMLPurifier_HTMLDefinition
+	 */
+	protected $htmlDefinition;
+
+	/**
+	 * Reference to CurrentNesting variable in Context. This is an array
+	 * list of tokens that we are currently "inside"
+	 */
+	protected $currentNesting;
+
+	/**
+	 * Reference to InputTokens variable in Context. This is an array
+	 * list of the input tokens that are being processed.
+	 */
+	protected $inputTokens;
+
+	/**
+	 * Reference to InputIndex variable in Context. This is an integer
+	 * array index for $this->inputTokens that indicates what token
+	 * is currently being processed.
+	 */
+	protected $inputIndex;
+
+	/**
+	 * Array of elements and attributes this injector creates and therefore
+	 * need to be allowed by the definition. Takes form of
+	 * array('element' => array('attr', 'attr2'), 'element2')
+	 */
+	public $needed = array();
+
+	/**
+	 * Index of inputTokens to rewind to.
+	 */
+	protected $rewind = false;
+
+	/**
+	 * Rewind to a spot to re-perform processing. This is useful if you
+	 * 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.
+	 * @warning HTML Purifier will prevent you from fast-forwarding with this
+	 *          function.
+	 */
+	public function rewind($index) {
+		$this->rewind = $index;
+	}
+
+	/**
+	 * Retrieves rewind, and then unsets it.
+	 */
+	public function getRewind() {
+		$r = $this->rewind;
+		$this->rewind = false;
+		return $r;
+	}
+
+	/**
+	 * Prepares the injector by giving it the config and context objects:
+	 * this allows references to important variables to be made within
+	 * the injector. This function also checks if the HTML environment
+	 * will work with the Injector (see checkNeeded()).
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return Boolean false if success, string of missing needed element/attribute if failure
+	 */
+	public function prepare($config, $context) {
+		$this->htmlDefinition = $config->getHTMLDefinition();
+		// Even though this might fail, some unit tests ignore this and
+		// still test checkNeeded, so be careful. Maybe get rid of that
+		// dependency.
+		$result = $this->checkNeeded($config);
+		if ($result !== false) return $result;
+		$this->currentNesting =& $context->get('CurrentNesting');
+		$this->inputTokens    =& $context->get('InputTokens');
+		$this->inputIndex     =& $context->get('InputIndex');
+		return false;
+	}
+
+	/**
+	 * This function checks if the HTML environment
+	 * will work with the Injector: if p tags are not allowed, the
+	 * Auto-Paragraphing injector should not be enabled.
+	 * @param $config Instance of HTMLPurifier_Config
+	 * @param $context Instance of HTMLPurifier_Context
+	 * @return Boolean false if success, string of missing needed element/attribute if failure
+	 */
+	public function checkNeeded($config) {
+		$def = $config->getHTMLDefinition();
+		foreach ($this->needed as $element => $attributes) {
+			if (is_int($element)) $element = $attributes;
+			if (!isset($def->info[$element])) return $element;
+			if (!is_array($attributes)) continue;
+			foreach ($attributes as $name) {
+				if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Tests if the context node allows a certain element
+	 * @param $name Name of element to test for
+	 * @return True if element is allowed, false if it is not
+	 */
+	public function allowsElement($name) {
+		if (!empty($this->currentNesting)) {
+			$parent_token = array_pop($this->currentNesting);
+			$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])) {
+			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])) return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Iterator function, which starts with the next token and continues until
+	 * you reach the end of the input tokens.
+	 * @warning Please prevent previous references from interfering with this
+	 *          functions by setting $i = null beforehand!
+	 * @param &$i Current integer index variable for inputTokens
+	 * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+	 */
+	protected function forward(&$i, &$current) {
+		if ($i === null) $i = $this->inputIndex + 1;
+		else $i++;
+		if (!isset($this->inputTokens[$i])) return false;
+		$current = $this->inputTokens[$i];
+		return true;
+	}
+
+	/**
+	 * Similar to _forward, but accepts a third parameter $nesting (which
+	 * should be initialized at 0) and stops when we hit the end tag
+	 * for the node $this->inputIndex starts in.
+	 */
+	protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
+		$result = $this->forward($i, $current);
+		if (!$result) return false;
+		if ($nesting === null) $nesting = 0;
+		if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
+		elseif ($current instanceof HTMLPurifier_Token_End) {
+			if ($nesting <= 0) return false;
+			$nesting--;
+		}
+		return true;
+	}
+
+	/**
+	 * Iterator function, starts with the previous token and continues until
+	 * you reach the beginning of input tokens.
+	 * @warning Please prevent previous references from interfering with this
+	 *          functions by setting $i = null beforehand!
+	 * @param &$i Current integer index variable for inputTokens
+	 * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+	 */
+	protected function backward(&$i, &$current) {
+		if ($i === null) $i = $this->inputIndex - 1;
+		else $i--;
+		if ($i < 0) return false;
+		$current = $this->inputTokens[$i];
+		return true;
+	}
+
+	/**
+	 * Initializes the iterator at the current position. Use in a do {} while;
+	 * loop to force the _forward and _backward functions to start at the
+	 * current location.
+	 * @warning Please prevent previous references from interfering with this
+	 *          functions by setting $i = null beforehand!
+	 * @param &$i Current integer index variable for inputTokens
+	 * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
+	 */
+	protected function current(&$i, &$current) {
+		if ($i === null) $i = $this->inputIndex;
+		$current = $this->inputTokens[$i];
+	}
+
+	/**
+	 * Handler that is called when a text token is processed
+	 */
+	public function handleText(&$token) {}
+
+	/**
+	 * Handler that is called when a start or empty token is processed
+	 */
+	public function handleElement(&$token) {}
+
+	/**
+	 * Handler that is called when an end token is processed
+	 */
+	public function handleEnd(&$token) {
+		$this->notifyEnd($token);
+	}
+
+	/**
+	 * Notifier that is called when an end token is processed
+	 * @note This differs from handlers in that the token is read-only
+	 * @deprecated
+	 */
+	public function notifyEnd($token) {}
 
 
 }

Spacing +4 added lines, -4 removed lines

@@ -94,9 +94,9 @@ 
         // dependency.
         $result = $this->checkNeeded($config);
         if ($result !== false) return $result;
-        $this->currentNesting =& $context->get('CurrentNesting');
-        $this->inputTokens    =& $context->get('InputTokens');
-        $this->inputIndex     =& $context->get('InputIndex');
+        $this->currentNesting = & $context->get('CurrentNesting');
+        $this->inputTokens    = & $context->get('InputTokens');
+        $this->inputIndex     = & $context->get('InputIndex');
         return false;
     }
 
@@ -171,7 +171,7 @@ 
         $result = $this->forward($i, $current);
         if (!$result) return false;
         if ($nesting === null) $nesting = 0;
-        if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
+        if ($current instanceof HTMLPurifier_Token_Start) $nesting++;
         elseif ($current instanceof HTMLPurifier_Token_End) {
             if ($nesting <= 0) return false;
             $nesting--;

Braces +49 added lines, -18 removed lines

@@ -93,7 +93,9 @@ 
         // still test checkNeeded, so be careful. Maybe get rid of that
         // dependency.
         $result = $this->checkNeeded($config);
-        if ($result !== false) return $result;
+        if ($result !== false) {
+        	return $result;
+        }
         $this->currentNesting =& $context->get('CurrentNesting');
         $this->inputTokens    =& $context->get('InputTokens');
         $this->inputIndex     =& $context->get('InputIndex');
@@ -111,11 +113,19 @@ 
     public function checkNeeded($config) {
         $def = $config->getHTMLDefinition();
         foreach ($this->needed as $element => $attributes) {
-            if (is_int($element)) $element = $attributes;
-            if (!isset($def->info[$element])) return $element;
-            if (!is_array($attributes)) continue;
+            if (is_int($element)) {
+            	$element = $attributes;
+            }
+            if (!isset($def->info[$element])) {
+            	return $element;
+            }
+            if (!is_array($attributes)) {
+            	continue;
+            }
             foreach ($attributes as $name) {
-                if (!isset($def->info[$element]->attr[$name])) return "$element.$name";
+                if (!isset($def->info[$element]->attr[$name])) {
+                	return "$element.$name";
+                }
             }
         }
         return false;
@@ -141,7 +151,9 @@ 
         for ($i = count($this->currentNesting) - 2; $i >= 0; $i--) {
             $node = $this->currentNesting[$i];
             $def  = $this->htmlDefinition->info[$node->name];
-            if (isset($def->excludes[$name])) return false;
+            if (isset($def->excludes[$name])) {
+            	return false;
+            }
         }
         return true;
     }
@@ -155,9 +167,14 @@ 
      * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
      */
     protected function forward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex + 1;
-        else $i++;
-        if (!isset($this->inputTokens[$i])) return false;
+        if ($i === null) {
+        	$i = $this->inputIndex + 1;
+        } else {
+        	$i++;
+        }
+        if (!isset($this->inputTokens[$i])) {
+        	return false;
+        }
         $current = $this->inputTokens[$i];
         return true;
     }
@@ -169,11 +186,18 @@ 
      */
     protected function forwardUntilEndToken(&$i, &$current, &$nesting) {
         $result = $this->forward($i, $current);
-        if (!$result) return false;
-        if ($nesting === null) $nesting = 0;
-        if     ($current instanceof HTMLPurifier_Token_Start) $nesting++;
-        elseif ($current instanceof HTMLPurifier_Token_End) {
-            if ($nesting <= 0) return false;
+        if (!$result) {
+        	return false;
+        }
+        if ($nesting === null) {
+        	$nesting = 0;
+        }
+        if     ($current instanceof HTMLPurifier_Token_Start) {
+        	$nesting++;
+        } elseif ($current instanceof HTMLPurifier_Token_End) {
+            if ($nesting <= 0) {
+            	return false;
+            }
             $nesting--;
         }
         return true;
@@ -188,9 +212,14 @@ 
      * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
      */
     protected function backward(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex - 1;
-        else $i--;
-        if ($i < 0) return false;
+        if ($i === null) {
+        	$i = $this->inputIndex - 1;
+        } else {
+        	$i--;
+        }
+        if ($i < 0) {
+        	return false;
+        }
         $current = $this->inputTokens[$i];
         return true;
     }
@@ -205,7 +234,9 @@ 
      * @param &$current Current token variable. Do NOT use $token, as that variable is also a reference
      */
     protected function current(&$i, &$current) {
-        if ($i === null) $i = $this->inputIndex;
+        if ($i === null) {
+        	$i = $this->inputIndex;
+        }
         $current = $this->inputTokens[$i];
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/Language.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 
     /**
      * Retrieves a localised message.
-     * @param $key string identifier of message
+     * @param string $key string identifier of message
      * @return string localised message
      */
     public function getMessage($key) {

Indentation +150 added lines, -150 removed lines

@@ -7,156 +7,156 @@
 class HTMLPurifier_Language
 {
 
-    /**
-     * ISO 639 language code of language. Prefers shortest possible version
-     */
-    public $code = 'en';
-
-    /**
-     * Fallback language code
-     */
-    public $fallback = false;
-
-    /**
-     * Array of localizable messages
-     */
-    public $messages = array();
-
-    /**
-     * Array of localizable error codes
-     */
-    public $errorNames = array();
-
-    /**
-     * True if no message file was found for this language, so English
-     * is being used instead. Check this if you'd like to notify the
-     * user that they've used a non-supported language.
-     */
-    public $error = false;
-
-    /**
-     * Has the language object been loaded yet?
-     * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
-     */
-    public $_loaded = false;
-
-    /**
-     * Instances of HTMLPurifier_Config and HTMLPurifier_Context
-     */
-    protected $config, $context;
-
-    public function __construct($config, $context) {
-        $this->config  = $config;
-        $this->context = $context;
-    }
-
-    /**
-     * Loads language object with necessary info from factory cache
-     * @note This is a lazy loader
-     */
-    public function load() {
-        if ($this->_loaded) return;
-        $factory = HTMLPurifier_LanguageFactory::instance();
-        $factory->loadLanguage($this->code);
-        foreach ($factory->keys as $key) {
-            $this->$key = $factory->cache[$this->code][$key];
-        }
-        $this->_loaded = true;
-    }
-
-    /**
-     * Retrieves a localised message.
-     * @param $key string identifier of message
-     * @return string localised message
-     */
-    public function getMessage($key) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
-        return $this->messages[$key];
-    }
-
-    /**
-     * Retrieves a localised error name.
-     * @param $int integer error number, corresponding to PHP's error
-     *             reporting
-     * @return string localised message
-     */
-    public function getErrorName($int) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->errorNames[$int])) return "[Error: $int]";
-        return $this->errorNames[$int];
-    }
-
-    /**
-     * Converts an array list into a string readable representation
-     */
-    public function listify($array) {
-        $sep      = $this->getMessage('Item separator');
-        $sep_last = $this->getMessage('Item separator last');
-        $ret = '';
-        for ($i = 0, $c = count($array); $i < $c; $i++) {
-            if ($i == 0) {
-            } elseif ($i + 1 < $c) {
-                $ret .= $sep;
-            } else {
-                $ret .= $sep_last;
-            }
-            $ret .= $array[$i];
-        }
-        return $ret;
-    }
-
-    /**
-     * Formats a localised message with passed parameters
-     * @param $key string identifier of message
-     * @param $args Parameters to substitute in
-     * @return string localised message
-     * @todo Implement conditionals? Right now, some messages make
-     *     reference to line numbers, but those aren't always available
-     */
-    public function formatMessage($key, $args = array()) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
-        $raw = $this->messages[$key];
-        $subst = array();
-        $generator = false;
-        foreach ($args as $i => $value) {
-            if (is_object($value)) {
-                if ($value instanceof HTMLPurifier_Token) {
-                    // factor this out some time
-                    if (!$generator) $generator = $this->context->get('Generator');
-                    if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
-                    if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
-                    $subst['$'.$i.'.Compact'] =
-                    $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
-                    // a more complex algorithm for compact representation
-                    // could be introduced for all types of tokens. This
-                    // may need to be factored out into a dedicated class
-                    if (!empty($value->attr)) {
-                        $stripped_token = clone $value;
-                        $stripped_token->attr = array();
-                        $subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
-                    }
-                    $subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
-                }
-                continue;
-            } elseif (is_array($value)) {
-                $keys = array_keys($value);
-                if (array_keys($keys) === $keys) {
-                    // list
-                    $subst['$'.$i] = $this->listify($value);
-                } else {
-                    // associative array
-                    // no $i implementation yet, sorry
-                    $subst['$'.$i.'.Keys'] = $this->listify($keys);
-                    $subst['$'.$i.'.Values'] = $this->listify(array_values($value));
-                }
-                continue;
-            }
-            $subst['$' . $i] = $value;
-        }
-        return strtr($raw, $subst);
-    }
+	/**
+	 * ISO 639 language code of language. Prefers shortest possible version
+	 */
+	public $code = 'en';
+
+	/**
+	 * Fallback language code
+	 */
+	public $fallback = false;
+
+	/**
+	 * Array of localizable messages
+	 */
+	public $messages = array();
+
+	/**
+	 * Array of localizable error codes
+	 */
+	public $errorNames = array();
+
+	/**
+	 * True if no message file was found for this language, so English
+	 * is being used instead. Check this if you'd like to notify the
+	 * user that they've used a non-supported language.
+	 */
+	public $error = false;
+
+	/**
+	 * Has the language object been loaded yet?
+	 * @todo Make it private, fix usage in HTMLPurifier_LanguageTest
+	 */
+	public $_loaded = false;
+
+	/**
+	 * Instances of HTMLPurifier_Config and HTMLPurifier_Context
+	 */
+	protected $config, $context;
+
+	public function __construct($config, $context) {
+		$this->config  = $config;
+		$this->context = $context;
+	}
+
+	/**
+	 * Loads language object with necessary info from factory cache
+	 * @note This is a lazy loader
+	 */
+	public function load() {
+		if ($this->_loaded) return;
+		$factory = HTMLPurifier_LanguageFactory::instance();
+		$factory->loadLanguage($this->code);
+		foreach ($factory->keys as $key) {
+			$this->$key = $factory->cache[$this->code][$key];
+		}
+		$this->_loaded = true;
+	}
+
+	/**
+	 * Retrieves a localised message.
+	 * @param $key string identifier of message
+	 * @return string localised message
+	 */
+	public function getMessage($key) {
+		if (!$this->_loaded) $this->load();
+		if (!isset($this->messages[$key])) return "[$key]";
+		return $this->messages[$key];
+	}
+
+	/**
+	 * Retrieves a localised error name.
+	 * @param $int integer error number, corresponding to PHP's error
+	 *             reporting
+	 * @return string localised message
+	 */
+	public function getErrorName($int) {
+		if (!$this->_loaded) $this->load();
+		if (!isset($this->errorNames[$int])) return "[Error: $int]";
+		return $this->errorNames[$int];
+	}
+
+	/**
+	 * Converts an array list into a string readable representation
+	 */
+	public function listify($array) {
+		$sep      = $this->getMessage('Item separator');
+		$sep_last = $this->getMessage('Item separator last');
+		$ret = '';
+		for ($i = 0, $c = count($array); $i < $c; $i++) {
+			if ($i == 0) {
+			} elseif ($i + 1 < $c) {
+				$ret .= $sep;
+			} else {
+				$ret .= $sep_last;
+			}
+			$ret .= $array[$i];
+		}
+		return $ret;
+	}
+
+	/**
+	 * Formats a localised message with passed parameters
+	 * @param $key string identifier of message
+	 * @param $args Parameters to substitute in
+	 * @return string localised message
+	 * @todo Implement conditionals? Right now, some messages make
+	 *     reference to line numbers, but those aren't always available
+	 */
+	public function formatMessage($key, $args = array()) {
+		if (!$this->_loaded) $this->load();
+		if (!isset($this->messages[$key])) return "[$key]";
+		$raw = $this->messages[$key];
+		$subst = array();
+		$generator = false;
+		foreach ($args as $i => $value) {
+			if (is_object($value)) {
+				if ($value instanceof HTMLPurifier_Token) {
+					// factor this out some time
+					if (!$generator) $generator = $this->context->get('Generator');
+					if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
+					if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
+					$subst['$'.$i.'.Compact'] =
+					$subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
+					// a more complex algorithm for compact representation
+					// could be introduced for all types of tokens. This
+					// may need to be factored out into a dedicated class
+					if (!empty($value->attr)) {
+						$stripped_token = clone $value;
+						$stripped_token->attr = array();
+						$subst['$'.$i.'.Compact'] = $generator->generateFromToken($stripped_token);
+					}
+					$subst['$'.$i.'.Line'] = $value->line ? $value->line : 'unknown';
+				}
+				continue;
+			} elseif (is_array($value)) {
+				$keys = array_keys($value);
+				if (array_keys($keys) === $keys) {
+					// list
+					$subst['$'.$i] = $this->listify($value);
+				} else {
+					// associative array
+					// no $i implementation yet, sorry
+					$subst['$'.$i.'.Keys'] = $this->listify($keys);
+					$subst['$'.$i.'.Values'] = $this->listify(array_values($value));
+				}
+				continue;
+			}
+			$subst['$' . $i] = $value;
+		}
+		return strtr($raw, $subst);
+	}
 
 }
 

Braces +30 added lines, -10 removed lines

@@ -55,7 +55,9 @@ 
      * @note This is a lazy loader
      */
     public function load() {
-        if ($this->_loaded) return;
+        if ($this->_loaded) {
+        	return;
+        }
         $factory = HTMLPurifier_LanguageFactory::instance();
         $factory->loadLanguage($this->code);
         foreach ($factory->keys as $key) {
@@ -70,8 +72,12 @@ 
      * @return string localised message
      */
     public function getMessage($key) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
+        if (!$this->_loaded) {
+        	$this->load();
+        }
+        if (!isset($this->messages[$key])) {
+        	return "[$key]";
+        }
         return $this->messages[$key];
     }
 
@@ -82,8 +88,12 @@ 
      * @return string localised message
      */
     public function getErrorName($int) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->errorNames[$int])) return "[Error: $int]";
+        if (!$this->_loaded) {
+        	$this->load();
+        }
+        if (!isset($this->errorNames[$int])) {
+        	return "[Error: $int]";
+        }
         return $this->errorNames[$int];
     }
 
@@ -115,8 +125,12 @@ 
      *     reference to line numbers, but those aren't always available
      */
     public function formatMessage($key, $args = array()) {
-        if (!$this->_loaded) $this->load();
-        if (!isset($this->messages[$key])) return "[$key]";
+        if (!$this->_loaded) {
+        	$this->load();
+        }
+        if (!isset($this->messages[$key])) {
+        	return "[$key]";
+        }
         $raw = $this->messages[$key];
         $subst = array();
         $generator = false;
@@ -124,9 +138,15 @@ 
             if (is_object($value)) {
                 if ($value instanceof HTMLPurifier_Token) {
                     // factor this out some time
-                    if (!$generator) $generator = $this->context->get('Generator');
-                    if (isset($value->name)) $subst['$'.$i.'.Name'] = $value->name;
-                    if (isset($value->data)) $subst['$'.$i.'.Data'] = $value->data;
+                    if (!$generator) {
+                    	$generator = $this->context->get('Generator');
+                    }
+                    if (isset($value->name)) {
+                    	$subst['$'.$i.'.Name'] = $value->name;
+                    }
+                    if (isset($value->data)) {
+                    	$subst['$'.$i.'.Data'] = $value->data;
+                    }
                     $subst['$'.$i.'.Compact'] =
                     $subst['$'.$i.'.Serialized'] = $generator->generateFromToken($value);
                     // a more complex algorithm for compact representation

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
                 }
                 continue;
             }
-            $subst['$' . $i] = $value;
+            $subst['$'.$i] = $value;
         }
         return strtr($raw, $subst);
     }

classes/security/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php

Doc Comments +4 added lines, -1 removed lines

@@ -319,6 +319,9 @@ 
 
     /**
      * PHP 5.0.x compatible substr_count that implements offset and length
+     * @param string $needle
+     * @param integer $offset
+     * @param integer $length
      */
     protected function substrCount($haystack, $needle, $offset, $length) {
         static $oldVersion;
@@ -336,7 +339,7 @@ 
     /**
      * Takes the inside of an HTML tag and makes an assoc array of attributes.
      *
-     * @param $string Inside of tag excluding name.
+     * @param string $string Inside of tag excluding name.
      * @returns Assoc array of attributes.
      */
     public function parseAttributeString($string, $config, $context) {

Indentation +471 added lines, -471 removed lines

@@ -13,477 +13,477 @@
 class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
 {
 
-    public $tracksLineNumbers = true;
-
-    /**
-     * Whitespace characters for str(c)spn.
-     */
-    protected $_whitespace = "\x20\x09\x0D\x0A";
-
-    /**
-     * Callback function for script CDATA fudge
-     * @param $matches, in form of array(opening tag, contents, closing tag)
-     */
-    protected function scriptCallback($matches) {
-        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8', false) . $matches[3];
-    }
-
-    public function tokenizeHTML($html, $config, $context) {
-
-        // special normalization for script tags without any armor
-        // our "armor" heurstic is a < sign any number of whitespaces after
-        // the first script tag
-        if ($config->get('HTML.Trusted')) {
-            $html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
-                array($this, 'scriptCallback'), $html);
-        }
-
-        $html = $this->normalize($html, $config, $context);
-
-        $cursor = 0; // our location in the text
-        $inside_tag = false; // whether or not we're parsing the inside of a tag
-        $array = array(); // result array
-
-        // This is also treated to mean maintain *column* numbers too
-        $maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
-
-        if ($maintain_line_numbers === null) {
-            // automatically determine line numbering by checking
-            // if error collection is on
-            $maintain_line_numbers = $config->get('Core.CollectErrors');
-        }
-
-        if ($maintain_line_numbers) {
-            $current_line = 1;
-            $current_col  = 0;
-            $length = strlen($html);
-        } else {
-            $current_line = false;
-            $current_col  = false;
-            $length = false;
-        }
-        $context->register('CurrentLine', $current_line);
-        $context->register('CurrentCol',  $current_col);
-        $nl = "\n";
-        // how often to manually recalculate. This will ALWAYS be right,
-        // but it's pretty wasteful. Set to 0 to turn off
-        $synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // for testing synchronization
-        $loops = 0;
-
-        while(++$loops) {
-
-            // $cursor is either at the start of a token, or inside of
-            // a tag (i.e. there was a < immediately before it), as indicated
-            // by $inside_tag
-
-            if ($maintain_line_numbers) {
-
-                // $rcursor, however, is always at the start of a token.
-                $rcursor = $cursor - (int) $inside_tag;
-
-                // Column number is cheap, so we calculate it every round.
-                // We're interested at the *end* of the newline string, so
-                // we need to add strlen($nl) == 1 to $nl_pos before subtracting it
-                // from our "rcursor" position.
-                $nl_pos = strrpos($html, $nl, $rcursor - $length);
-                $current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
-
-                // recalculate lines
-                if (
-                    $synchronize_interval &&  // synchronization is on
-                    $cursor > 0 &&            // cursor is further than zero
-                    $loops % $synchronize_interval === 0 // time to synchronize!
-                ) {
-                    $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
-                }
-
-            }
-
-            $position_next_lt = strpos($html, '<', $cursor);
-            $position_next_gt = strpos($html, '>', $cursor);
-
-            // triggers on "<b>asdf</b>" but not "asdf <b></b>"
-            // special case to set up context
-            if ($position_next_lt === $cursor) {
-                $inside_tag = true;
-                $cursor++;
-            }
-
-            if (!$inside_tag && $position_next_lt !== false) {
-                // We are not inside tag and there still is another tag to parse
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        $this->parseData(
-                            substr(
-                                $html, $cursor, $position_next_lt - $cursor
-                            )
-                        )
-                    );
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
-                }
-                $array[] = $token;
-                $cursor  = $position_next_lt + 1;
-                $inside_tag = true;
-                continue;
-            } elseif (!$inside_tag) {
-                // We are not inside tag but there are no more tags
-                // If we're already at the end, break
-                if ($cursor === strlen($html)) break;
-                // Create Text of rest of string
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        $this->parseData(
-                            substr(
-                                $html, $cursor
-                            )
-                        )
-                    );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
-                $array[] = $token;
-                break;
-            } elseif ($inside_tag && $position_next_gt !== false) {
-                // We are in tag and it is well formed
-                // Grab the internals of the tag
-                $strlen_segment = $position_next_gt - $cursor;
-
-                if ($strlen_segment < 1) {
-                    // there's nothing to process!
-                    $token = new HTMLPurifier_Token_Text('<');
-                    $cursor++;
-                    continue;
-                }
-
-                $segment = substr($html, $cursor, $strlen_segment);
-
-                if ($segment === false) {
-                    // somehow, we attempted to access beyond the end of
-                    // the string, defense-in-depth, reported by Nate Abele
-                    break;
-                }
-
-                // Check if it's a comment
-                if (
-                    substr($segment, 0, 3) === '!--'
-                ) {
-                    // re-determine segment length, looking for -->
-                    $position_comment_end = strpos($html, '-->', $cursor);
-                    if ($position_comment_end === false) {
-                        // uh oh, we have a comment that extends to
-                        // infinity. Can't be helped: set comment
-                        // end position to end of string
-                        if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
-                        $position_comment_end = strlen($html);
-                        $end = true;
-                    } else {
-                        $end = false;
-                    }
-                    $strlen_segment = $position_comment_end - $cursor;
-                    $segment = substr($html, $cursor, $strlen_segment);
-                    $token = new
-                        HTMLPurifier_Token_Comment(
-                            substr(
-                                $segment, 3, $strlen_segment - 3
-                            )
-                        );
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
-                    }
-                    $array[] = $token;
-                    $cursor = $end ? $position_comment_end : $position_comment_end + 3;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it's an end tag
-                $is_end_tag = (strpos($segment,'/') === 0);
-                if ($is_end_tag) {
-                    $type = substr($segment, 1);
-                    $token = new HTMLPurifier_Token_End($type);
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Check leading character is alnum, if not, we may
-                // have accidently grabbed an emoticon. Translate into
-                // text and go our merry way
-                if (!ctype_alpha($segment[0])) {
-                    // XML:  $segment[0] !== '_' && $segment[0] !== ':'
-                    if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
-                    $token = new HTMLPurifier_Token_Text('<');
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    continue;
-                }
-
-                // Check if it is explicitly self closing, if so, remove
-                // trailing slash. Remember, we could have a tag like <br>, so
-                // any later token processing scripts must convert improperly
-                // classified EmptyTags from StartTags.
-                $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
-                if ($is_self_closing) {
-                    $strlen_segment--;
-                    $segment = substr($segment, 0, $strlen_segment);
-                }
-
-                // Check if there are any attributes
-                $position_first_space = strcspn($segment, $this->_whitespace);
-
-                if ($position_first_space >= $strlen_segment) {
-                    if ($is_self_closing) {
-                        $token = new HTMLPurifier_Token_Empty($segment);
-                    } else {
-                        $token = new HTMLPurifier_Token_Start($segment);
-                    }
-                    if ($maintain_line_numbers) {
-                        $token->rawPosition($current_line, $current_col);
-                        $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                    }
-                    $array[] = $token;
-                    $inside_tag = false;
-                    $cursor = $position_next_gt + 1;
-                    continue;
-                }
-
-                // Grab out all the data
-                $type = substr($segment, 0, $position_first_space);
-                $attribute_string =
-                    trim(
-                        substr(
-                            $segment, $position_first_space
-                        )
-                    );
-                if ($attribute_string) {
-                    $attr = $this->parseAttributeString(
-                                    $attribute_string
-                                  , $config, $context
-                              );
-                } else {
-                    $attr = array();
-                }
-
-                if ($is_self_closing) {
-                    $token = new HTMLPurifier_Token_Empty($type, $attr);
-                } else {
-                    $token = new HTMLPurifier_Token_Start($type, $attr);
-                }
-                if ($maintain_line_numbers) {
-                    $token->rawPosition($current_line, $current_col);
-                    $current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
-                }
-                $array[] = $token;
-                $cursor = $position_next_gt + 1;
-                $inside_tag = false;
-                continue;
-            } else {
-                // inside tag, but there's no ending > sign
-                if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
-                $token = new
-                    HTMLPurifier_Token_Text(
-                        '<' .
-                        $this->parseData(
-                            substr($html, $cursor)
-                        )
-                    );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
-                // no cursor scroll? Hmm...
-                $array[] = $token;
-                break;
-            }
-            break;
-        }
-
-        $context->destroy('CurrentLine');
-        $context->destroy('CurrentCol');
-        return $array;
-    }
-
-    /**
-     * PHP 5.0.x compatible substr_count that implements offset and length
-     */
-    protected function substrCount($haystack, $needle, $offset, $length) {
-        static $oldVersion;
-        if ($oldVersion === null) {
-            $oldVersion = version_compare(PHP_VERSION, '5.1', '<');
-        }
-        if ($oldVersion) {
-            $haystack = substr($haystack, $offset, $length);
-            return substr_count($haystack, $needle);
-        } else {
-            return substr_count($haystack, $needle, $offset, $length);
-        }
-    }
-
-    /**
-     * Takes the inside of an HTML tag and makes an assoc array of attributes.
-     *
-     * @param $string Inside of tag excluding name.
-     * @returns Assoc array of attributes.
-     */
-    public function parseAttributeString($string, $config, $context) {
-        $string = (string) $string; // quick typecast
-
-        if ($string == '') return array(); // no attributes
-
-        $e = false;
-        if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
-        }
-
-        // let's see if we can abort as quickly as possible
-        // one equal sign, no spaces => one attribute
-        $num_equal = substr_count($string, '=');
-        $has_space = strpos($string, ' ');
-        if ($num_equal === 0 && !$has_space) {
-            // bool attribute
-            return array($string => $string);
-        } elseif ($num_equal === 1 && !$has_space) {
-            // only one attribute
-            list($key, $quoted_value) = explode('=', $string);
-            $quoted_value = trim($quoted_value);
-            if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                return array();
-            }
-            if (!$quoted_value) return array($key => '');
-            $first_char = @$quoted_value[0];
-            $last_char  = @$quoted_value[strlen($quoted_value)-1];
-
-            $same_quote = ($first_char == $last_char);
-            $open_quote = ($first_char == '"' || $first_char == "'");
-
-            if ( $same_quote && $open_quote) {
-                // well behaved
-                $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
-            } else {
-                // not well behaved
-                if ($open_quote) {
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
-                    $value = substr($quoted_value, 1);
-                } else {
-                    $value = $quoted_value;
-                }
-            }
-            if ($value === false) $value = '';
-            return array($key => $this->parseData($value));
-        }
-
-        // setup loop environment
-        $array  = array(); // return assoc array of attributes
-        $cursor = 0; // current position in string (moves forward)
-        $size   = strlen($string); // size of the string (stays the same)
-
-        // if we have unquoted attributes, the parser expects a terminating
-        // space, so let's guarantee that there's always a terminating space.
-        $string .= ' ';
-
-        while(true) {
-
-            if ($cursor >= $size) {
-                break;
-            }
-
-            $cursor += ($value = strspn($string, $this->_whitespace, $cursor));
-            // grab the key
-
-            $key_begin = $cursor; //we're currently at the start of the key
-
-            // scroll past all characters that are the key (not whitespace or =)
-            $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
-
-            $key_end = $cursor; // now at the end of the key
-
-            $key = substr($string, $key_begin, $key_end - $key_begin);
-
-            if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
-                continue; // empty key
-            }
-
-            // scroll past all whitespace
-            $cursor += strspn($string, $this->_whitespace, $cursor);
-
-            if ($cursor >= $size) {
-                $array[$key] = $key;
-                break;
-            }
-
-            // if the next character is an equal sign, we've got a regular
-            // pair, otherwise, it's a bool attribute
-            $first_char = @$string[$cursor];
-
-            if ($first_char == '=') {
-                // key="value"
-
-                $cursor++;
-                $cursor += strspn($string, $this->_whitespace, $cursor);
-
-                if ($cursor === false) {
-                    $array[$key] = '';
-                    break;
-                }
-
-                // we might be in front of a quote right now
-
-                $char = @$string[$cursor];
-
-                if ($char == '"' || $char == "'") {
-                    // it's quoted, end bound is $char
-                    $cursor++;
-                    $value_begin = $cursor;
-                    $cursor = strpos($string, $char, $cursor);
-                    $value_end = $cursor;
-                } else {
-                    // it's not quoted, end bound is whitespace
-                    $value_begin = $cursor;
-                    $cursor += strcspn($string, $this->_whitespace, $cursor);
-                    $value_end = $cursor;
-                }
-
-                // we reached a premature end
-                if ($cursor === false) {
-                    $cursor = $size;
-                    $value_end = $cursor;
-                }
-
-                $value = substr($string, $value_begin, $value_end - $value_begin);
-                if ($value === false) $value = '';
-                $array[$key] = $this->parseData($value);
-                $cursor++;
-
-            } else {
-                // boolattr
-                if ($key !== '') {
-                    $array[$key] = $key;
-                } else {
-                    // purely theoretical
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
-                }
-
-            }
-        }
-        return $array;
-    }
+	public $tracksLineNumbers = true;
+
+	/**
+	 * Whitespace characters for str(c)spn.
+	 */
+	protected $_whitespace = "\x20\x09\x0D\x0A";
+
+	/**
+	 * Callback function for script CDATA fudge
+	 * @param $matches, in form of array(opening tag, contents, closing tag)
+	 */
+	protected function scriptCallback($matches) {
+		return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8', false) . $matches[3];
+	}
+
+	public function tokenizeHTML($html, $config, $context) {
+
+		// special normalization for script tags without any armor
+		// our "armor" heurstic is a < sign any number of whitespaces after
+		// the first script tag
+		if ($config->get('HTML.Trusted')) {
+			$html = preg_replace_callback('#(<script[^>]*>)(\s*[^<].+?)(</script>)#si',
+				array($this, 'scriptCallback'), $html);
+		}
+
+		$html = $this->normalize($html, $config, $context);
+
+		$cursor = 0; // our location in the text
+		$inside_tag = false; // whether or not we're parsing the inside of a tag
+		$array = array(); // result array
+
+		// This is also treated to mean maintain *column* numbers too
+		$maintain_line_numbers = $config->get('Core.MaintainLineNumbers');
+
+		if ($maintain_line_numbers === null) {
+			// automatically determine line numbering by checking
+			// if error collection is on
+			$maintain_line_numbers = $config->get('Core.CollectErrors');
+		}
+
+		if ($maintain_line_numbers) {
+			$current_line = 1;
+			$current_col  = 0;
+			$length = strlen($html);
+		} else {
+			$current_line = false;
+			$current_col  = false;
+			$length = false;
+		}
+		$context->register('CurrentLine', $current_line);
+		$context->register('CurrentCol',  $current_col);
+		$nl = "\n";
+		// how often to manually recalculate. This will ALWAYS be right,
+		// but it's pretty wasteful. Set to 0 to turn off
+		$synchronize_interval = $config->get('Core.DirectLexLineNumberSyncInterval');
+
+		$e = false;
+		if ($config->get('Core.CollectErrors')) {
+			$e =& $context->get('ErrorCollector');
+		}
+
+		// for testing synchronization
+		$loops = 0;
+
+		while(++$loops) {
+
+			// $cursor is either at the start of a token, or inside of
+			// a tag (i.e. there was a < immediately before it), as indicated
+			// by $inside_tag
+
+			if ($maintain_line_numbers) {
+
+				// $rcursor, however, is always at the start of a token.
+				$rcursor = $cursor - (int) $inside_tag;
+
+				// Column number is cheap, so we calculate it every round.
+				// We're interested at the *end* of the newline string, so
+				// we need to add strlen($nl) == 1 to $nl_pos before subtracting it
+				// from our "rcursor" position.
+				$nl_pos = strrpos($html, $nl, $rcursor - $length);
+				$current_col = $rcursor - (is_bool($nl_pos) ? 0 : $nl_pos + 1);
+
+				// recalculate lines
+				if (
+					$synchronize_interval &&  // synchronization is on
+					$cursor > 0 &&            // cursor is further than zero
+					$loops % $synchronize_interval === 0 // time to synchronize!
+				) {
+					$current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
+				}
+
+			}
+
+			$position_next_lt = strpos($html, '<', $cursor);
+			$position_next_gt = strpos($html, '>', $cursor);
+
+			// triggers on "<b>asdf</b>" but not "asdf <b></b>"
+			// special case to set up context
+			if ($position_next_lt === $cursor) {
+				$inside_tag = true;
+				$cursor++;
+			}
+
+			if (!$inside_tag && $position_next_lt !== false) {
+				// We are not inside tag and there still is another tag to parse
+				$token = new
+					HTMLPurifier_Token_Text(
+						$this->parseData(
+							substr(
+								$html, $cursor, $position_next_lt - $cursor
+							)
+						)
+					);
+				if ($maintain_line_numbers) {
+					$token->rawPosition($current_line, $current_col);
+					$current_line += $this->substrCount($html, $nl, $cursor, $position_next_lt - $cursor);
+				}
+				$array[] = $token;
+				$cursor  = $position_next_lt + 1;
+				$inside_tag = true;
+				continue;
+			} elseif (!$inside_tag) {
+				// We are not inside tag but there are no more tags
+				// If we're already at the end, break
+				if ($cursor === strlen($html)) break;
+				// Create Text of rest of string
+				$token = new
+					HTMLPurifier_Token_Text(
+						$this->parseData(
+							substr(
+								$html, $cursor
+							)
+						)
+					);
+				if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+				$array[] = $token;
+				break;
+			} elseif ($inside_tag && $position_next_gt !== false) {
+				// We are in tag and it is well formed
+				// Grab the internals of the tag
+				$strlen_segment = $position_next_gt - $cursor;
+
+				if ($strlen_segment < 1) {
+					// there's nothing to process!
+					$token = new HTMLPurifier_Token_Text('<');
+					$cursor++;
+					continue;
+				}
+
+				$segment = substr($html, $cursor, $strlen_segment);
+
+				if ($segment === false) {
+					// somehow, we attempted to access beyond the end of
+					// the string, defense-in-depth, reported by Nate Abele
+					break;
+				}
+
+				// Check if it's a comment
+				if (
+					substr($segment, 0, 3) === '!--'
+				) {
+					// re-determine segment length, looking for -->
+					$position_comment_end = strpos($html, '-->', $cursor);
+					if ($position_comment_end === false) {
+						// uh oh, we have a comment that extends to
+						// infinity. Can't be helped: set comment
+						// end position to end of string
+						if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
+						$position_comment_end = strlen($html);
+						$end = true;
+					} else {
+						$end = false;
+					}
+					$strlen_segment = $position_comment_end - $cursor;
+					$segment = substr($html, $cursor, $strlen_segment);
+					$token = new
+						HTMLPurifier_Token_Comment(
+							substr(
+								$segment, 3, $strlen_segment - 3
+							)
+						);
+					if ($maintain_line_numbers) {
+						$token->rawPosition($current_line, $current_col);
+						$current_line += $this->substrCount($html, $nl, $cursor, $strlen_segment);
+					}
+					$array[] = $token;
+					$cursor = $end ? $position_comment_end : $position_comment_end + 3;
+					$inside_tag = false;
+					continue;
+				}
+
+				// Check if it's an end tag
+				$is_end_tag = (strpos($segment,'/') === 0);
+				if ($is_end_tag) {
+					$type = substr($segment, 1);
+					$token = new HTMLPurifier_Token_End($type);
+					if ($maintain_line_numbers) {
+						$token->rawPosition($current_line, $current_col);
+						$current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+					}
+					$array[] = $token;
+					$inside_tag = false;
+					$cursor = $position_next_gt + 1;
+					continue;
+				}
+
+				// Check leading character is alnum, if not, we may
+				// have accidently grabbed an emoticon. Translate into
+				// text and go our merry way
+				if (!ctype_alpha($segment[0])) {
+					// XML:  $segment[0] !== '_' && $segment[0] !== ':'
+					if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
+					$token = new HTMLPurifier_Token_Text('<');
+					if ($maintain_line_numbers) {
+						$token->rawPosition($current_line, $current_col);
+						$current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+					}
+					$array[] = $token;
+					$inside_tag = false;
+					continue;
+				}
+
+				// Check if it is explicitly self closing, if so, remove
+				// trailing slash. Remember, we could have a tag like <br>, so
+				// any later token processing scripts must convert improperly
+				// classified EmptyTags from StartTags.
+				$is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
+				if ($is_self_closing) {
+					$strlen_segment--;
+					$segment = substr($segment, 0, $strlen_segment);
+				}
+
+				// Check if there are any attributes
+				$position_first_space = strcspn($segment, $this->_whitespace);
+
+				if ($position_first_space >= $strlen_segment) {
+					if ($is_self_closing) {
+						$token = new HTMLPurifier_Token_Empty($segment);
+					} else {
+						$token = new HTMLPurifier_Token_Start($segment);
+					}
+					if ($maintain_line_numbers) {
+						$token->rawPosition($current_line, $current_col);
+						$current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+					}
+					$array[] = $token;
+					$inside_tag = false;
+					$cursor = $position_next_gt + 1;
+					continue;
+				}
+
+				// Grab out all the data
+				$type = substr($segment, 0, $position_first_space);
+				$attribute_string =
+					trim(
+						substr(
+							$segment, $position_first_space
+						)
+					);
+				if ($attribute_string) {
+					$attr = $this->parseAttributeString(
+									$attribute_string
+								  , $config, $context
+							  );
+				} else {
+					$attr = array();
+				}
+
+				if ($is_self_closing) {
+					$token = new HTMLPurifier_Token_Empty($type, $attr);
+				} else {
+					$token = new HTMLPurifier_Token_Start($type, $attr);
+				}
+				if ($maintain_line_numbers) {
+					$token->rawPosition($current_line, $current_col);
+					$current_line += $this->substrCount($html, $nl, $cursor, $position_next_gt - $cursor);
+				}
+				$array[] = $token;
+				$cursor = $position_next_gt + 1;
+				$inside_tag = false;
+				continue;
+			} else {
+				// inside tag, but there's no ending > sign
+				if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
+				$token = new
+					HTMLPurifier_Token_Text(
+						'<' .
+						$this->parseData(
+							substr($html, $cursor)
+						)
+					);
+				if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+				// no cursor scroll? Hmm...
+				$array[] = $token;
+				break;
+			}
+			break;
+		}
+
+		$context->destroy('CurrentLine');
+		$context->destroy('CurrentCol');
+		return $array;
+	}
+
+	/**
+	 * PHP 5.0.x compatible substr_count that implements offset and length
+	 */
+	protected function substrCount($haystack, $needle, $offset, $length) {
+		static $oldVersion;
+		if ($oldVersion === null) {
+			$oldVersion = version_compare(PHP_VERSION, '5.1', '<');
+		}
+		if ($oldVersion) {
+			$haystack = substr($haystack, $offset, $length);
+			return substr_count($haystack, $needle);
+		} else {
+			return substr_count($haystack, $needle, $offset, $length);
+		}
+	}
+
+	/**
+	 * Takes the inside of an HTML tag and makes an assoc array of attributes.
+	 *
+	 * @param $string Inside of tag excluding name.
+	 * @returns Assoc array of attributes.
+	 */
+	public function parseAttributeString($string, $config, $context) {
+		$string = (string) $string; // quick typecast
+
+		if ($string == '') return array(); // no attributes
+
+		$e = false;
+		if ($config->get('Core.CollectErrors')) {
+			$e =& $context->get('ErrorCollector');
+		}
+
+		// let's see if we can abort as quickly as possible
+		// one equal sign, no spaces => one attribute
+		$num_equal = substr_count($string, '=');
+		$has_space = strpos($string, ' ');
+		if ($num_equal === 0 && !$has_space) {
+			// bool attribute
+			return array($string => $string);
+		} elseif ($num_equal === 1 && !$has_space) {
+			// only one attribute
+			list($key, $quoted_value) = explode('=', $string);
+			$quoted_value = trim($quoted_value);
+			if (!$key) {
+				if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+				return array();
+			}
+			if (!$quoted_value) return array($key => '');
+			$first_char = @$quoted_value[0];
+			$last_char  = @$quoted_value[strlen($quoted_value)-1];
+
+			$same_quote = ($first_char == $last_char);
+			$open_quote = ($first_char == '"' || $first_char == "'");
+
+			if ( $same_quote && $open_quote) {
+				// well behaved
+				$value = substr($quoted_value, 1, strlen($quoted_value) - 2);
+			} else {
+				// not well behaved
+				if ($open_quote) {
+					if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
+					$value = substr($quoted_value, 1);
+				} else {
+					$value = $quoted_value;
+				}
+			}
+			if ($value === false) $value = '';
+			return array($key => $this->parseData($value));
+		}
+
+		// setup loop environment
+		$array  = array(); // return assoc array of attributes
+		$cursor = 0; // current position in string (moves forward)
+		$size   = strlen($string); // size of the string (stays the same)
+
+		// if we have unquoted attributes, the parser expects a terminating
+		// space, so let's guarantee that there's always a terminating space.
+		$string .= ' ';
+
+		while(true) {
+
+			if ($cursor >= $size) {
+				break;
+			}
+
+			$cursor += ($value = strspn($string, $this->_whitespace, $cursor));
+			// grab the key
+
+			$key_begin = $cursor; //we're currently at the start of the key
+
+			// scroll past all characters that are the key (not whitespace or =)
+			$cursor += strcspn($string, $this->_whitespace . '=', $cursor);
+
+			$key_end = $cursor; // now at the end of the key
+
+			$key = substr($string, $key_begin, $key_end - $key_begin);
+
+			if (!$key) {
+				if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+				$cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
+				continue; // empty key
+			}
+
+			// scroll past all whitespace
+			$cursor += strspn($string, $this->_whitespace, $cursor);
+
+			if ($cursor >= $size) {
+				$array[$key] = $key;
+				break;
+			}
+
+			// if the next character is an equal sign, we've got a regular
+			// pair, otherwise, it's a bool attribute
+			$first_char = @$string[$cursor];
+
+			if ($first_char == '=') {
+				// key="value"
+
+				$cursor++;
+				$cursor += strspn($string, $this->_whitespace, $cursor);
+
+				if ($cursor === false) {
+					$array[$key] = '';
+					break;
+				}
+
+				// we might be in front of a quote right now
+
+				$char = @$string[$cursor];
+
+				if ($char == '"' || $char == "'") {
+					// it's quoted, end bound is $char
+					$cursor++;
+					$value_begin = $cursor;
+					$cursor = strpos($string, $char, $cursor);
+					$value_end = $cursor;
+				} else {
+					// it's not quoted, end bound is whitespace
+					$value_begin = $cursor;
+					$cursor += strcspn($string, $this->_whitespace, $cursor);
+					$value_end = $cursor;
+				}
+
+				// we reached a premature end
+				if ($cursor === false) {
+					$cursor = $size;
+					$value_end = $cursor;
+				}
+
+				$value = substr($string, $value_begin, $value_end - $value_begin);
+				if ($value === false) $value = '';
+				$array[$key] = $this->parseData($value);
+				$cursor++;
+
+			} else {
+				// boolattr
+				if ($key !== '') {
+					$array[$key] = $key;
+				} else {
+					// purely theoretical
+					if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+				}
+
+			}
+		}
+		return $array;
+	}
 
 }
 

Braces +43 added lines, -14 removed lines

@@ -137,7 +137,9 @@ 
             } elseif (!$inside_tag) {
                 // We are not inside tag but there are no more tags
                 // If we're already at the end, break
-                if ($cursor === strlen($html)) break;
+                if ($cursor === strlen($html)) {
+                	break;
+                }
                 // Create Text of rest of string
                 $token = new
                     HTMLPurifier_Token_Text(
@@ -147,7 +149,9 @@ 
                             )
                         )
                     );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+                if ($maintain_line_numbers) {
+                	$token->rawPosition($current_line, $current_col);
+                }
                 $array[] = $token;
                 break;
             } elseif ($inside_tag && $position_next_gt !== false) {
@@ -180,7 +184,9 @@ 
                         // uh oh, we have a comment that extends to
                         // infinity. Can't be helped: set comment
                         // end position to end of string
-                        if ($e) $e->send(E_WARNING, 'Lexer: Unclosed comment');
+                        if ($e) {
+                        	$e->send(E_WARNING, 'Lexer: Unclosed comment');
+                        }
                         $position_comment_end = strlen($html);
                         $end = true;
                     } else {
@@ -224,7 +230,9 @@ 
                 // text and go our merry way
                 if (!ctype_alpha($segment[0])) {
                     // XML:  $segment[0] !== '_' && $segment[0] !== ':'
-                    if ($e) $e->send(E_NOTICE, 'Lexer: Unescaped lt');
+                    if ($e) {
+                    	$e->send(E_NOTICE, 'Lexer: Unescaped lt');
+                    }
                     $token = new HTMLPurifier_Token_Text('<');
                     if ($maintain_line_numbers) {
                         $token->rawPosition($current_line, $current_col);
@@ -296,7 +304,9 @@ 
                 continue;
             } else {
                 // inside tag, but there's no ending > sign
-                if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
+                if ($e) {
+                	$e->send(E_WARNING, 'Lexer: Missing gt');
+                }
                 $token = new
                     HTMLPurifier_Token_Text(
                         '<' .
@@ -304,7 +314,9 @@ 
                             substr($html, $cursor)
                         )
                     );
-                if ($maintain_line_numbers) $token->rawPosition($current_line, $current_col);
+                if ($maintain_line_numbers) {
+                	$token->rawPosition($current_line, $current_col);
+                }
                 // no cursor scroll? Hmm...
                 $array[] = $token;
                 break;
@@ -342,7 +354,10 @@ 
     public function parseAttributeString($string, $config, $context) {
         $string = (string) $string; // quick typecast
 
-        if ($string == '') return array(); // no attributes
+        if ($string == '') {
+        	return array();
+        }
+        // no attributes
 
         $e = false;
         if ($config->get('Core.CollectErrors')) {
@@ -361,10 +376,14 @@ 
             list($key, $quoted_value) = explode('=', $string);
             $quoted_value = trim($quoted_value);
             if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                if ($e) {
+                	$e->send(E_ERROR, 'Lexer: Missing attribute key');
+                }
                 return array();
             }
-            if (!$quoted_value) return array($key => '');
+            if (!$quoted_value) {
+            	return array($key => '');
+            }
             $first_char = @$quoted_value[0];
             $last_char  = @$quoted_value[strlen($quoted_value)-1];
 
@@ -377,13 +396,17 @@ 
             } else {
                 // not well behaved
                 if ($open_quote) {
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing end quote');
+                    if ($e) {
+                    	$e->send(E_ERROR, 'Lexer: Missing end quote');
+                    }
                     $value = substr($quoted_value, 1);
                 } else {
                     $value = $quoted_value;
                 }
             }
-            if ($value === false) $value = '';
+            if ($value === false) {
+            	$value = '';
+            }
             return array($key => $this->parseData($value));
         }
 
@@ -415,7 +438,9 @@ 
             $key = substr($string, $key_begin, $key_end - $key_begin);
 
             if (!$key) {
-                if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                if ($e) {
+                	$e->send(E_ERROR, 'Lexer: Missing attribute key');
+                }
                 $cursor += strcspn($string, $this->_whitespace, $cursor + 1); // prevent infinite loop
                 continue; // empty key
             }
@@ -467,7 +492,9 @@ 
                 }
 
                 $value = substr($string, $value_begin, $value_end - $value_begin);
-                if ($value === false) $value = '';
+                if ($value === false) {
+                	$value = '';
+                }
                 $array[$key] = $this->parseData($value);
                 $cursor++;
 
@@ -477,7 +504,9 @@ 
                     $array[$key] = $key;
                 } else {
                     // purely theoretical
-                    if ($e) $e->send(E_ERROR, 'Lexer: Missing attribute key');
+                    if ($e) {
+                    	$e->send(E_ERROR, 'Lexer: Missing attribute key');
+                    }
                 }
 
             }

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
      * @param $matches, in form of array(opening tag, contents, closing tag)
      */
     protected function scriptCallback($matches) {
-        return $matches[1] . htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8', false) . $matches[3];
+        return $matches[1].htmlspecialchars($matches[2], ENT_COMPAT, 'UTF-8', false).$matches[3];
     }
 
     public function tokenizeHTML($html, $config, $context) {
@@ -63,7 +63,7 @@ 
             $length = false;
         }
         $context->register('CurrentLine', $current_line);
-        $context->register('CurrentCol',  $current_col);
+        $context->register('CurrentCol', $current_col);
         $nl = "\n";
         // how often to manually recalculate. This will ALWAYS be right,
         // but it's pretty wasteful. Set to 0 to turn off
@@ -71,13 +71,13 @@ 
 
         $e = false;
         if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
+            $e = & $context->get('ErrorCollector');
         }
 
         // for testing synchronization
         $loops = 0;
 
-        while(++$loops) {
+        while (++$loops) {
 
             // $cursor is either at the start of a token, or inside of
             // a tag (i.e. there was a < immediately before it), as indicated
@@ -97,8 +97,8 @@ 
 
                 // recalculate lines
                 if (
-                    $synchronize_interval &&  // synchronization is on
-                    $cursor > 0 &&            // cursor is further than zero
+                    $synchronize_interval && // synchronization is on
+                    $cursor > 0 && // cursor is further than zero
                     $loops % $synchronize_interval === 0 // time to synchronize!
                 ) {
                     $current_line = 1 + $this->substrCount($html, $nl, 0, $cursor);
@@ -205,7 +205,7 @@ 
                 }
 
                 // Check if it's an end tag
-                $is_end_tag = (strpos($segment,'/') === 0);
+                $is_end_tag = (strpos($segment, '/') === 0);
                 if ($is_end_tag) {
                     $type = substr($segment, 1);
                     $token = new HTMLPurifier_Token_End($type);
@@ -239,7 +239,7 @@ 
                 // trailing slash. Remember, we could have a tag like <br>, so
                 // any later token processing scripts must convert improperly
                 // classified EmptyTags from StartTags.
-                $is_self_closing = (strrpos($segment,'/') === $strlen_segment-1);
+                $is_self_closing = (strrpos($segment, '/') === $strlen_segment - 1);
                 if ($is_self_closing) {
                     $strlen_segment--;
                     $segment = substr($segment, 0, $strlen_segment);
@@ -299,7 +299,7 @@ 
                 if ($e) $e->send(E_WARNING, 'Lexer: Missing gt');
                 $token = new
                     HTMLPurifier_Token_Text(
-                        '<' .
+                        '<'.
                         $this->parseData(
                             substr($html, $cursor)
                         )
@@ -346,7 +346,7 @@ 
 
         $e = false;
         if ($config->get('Core.CollectErrors')) {
-            $e =& $context->get('ErrorCollector');
+            $e = & $context->get('ErrorCollector');
         }
 
         // let's see if we can abort as quickly as possible
@@ -366,12 +366,12 @@ 
             }
             if (!$quoted_value) return array($key => '');
             $first_char = @$quoted_value[0];
-            $last_char  = @$quoted_value[strlen($quoted_value)-1];
+            $last_char  = @$quoted_value[strlen($quoted_value) - 1];
 
             $same_quote = ($first_char == $last_char);
             $open_quote = ($first_char == '"' || $first_char == "'");
 
-            if ( $same_quote && $open_quote) {
+            if ($same_quote && $open_quote) {
                 // well behaved
                 $value = substr($quoted_value, 1, strlen($quoted_value) - 2);
             } else {
@@ -396,7 +396,7 @@ 
         // space, so let's guarantee that there's always a terminating space.
         $string .= ' ';
 
-        while(true) {
+        while (true) {
 
             if ($cursor >= $size) {
                 break;
@@ -408,7 +408,7 @@ 
             $key_begin = $cursor; //we're currently at the start of the key
 
             // scroll past all characters that are the key (not whitespace or =)
-            $cursor += strcspn($string, $this->_whitespace . '=', $cursor);
+            $cursor += strcspn($string, $this->_whitespace.'=', $cursor);
 
             $key_end = $cursor; // now at the end of the key
 

classes/security/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
     /**
      * @param $node  DOMNode to be tokenized.
      * @param $tokens   Array-list of already tokenized tokens.
-     * @param $collect  Says whether or start and close are collected, set to
+     * @param boolean $collect  Says whether or start and close are collected, set to
      *                    false at first recursion because it's the implicit DIV
      *                    tag you're dealing with.
      * @returns bool if the token needs an endtoken

Indentation +210 added lines, -210 removed lines

@@ -27,216 +27,216 @@
 class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
 {
 
-    private $factory;
-
-    public function __construct() {
-        // setup the factory
-        parent::__construct();
-        $this->factory = new HTMLPurifier_TokenFactory();
-    }
-
-    public function tokenizeHTML($html, $config, $context) {
-
-        $html = $this->normalize($html, $config, $context);
-
-        // attempt to armor stray angled brackets that cannot possibly
-        // form tags and thus are probably being used as emoticons
-        if ($config->get('Core.AggressivelyFixLt')) {
-            $char = '[^a-z!\/]';
-            $comment = "/<!--(.*?)(-->|\z)/is";
-            $html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
-            do {
-                $old = $html;
-                $html = preg_replace("/<($char)/i", '&lt;\\1', $html);
-            } while ($html !== $old);
-            $html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
-        }
-
-        // preprocess html, essential for UTF-8
-        $html = $this->wrapHTML($html, $config, $context);
-
-        $doc = new DOMDocument();
-        $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
-
-        set_error_handler(array($this, 'muteErrorHandler'));
-        $doc->loadHTML($html);
-        restore_error_handler();
-
-        $tokens = array();
-        $this->tokenizeDOM(
-            $doc->getElementsByTagName('html')->item(0)-> // <html>
-                  getElementsByTagName('body')->item(0)-> //   <body>
-                  getElementsByTagName('div')->item(0)    //     <div>
-            , $tokens);
-        return $tokens;
-    }
-
-    /**
-     * Iterative function that tokenizes a node, putting it into an accumulator.
-     * To iterate is human, to recurse divine - L. Peter Deutsch
-     * @param $node     DOMNode to be tokenized.
-     * @param $tokens   Array-list of already tokenized tokens.
-     * @returns Tokens of node appended to previously passed tokens.
-     */
-    protected function tokenizeDOM($node, &$tokens) {
-
-        $level = 0;
-        $nodes = array($level => array($node));
-        $closingNodes = array();
-        do {
-            while (!empty($nodes[$level])) {
-                $node = array_shift($nodes[$level]); // FIFO
-                $collect = $level > 0 ? true : false;
-                $needEndingTag = $this->createStartNode($node, $tokens, $collect);
-                if ($needEndingTag) {
-                    $closingNodes[$level][] = $node;
-                }
-                if ($node->childNodes && $node->childNodes->length) {
-                    $level++;
-                    $nodes[$level] = array();
-                    foreach ($node->childNodes as $childNode) {
-                        array_push($nodes[$level], $childNode);
-                    }
-                }
-            }
-            $level--;
-            if ($level && isset($closingNodes[$level])) {
-                while($node = array_pop($closingNodes[$level])) {
-                    $this->createEndNode($node, $tokens);
-                }
-            }
-        } while ($level > 0);
-    }
-
-    /**
-     * @param $node  DOMNode to be tokenized.
-     * @param $tokens   Array-list of already tokenized tokens.
-     * @param $collect  Says whether or start and close are collected, set to
-     *                    false at first recursion because it's the implicit DIV
-     *                    tag you're dealing with.
-     * @returns bool if the token needs an endtoken
-     */
-    protected function createStartNode($node, &$tokens, $collect) {
-        // intercept non element nodes. WE MUST catch all of them,
-        // but we're not getting the character reference nodes because
-        // those should have been preprocessed
-        if ($node->nodeType === XML_TEXT_NODE) {
-            $tokens[] = $this->factory->createText($node->data);
-            return false;
-        } elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
-            // undo libxml's special treatment of <script> and <style> tags
-            $last = end($tokens);
-            $data = $node->data;
-            // (note $node->tagname is already normalized)
-            if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
-                $new_data = trim($data);
-                if (substr($new_data, 0, 4) === '<!--') {
-                    $data = substr($new_data, 4);
-                    if (substr($data, -3) === '-->') {
-                        $data = substr($data, 0, -3);
-                    } else {
-                        // Highly suspicious! Not sure what to do...
-                    }
-                }
-            }
-            $tokens[] = $this->factory->createText($this->parseData($data));
-            return false;
-        } elseif ($node->nodeType === XML_COMMENT_NODE) {
-            // this is code is only invoked for comments in script/style in versions
-            // of libxml pre-2.6.28 (regular comments, of course, are still
-            // handled regularly)
-            $tokens[] = $this->factory->createComment($node->data);
-            return false;
-        } elseif (
-            // not-well tested: there may be other nodes we have to grab
-            $node->nodeType !== XML_ELEMENT_NODE
-        ) {
-            return false;
-        }
-
-        $attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
-
-        // We still have to make sure that the element actually IS empty
-        if (!$node->childNodes->length) {
-            if ($collect) {
-                $tokens[] = $this->factory->createEmpty($node->tagName, $attr);
-            }
-            return false;
-        } else {
-            if ($collect) {
-                $tokens[] = $this->factory->createStart(
-                    $tag_name = $node->tagName, // somehow, it get's dropped
-                    $attr
-                );
-            }
-            return true;
-        }
-    }
-
-    protected function createEndNode($node, &$tokens) {
-        $tokens[] = $this->factory->createEnd($node->tagName);
-    }
-
-
-    /**
-     * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
-     *
-     * @param $attribute_list DOMNamedNodeMap of DOMAttr objects.
-     * @returns Associative array of attributes.
-     */
-    protected function transformAttrToAssoc($node_map) {
-        // NamedNodeMap is documented very well, so we're using undocumented
-        // features, namely, the fact that it implements Iterator and
-        // has a ->length attribute
-        if ($node_map->length === 0) return array();
-        $array = array();
-        foreach ($node_map as $attr) {
-            $array[$attr->name] = $attr->value;
-        }
-        return $array;
-    }
-
-    /**
-     * An error handler that mutes all errors
-     */
-    public function muteErrorHandler($errno, $errstr) {}
-
-    /**
-     * Callback function for undoing escaping of stray angled brackets
-     * in comments
-     */
-    public function callbackUndoCommentSubst($matches) {
-        return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
-    }
-
-    /**
-     * Callback function that entity-izes ampersands in comments so that
-     * callbackUndoCommentSubst doesn't clobber them
-     */
-    public function callbackArmorCommentEntities($matches) {
-        return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
-    }
-
-    /**
-     * Wraps an HTML fragment in the necessary HTML
-     */
-    protected function wrapHTML($html, $config, $context) {
-        $def = $config->getDefinition('HTML');
-        $ret = '';
-
-        if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
-            $ret .= '<!DOCTYPE html ';
-            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
-            if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
-            $ret .= '>';
-        }
-
-        $ret .= '<html><head>';
-        $ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-        // No protection if $html contains a stray </div>!
-        $ret .= '</head><body><div>'.$html.'</div></body></html>';
-        return $ret;
-    }
+	private $factory;
+
+	public function __construct() {
+		// setup the factory
+		parent::__construct();
+		$this->factory = new HTMLPurifier_TokenFactory();
+	}
+
+	public function tokenizeHTML($html, $config, $context) {
+
+		$html = $this->normalize($html, $config, $context);
+
+		// attempt to armor stray angled brackets that cannot possibly
+		// form tags and thus are probably being used as emoticons
+		if ($config->get('Core.AggressivelyFixLt')) {
+			$char = '[^a-z!\/]';
+			$comment = "/<!--(.*?)(-->|\z)/is";
+			$html = preg_replace_callback($comment, array($this, 'callbackArmorCommentEntities'), $html);
+			do {
+				$old = $html;
+				$html = preg_replace("/<($char)/i", '&lt;\\1', $html);
+			} while ($html !== $old);
+			$html = preg_replace_callback($comment, array($this, 'callbackUndoCommentSubst'), $html); // fix comments
+		}
+
+		// preprocess html, essential for UTF-8
+		$html = $this->wrapHTML($html, $config, $context);
+
+		$doc = new DOMDocument();
+		$doc->encoding = 'UTF-8'; // theoretically, the above has this covered
+
+		set_error_handler(array($this, 'muteErrorHandler'));
+		$doc->loadHTML($html);
+		restore_error_handler();
+
+		$tokens = array();
+		$this->tokenizeDOM(
+			$doc->getElementsByTagName('html')->item(0)-> // <html>
+				  getElementsByTagName('body')->item(0)-> //   <body>
+				  getElementsByTagName('div')->item(0)    //     <div>
+			, $tokens);
+		return $tokens;
+	}
+
+	/**
+	 * Iterative function that tokenizes a node, putting it into an accumulator.
+	 * To iterate is human, to recurse divine - L. Peter Deutsch
+	 * @param $node     DOMNode to be tokenized.
+	 * @param $tokens   Array-list of already tokenized tokens.
+	 * @returns Tokens of node appended to previously passed tokens.
+	 */
+	protected function tokenizeDOM($node, &$tokens) {
+
+		$level = 0;
+		$nodes = array($level => array($node));
+		$closingNodes = array();
+		do {
+			while (!empty($nodes[$level])) {
+				$node = array_shift($nodes[$level]); // FIFO
+				$collect = $level > 0 ? true : false;
+				$needEndingTag = $this->createStartNode($node, $tokens, $collect);
+				if ($needEndingTag) {
+					$closingNodes[$level][] = $node;
+				}
+				if ($node->childNodes && $node->childNodes->length) {
+					$level++;
+					$nodes[$level] = array();
+					foreach ($node->childNodes as $childNode) {
+						array_push($nodes[$level], $childNode);
+					}
+				}
+			}
+			$level--;
+			if ($level && isset($closingNodes[$level])) {
+				while($node = array_pop($closingNodes[$level])) {
+					$this->createEndNode($node, $tokens);
+				}
+			}
+		} while ($level > 0);
+	}
+
+	/**
+	 * @param $node  DOMNode to be tokenized.
+	 * @param $tokens   Array-list of already tokenized tokens.
+	 * @param $collect  Says whether or start and close are collected, set to
+	 *                    false at first recursion because it's the implicit DIV
+	 *                    tag you're dealing with.
+	 * @returns bool if the token needs an endtoken
+	 */
+	protected function createStartNode($node, &$tokens, $collect) {
+		// intercept non element nodes. WE MUST catch all of them,
+		// but we're not getting the character reference nodes because
+		// those should have been preprocessed
+		if ($node->nodeType === XML_TEXT_NODE) {
+			$tokens[] = $this->factory->createText($node->data);
+			return false;
+		} elseif ($node->nodeType === XML_CDATA_SECTION_NODE) {
+			// undo libxml's special treatment of <script> and <style> tags
+			$last = end($tokens);
+			$data = $node->data;
+			// (note $node->tagname is already normalized)
+			if ($last instanceof HTMLPurifier_Token_Start && ($last->name == 'script' || $last->name == 'style')) {
+				$new_data = trim($data);
+				if (substr($new_data, 0, 4) === '<!--') {
+					$data = substr($new_data, 4);
+					if (substr($data, -3) === '-->') {
+						$data = substr($data, 0, -3);
+					} else {
+						// Highly suspicious! Not sure what to do...
+					}
+				}
+			}
+			$tokens[] = $this->factory->createText($this->parseData($data));
+			return false;
+		} elseif ($node->nodeType === XML_COMMENT_NODE) {
+			// this is code is only invoked for comments in script/style in versions
+			// of libxml pre-2.6.28 (regular comments, of course, are still
+			// handled regularly)
+			$tokens[] = $this->factory->createComment($node->data);
+			return false;
+		} elseif (
+			// not-well tested: there may be other nodes we have to grab
+			$node->nodeType !== XML_ELEMENT_NODE
+		) {
+			return false;
+		}
+
+		$attr = $node->hasAttributes() ? $this->transformAttrToAssoc($node->attributes) : array();
+
+		// We still have to make sure that the element actually IS empty
+		if (!$node->childNodes->length) {
+			if ($collect) {
+				$tokens[] = $this->factory->createEmpty($node->tagName, $attr);
+			}
+			return false;
+		} else {
+			if ($collect) {
+				$tokens[] = $this->factory->createStart(
+					$tag_name = $node->tagName, // somehow, it get's dropped
+					$attr
+				);
+			}
+			return true;
+		}
+	}
+
+	protected function createEndNode($node, &$tokens) {
+		$tokens[] = $this->factory->createEnd($node->tagName);
+	}
+
+
+	/**
+	 * Converts a DOMNamedNodeMap of DOMAttr objects into an assoc array.
+	 *
+	 * @param $attribute_list DOMNamedNodeMap of DOMAttr objects.
+	 * @returns Associative array of attributes.
+	 */
+	protected function transformAttrToAssoc($node_map) {
+		// NamedNodeMap is documented very well, so we're using undocumented
+		// features, namely, the fact that it implements Iterator and
+		// has a ->length attribute
+		if ($node_map->length === 0) return array();
+		$array = array();
+		foreach ($node_map as $attr) {
+			$array[$attr->name] = $attr->value;
+		}
+		return $array;
+	}
+
+	/**
+	 * An error handler that mutes all errors
+	 */
+	public function muteErrorHandler($errno, $errstr) {}
+
+	/**
+	 * Callback function for undoing escaping of stray angled brackets
+	 * in comments
+	 */
+	public function callbackUndoCommentSubst($matches) {
+		return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
+	}
+
+	/**
+	 * Callback function that entity-izes ampersands in comments so that
+	 * callbackUndoCommentSubst doesn't clobber them
+	 */
+	public function callbackArmorCommentEntities($matches) {
+		return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
+	}
+
+	/**
+	 * Wraps an HTML fragment in the necessary HTML
+	 */
+	protected function wrapHTML($html, $config, $context) {
+		$def = $config->getDefinition('HTML');
+		$ret = '';
+
+		if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
+			$ret .= '<!DOCTYPE html ';
+			if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
+			if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
+			$ret .= '>';
+		}
+
+		$ret .= '<html><head>';
+		$ret .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
+		// No protection if $html contains a stray </div>!
+		$ret .= '</head><body><div>'.$html.'</div></body></html>';
+		return $ret;
+	}
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -188,7 +188,9 @@ 
         // NamedNodeMap is documented very well, so we're using undocumented
         // features, namely, the fact that it implements Iterator and
         // has a ->length attribute
-        if ($node_map->length === 0) return array();
+        if ($node_map->length === 0) {
+        	return array();
+        }
         $array = array();
         foreach ($node_map as $attr) {
             $array[$attr->name] = $attr->value;
@@ -226,8 +228,12 @@ 
 
         if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
             $ret .= '<!DOCTYPE html ';
-            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
-            if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
+            if (!empty($def->doctype->dtdPublic)) {
+            	$ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
+            }
+            if (!empty($def->doctype->dtdSystem)) {
+            	$ret .= '"' . $def->doctype->dtdSystem . '" ';
+            }
             $ret .= '>';
         }
 

Spacing +5 added lines, -5 removed lines

@@ -101,7 +101,7 @@ 
             }
             $level--;
             if ($level && isset($closingNodes[$level])) {
-                while($node = array_pop($closingNodes[$level])) {
+                while ($node = array_pop($closingNodes[$level])) {
                     $this->createEndNode($node, $tokens);
                 }
             }
@@ -206,7 +206,7 @@ 
      * in comments
      */
     public function callbackUndoCommentSubst($matches) {
-        return '<!--' . strtr($matches[1], array('&amp;'=>'&','&lt;'=>'<')) . $matches[2];
+        return '<!--'.strtr($matches[1], array('&amp;'=>'&', '&lt;'=>'<')).$matches[2];
     }
 
     /**
@@ -214,7 +214,7 @@ 
      * callbackUndoCommentSubst doesn't clobber them
      */
     public function callbackArmorCommentEntities($matches) {
-        return '<!--' . str_replace('&', '&amp;', $matches[1]) . $matches[2];
+        return '<!--'.str_replace('&', '&amp;', $matches[1]).$matches[2];
     }
 
     /**
@@ -226,8 +226,8 @@ 
 
         if (!empty($def->doctype->dtdPublic) || !empty($def->doctype->dtdSystem)) {
             $ret .= '<!DOCTYPE html ';
-            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "' . $def->doctype->dtdPublic . '" ';
-            if (!empty($def->doctype->dtdSystem)) $ret .= '"' . $def->doctype->dtdSystem . '" ';
+            if (!empty($def->doctype->dtdPublic)) $ret .= 'PUBLIC "'.$def->doctype->dtdPublic.'" ';
+            if (!empty($def->doctype->dtdSystem)) $ret .= '"'.$def->doctype->dtdSystem.'" ';
             $ret .= '>';
         }
 

classes/security/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php

Doc Comments +18 added lines

@@ -124,6 +124,9 @@ 
     const CHARACTR = 4;
     const EOF      = 5;
 
+    /**
+     * @param string $data
+     */
     public function __construct($data) {
 
         $this->data = $data;
@@ -143,12 +146,20 @@ 
         return $this->tree->save();
     }
 
+    /**
+     * @return string
+     */
     private function char() {
         return ($this->char < $this->EOF)
             ? $this->data[$this->char]
             : false;
     }
 
+    /**
+     * @param integer $s
+     *
+     * @return string
+     */
     private function character($s, $l = 0) {
         if($s + $l < $this->EOF) {
             if($l === 0) {
@@ -159,6 +170,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));
     }
@@ -3767,6 +3782,9 @@ 
             return self::PHRASING;
     }
 
+    /**
+     * @param string[] $elements
+     */
     private function clearStackToTableContext($elements) {
         /* When the steps above require the UA to clear the stack back to a
         table context, it means that the UA must, while the current node is not

Indentation +2868 added lines, -2868 removed lines

@@ -12,26 +12,26 @@ 
 
 class HTMLPurifier_Lexer_PH5P extends HTMLPurifier_Lexer_DOMLex {
     
-    public function tokenizeHTML($html, $config, $context) {
-        $new_html = $this->normalize($html, $config, $context);
-        $new_html = $this->wrapHTML($new_html, $config, $context);
-        try {
-            $parser = new HTML5($new_html);
-            $doc = $parser->save();
-        } catch (DOMException $e) {
-            // Uh oh, it failed. Punt to DirectLex.
-            $lexer = new HTMLPurifier_Lexer_DirectLex();
-            $context->register('PH5PError', $e); // save the error, so we can detect it
-            return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
-        }
-        $tokens = array();
-        $this->tokenizeDOM(
-            $doc->getElementsByTagName('html')->item(0)-> // <html>
-                  getElementsByTagName('body')->item(0)-> //   <body>
-                  getElementsByTagName('div')->item(0)    //     <div>
-            , $tokens);
-        return $tokens;
-    }
+	public function tokenizeHTML($html, $config, $context) {
+		$new_html = $this->normalize($html, $config, $context);
+		$new_html = $this->wrapHTML($new_html, $config, $context);
+		try {
+			$parser = new HTML5($new_html);
+			$doc = $parser->save();
+		} catch (DOMException $e) {
+			// Uh oh, it failed. Punt to DirectLex.
+			$lexer = new HTMLPurifier_Lexer_DirectLex();
+			$context->register('PH5PError', $e); // save the error, so we can detect it
+			return $lexer->tokenizeHTML($html, $config, $context); // use original HTML
+		}
+		$tokens = array();
+		$this->tokenizeDOM(
+			$doc->getElementsByTagName('html')->item(0)-> // <html>
+				  getElementsByTagName('body')->item(0)-> //   <body>
+				  getElementsByTagName('div')->item(0)    //     <div>
+			, $tokens);
+		return $tokens;
+	}
     
 }
 
@@ -61,145 +61,145 @@ 
 */
 
 class HTML5 {
-    private $data;
-    private $char;
-    private $EOF;
-    private $state;
-    private $tree;
-    private $token;
-    private $content_model;
-    private $escape = false;
-    private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
-    'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
-    'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
-    'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
-    'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
-    'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
-    'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
-    'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
-    'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
-    'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
-    'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
-    'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
-    'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
-    'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
-    'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
-    'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
-    'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
-    'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
-    'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
-    'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
-    'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
-    'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
-    'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
-    'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
-    'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
-    'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
-    'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
-    'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
-    'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
-    'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
-    'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
-    'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
-    'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
-    'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
-    'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
-    'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
-    'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
-    'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
-    'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
-    'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
-    'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
-    'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
-
-    const PCDATA    = 0;
-    const RCDATA    = 1;
-    const CDATA     = 2;
-    const PLAINTEXT = 3;
-
-    const DOCTYPE  = 0;
-    const STARTTAG = 1;
-    const ENDTAG   = 2;
-    const COMMENT  = 3;
-    const CHARACTR = 4;
-    const EOF      = 5;
-
-    public function __construct($data) {
-
-        $this->data = $data;
-        $this->char = -1;
-        $this->EOF  = strlen($data);
-        $this->tree = new HTML5TreeConstructer;
-        $this->content_model = self::PCDATA;
-
-        $this->state = 'data';
-
-        while($this->state !== null) {
-            $this->{$this->state.'State'}();
-        }
-    }
-
-    public function save() {
-        return $this->tree->save();
-    }
-
-    private function char() {
-        return ($this->char < $this->EOF)
-            ? $this->data[$this->char]
-            : false;
-    }
-
-    private function character($s, $l = 0) {
-        if($s + $l < $this->EOF) {
-            if($l === 0) {
-                return $this->data[$s];
-            } else {
-                return substr($this->data, $s, $l);
-            }
-        }
-    }
-
-    private function characters($char_class, $start) {
-        return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
-    }
-
-    private function dataState() {
-        // Consume the next input character
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
-            /* U+0026 AMPERSAND (&)
+	private $data;
+	private $char;
+	private $EOF;
+	private $state;
+	private $tree;
+	private $token;
+	private $content_model;
+	private $escape = false;
+	private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
+	'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
+	'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
+	'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
+	'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
+	'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
+	'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
+	'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
+	'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
+	'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
+	'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
+	'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
+	'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
+	'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
+	'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
+	'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
+	'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
+	'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
+	'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
+	'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
+	'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
+	'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
+	'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
+	'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
+	'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
+	'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
+	'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
+	'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
+	'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
+	'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
+	'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
+	'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
+	'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
+	'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
+	'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
+	'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
+	'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
+	'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
+	'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
+	'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
+	'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
+	'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
+
+	const PCDATA    = 0;
+	const RCDATA    = 1;
+	const CDATA     = 2;
+	const PLAINTEXT = 3;
+
+	const DOCTYPE  = 0;
+	const STARTTAG = 1;
+	const ENDTAG   = 2;
+	const COMMENT  = 3;
+	const CHARACTR = 4;
+	const EOF      = 5;
+
+	public function __construct($data) {
+
+		$this->data = $data;
+		$this->char = -1;
+		$this->EOF  = strlen($data);
+		$this->tree = new HTML5TreeConstructer;
+		$this->content_model = self::PCDATA;
+
+		$this->state = 'data';
+
+		while($this->state !== null) {
+			$this->{$this->state.'State'}();
+		}
+	}
+
+	public function save() {
+		return $this->tree->save();
+	}
+
+	private function char() {
+		return ($this->char < $this->EOF)
+			? $this->data[$this->char]
+			: false;
+	}
+
+	private function character($s, $l = 0) {
+		if($s + $l < $this->EOF) {
+			if($l === 0) {
+				return $this->data[$s];
+			} else {
+				return substr($this->data, $s, $l);
+			}
+		}
+	}
+
+	private function characters($char_class, $start) {
+		return preg_replace('#^(['.$char_class.']+).*#s', '\\1', substr($this->data, $start));
+	}
+
+	private function dataState() {
+		// Consume the next input character
+		$this->char++;
+		$char = $this->char();
+
+		if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
+			/* U+0026 AMPERSAND (&)
             When the content model flag is set to one of the PCDATA or RCDATA
             states: switch to the entity data state. Otherwise: treat it as per
             the "anything else"    entry below. */
-            $this->state = 'entityData';
+			$this->state = 'entityData';
 
-        } elseif($char === '-') {
-            /* If the content model flag is set to either the RCDATA state or
+		} elseif($char === '-') {
+			/* If the content model flag is set to either the RCDATA state or
             the CDATA state, and the escape flag is false, and there are at
             least three characters before this one in the input stream, and the
             last four characters in the input stream, including this one, are
             U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
             and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
-            if(($this->content_model === self::RCDATA || $this->content_model ===
-            self::CDATA) && $this->escape === false &&
-            $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
-                $this->escape = true;
-            }
+			if(($this->content_model === self::RCDATA || $this->content_model ===
+			self::CDATA) && $this->escape === false &&
+			$this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
+				$this->escape = true;
+			}
 
-            /* In any case, emit the input character as a character token. Stay
+			/* In any case, emit the input character as a character token. Stay
             in the data state. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
-
-        /* U+003C LESS-THAN SIGN (<) */
-        } elseif($char === '<' && ($this->content_model === self::PCDATA ||
-        (($this->content_model === self::RCDATA ||
-        $this->content_model === self::CDATA) && $this->escape === false))) {
-            /* When the content model flag is set to the PCDATA state: switch
+			$this->emitToken(array(
+				'type' => self::CHARACTR,
+				'data' => $char
+			));
+
+		/* U+003C LESS-THAN SIGN (<) */
+		} elseif($char === '<' && ($this->content_model === self::PCDATA ||
+		(($this->content_model === self::RCDATA ||
+		$this->content_model === self::CDATA) && $this->escape === false))) {
+			/* When the content model flag is set to the PCDATA state: switch
             to the tag open state.
 
             When the content model flag is set to either the RCDATA state or
@@ -207,171 +207,171 @@ 
             open state.
 
             Otherwise: treat it as per the "anything else" entry below. */
-            $this->state = 'tagOpen';
+			$this->state = 'tagOpen';
 
-        /* U+003E GREATER-THAN SIGN (>) */
-        } elseif($char === '>') {
-            /* If the content model flag is set to either the RCDATA state or
+		/* U+003E GREATER-THAN SIGN (>) */
+		} elseif($char === '>') {
+			/* If the content model flag is set to either the RCDATA state or
             the CDATA state, and the escape flag is true, and the last three
             characters in the input stream including this one are U+002D
             HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
             set the escape flag to false. */
-            if(($this->content_model === self::RCDATA ||
-            $this->content_model === self::CDATA) && $this->escape === true &&
-            $this->character($this->char, 3) === '-->') {
-                $this->escape = false;
-            }
+			if(($this->content_model === self::RCDATA ||
+			$this->content_model === self::CDATA) && $this->escape === true &&
+			$this->character($this->char, 3) === '-->') {
+				$this->escape = false;
+			}
 
-            /* In any case, emit the input character as a character token.
+			/* In any case, emit the input character as a character token.
             Stay in the data state. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
+			$this->emitToken(array(
+				'type' => self::CHARACTR,
+				'data' => $char
+			));
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Emit an end-of-file token. */
-            $this->EOF();
+			$this->EOF();
 
-        } elseif($this->content_model === self::PLAINTEXT) {
-            /* When the content model flag is set to the PLAINTEXT state
+		} elseif($this->content_model === self::PLAINTEXT) {
+			/* When the content model flag is set to the PLAINTEXT state
             THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
             the text and emit it as a character token. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => substr($this->data, $this->char)
-            ));
+			$this->emitToken(array(
+				'type' => self::CHARACTR,
+				'data' => substr($this->data, $this->char)
+			));
 
-            $this->EOF();
+			$this->EOF();
 
-        } else {
-            /* Anything else
+		} else {
+			/* Anything else
             THIS DIFFERS GREATLY FROM THE SPEC: Get as many character that
             otherwise would also be treated as a character token and emit it
             as a single character token. Stay in the data state. */
-            $len  = strcspn($this->data, '<&', $this->char);
-            $char = substr($this->data, $this->char, $len);
-            $this->char += $len - 1;
-
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => $char
-            ));
-
-            $this->state = 'data';
-        }
-    }
-
-    private function entityDataState() {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, emit a U+0026 AMPERSAND character token.
-        // Otherwise, emit the character token that was returned.
-        $char = (!$entity) ? '&' : $entity;
-        $this->emitToken(array(
-            'type' => self::CHARACTR,
-            'data' => $char
-        ));
-
-        // Finally, switch to the data state.
-        $this->state = 'data';
-    }
-
-    private function tagOpenState() {
-        switch($this->content_model) {
-            case self::RCDATA:
-            case self::CDATA:
-                /* If the next input character is a U+002F SOLIDUS (/) character,
+			$len  = strcspn($this->data, '<&', $this->char);
+			$char = substr($this->data, $this->char, $len);
+			$this->char += $len - 1;
+
+			$this->emitToken(array(
+				'type' => self::CHARACTR,
+				'data' => $char
+			));
+
+			$this->state = 'data';
+		}
+	}
+
+	private function entityDataState() {
+		// Attempt to consume an entity.
+		$entity = $this->entity();
+
+		// If nothing is returned, emit a U+0026 AMPERSAND character token.
+		// Otherwise, emit the character token that was returned.
+		$char = (!$entity) ? '&' : $entity;
+		$this->emitToken(array(
+			'type' => self::CHARACTR,
+			'data' => $char
+		));
+
+		// Finally, switch to the data state.
+		$this->state = 'data';
+	}
+
+	private function tagOpenState() {
+		switch($this->content_model) {
+			case self::RCDATA:
+			case self::CDATA:
+				/* If the next input character is a U+002F SOLIDUS (/) character,
                 consume it and switch to the close tag open state. If the next
                 input character is not a U+002F SOLIDUS (/) character, emit a
                 U+003C LESS-THAN SIGN character token and switch to the data
                 state to process the next input character. */
-                if($this->character($this->char + 1) === '/') {
-                    $this->char++;
-                    $this->state = 'closeTagOpen';
-
-                } else {
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<'
-                    ));
-
-                    $this->state = 'data';
-                }
-            break;
-
-            case self::PCDATA:
-                // If the content model flag is set to the PCDATA state
-                // Consume the next input character:
-                $this->char++;
-                $char = $this->char();
-
-                if($char === '!') {
-                    /* U+0021 EXCLAMATION MARK (!)
+				if($this->character($this->char + 1) === '/') {
+					$this->char++;
+					$this->state = 'closeTagOpen';
+
+				} else {
+					$this->emitToken(array(
+						'type' => self::CHARACTR,
+						'data' => '<'
+					));
+
+					$this->state = 'data';
+				}
+			break;
+
+			case self::PCDATA:
+				// If the content model flag is set to the PCDATA state
+				// Consume the next input character:
+				$this->char++;
+				$char = $this->char();
+
+				if($char === '!') {
+					/* U+0021 EXCLAMATION MARK (!)
                     Switch to the markup declaration open state. */
-                    $this->state = 'markupDeclarationOpen';
+					$this->state = 'markupDeclarationOpen';
 
-                } elseif($char === '/') {
-                    /* U+002F SOLIDUS (/)
+				} elseif($char === '/') {
+					/* U+002F SOLIDUS (/)
                     Switch to the close tag open state. */
-                    $this->state = 'closeTagOpen';
+					$this->state = 'closeTagOpen';
 
-                } elseif(preg_match('/^[A-Za-z]$/', $char)) {
-                    /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+				} elseif(preg_match('/^[A-Za-z]$/', $char)) {
+					/* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
                     Create a new start tag token, set its tag name to the lowercase
                     version of the input character (add 0x0020 to the character's code
                     point), then switch to the tag name state. (Don't emit the token
                     yet; further details will be filled in before it is emitted.) */
-                    $this->token = array(
-                        'name'  => strtolower($char),
-                        'type'  => self::STARTTAG,
-                        'attr'  => array()
-                    );
+					$this->token = array(
+						'name'  => strtolower($char),
+						'type'  => self::STARTTAG,
+						'attr'  => array()
+					);
 
-                    $this->state = 'tagName';
+					$this->state = 'tagName';
 
-                } elseif($char === '>') {
-                    /* U+003E GREATER-THAN SIGN (>)
+				} elseif($char === '>') {
+					/* U+003E GREATER-THAN SIGN (>)
                     Parse error. Emit a U+003C LESS-THAN SIGN character token and a
                     U+003E GREATER-THAN SIGN character token. Switch to the data state. */
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<>'
-                    ));
+					$this->emitToken(array(
+						'type' => self::CHARACTR,
+						'data' => '<>'
+					));
 
-                    $this->state = 'data';
+					$this->state = 'data';
 
-                } elseif($char === '?') {
-                    /* U+003F QUESTION MARK (?)
+				} elseif($char === '?') {
+					/* U+003F QUESTION MARK (?)
                     Parse error. Switch to the bogus comment state. */
-                    $this->state = 'bogusComment';
+					$this->state = 'bogusComment';
 
-                } else {
-                    /* Anything else
+				} else {
+					/* Anything else
                     Parse error. Emit a U+003C LESS-THAN SIGN character token and
                     reconsume the current input character in the data state. */
-                    $this->emitToken(array(
-                        'type' => self::CHARACTR,
-                        'data' => '<'
-                    ));
-
-                    $this->char--;
-                    $this->state = 'data';
-                }
-            break;
-        }
-    }
-
-    private function closeTagOpenState() {
-        $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
-        $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
-
-        if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
-        (!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
-        $this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
-            /* If the content model flag is set to the RCDATA or CDATA states then
+					$this->emitToken(array(
+						'type' => self::CHARACTR,
+						'data' => '<'
+					));
+
+					$this->char--;
+					$this->state = 'data';
+				}
+			break;
+		}
+	}
+
+	private function closeTagOpenState() {
+		$next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
+		$the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
+
+		if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
+		(!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
+		$this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
+			/* If the content model flag is set to the RCDATA or CDATA states then
             examine the next few characters. If they do not match the tag name of
             the last start tag token emitted (case insensitively), or if they do but
             they are not immediately followed by one of the following characters:
@@ -386,426 +386,426 @@ 
             ...then there is a parse error. Emit a U+003C LESS-THAN SIGN character
             token, a U+002F SOLIDUS character token, and switch to the data state
             to process the next input character. */
-            $this->emitToken(array(
-                'type' => self::CHARACTR,
-                'data' => '</'
-            ));
+			$this->emitToken(array(
+				'type' => self::CHARACTR,
+				'data' => '</'
+			));
 
-            $this->state = 'data';
+			$this->state = 'data';
 
-        } else {
-            /* Otherwise, if the content model flag is set to the PCDATA state,
+		} else {
+			/* Otherwise, if the content model flag is set to the PCDATA state,
             or if the next few characters do match that tag name, consume the
             next input character: */
-            $this->char++;
-            $char = $this->char();
+			$this->char++;
+			$char = $this->char();
 
-            if(preg_match('/^[A-Za-z]$/', $char)) {
-                /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
+			if(preg_match('/^[A-Za-z]$/', $char)) {
+				/* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
                 Create a new end tag token, set its tag name to the lowercase version
                 of the input character (add 0x0020 to the character's code point), then
                 switch to the tag name state. (Don't emit the token yet; further details
                 will be filled in before it is emitted.) */
-                $this->token = array(
-                    'name'  => strtolower($char),
-                    'type'  => self::ENDTAG
-                );
+				$this->token = array(
+					'name'  => strtolower($char),
+					'type'  => self::ENDTAG
+				);
 
-                $this->state = 'tagName';
+				$this->state = 'tagName';
 
-            } elseif($char === '>') {
-                /* U+003E GREATER-THAN SIGN (>)
+			} elseif($char === '>') {
+				/* U+003E GREATER-THAN SIGN (>)
                 Parse error. Switch to the data state. */
-                $this->state = 'data';
+				$this->state = 'data';
 
-            } elseif($this->char === $this->EOF) {
-                /* EOF
+			} elseif($this->char === $this->EOF) {
+				/* EOF
                 Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
                 SOLIDUS character token. Reconsume the EOF character in the data state. */
-                $this->emitToken(array(
-                    'type' => self::CHARACTR,
-                    'data' => '</'
-                ));
-
-                $this->char--;
-                $this->state = 'data';
-
-            } else {
-                /* Parse error. Switch to the bogus comment state. */
-                $this->state = 'bogusComment';
-            }
-        }
-    }
-
-    private function tagNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+				$this->emitToken(array(
+					'type' => self::CHARACTR,
+					'data' => '</'
+				));
+
+				$this->char--;
+				$this->state = 'data';
+
+			} else {
+				/* Parse error. Switch to the bogus comment state. */
+				$this->state = 'bogusComment';
+			}
+		}
+	}
+
+	private function tagNameState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } elseif($char === '/') {
-            /* U+002F SOLIDUS (/)
+		} elseif($char === '/') {
+			/* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the before
             attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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->state = 'tagName';
-        }
-    }
-
-    private function beforeAttributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+			$this->token['name'] .= strtolower($char);
+			$this->state = 'tagName';
+		}
+	}
+
+	private function beforeAttributeNameState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Stay in the before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } elseif($char === '/') {
-            /* U+002F SOLIDUS (/)
+		} elseif($char === '/') {
+			/* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Stay in the before
             attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* Anything else
             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(
-                'name'  => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function attributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+			$this->token['attr'][] = array(
+				'name'  => strtolower($char),
+				'value' => null
+			);
+
+			$this->state = 'attributeName';
+		}
+	}
+
+	private function attributeNameState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Stay in the before attribute name state. */
-            $this->state = 'afterAttributeName';
+			$this->state = 'afterAttributeName';
 
-        } elseif($char === '=') {
-            /* U+003D EQUALS SIGN (=)
+		} elseif($char === '=') {
+			/* U+003D EQUALS SIGN (=)
             Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
+			$this->state = 'beforeAttributeValue';
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
+		} elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+			/* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the before
             attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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';
-        }
-    }
+			$this->state = 'attributeName';
+		}
+	}
 
-    private function afterAttributeNameState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
+	private function afterAttributeNameState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Stay in the after attribute name state. */
-            $this->state = 'afterAttributeName';
+			$this->state = 'afterAttributeName';
 
-        } elseif($char === '=') {
-            /* U+003D EQUALS SIGN (=)
+		} elseif($char === '=') {
+			/* U+003D EQUALS SIGN (=)
             Switch to the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
+			$this->state = 'beforeAttributeValue';
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
-            /* U+002F SOLIDUS (/)
+		} elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+			/* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the
             before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* Anything else
             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(
-                'name'  => strtolower($char),
-                'value' => null
-            );
-
-            $this->state = 'attributeName';
-        }
-    }
-
-    private function beforeAttributeValueState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+			$this->token['attr'][] = array(
+				'name'  => strtolower($char),
+				'value' => null
+			);
+
+			$this->state = 'attributeName';
+		}
+	}
+
+	private function beforeAttributeValueState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Stay in the before attribute value state. */
-            $this->state = 'beforeAttributeValue';
+			$this->state = 'beforeAttributeValue';
 
-        } elseif($char === '"') {
-            /* U+0022 QUOTATION MARK (")
+		} elseif($char === '"') {
+			/* U+0022 QUOTATION MARK (")
             Switch to the attribute value (double-quoted) state. */
-            $this->state = 'attributeValueDoubleQuoted';
+			$this->state = 'attributeValueDoubleQuoted';
 
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
+		} elseif($char === '&') {
+			/* U+0026 AMPERSAND (&)
             Switch to the attribute value (unquoted) state and reconsume
             this input character. */
-            $this->char--;
-            $this->state = 'attributeValueUnquoted';
+			$this->char--;
+			$this->state = 'attributeValueUnquoted';
 
-        } elseif($char === '\'') {
-            /* U+0027 APOSTROPHE (')
+		} elseif($char === '\'') {
+			/* U+0027 APOSTROPHE (')
             Switch to the attribute value (single-quoted) state. */
-            $this->state = 'attributeValueSingleQuoted';
+			$this->state = 'attributeValueSingleQuoted';
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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';
-        }
-    }
+			$this->state = 'attributeValueUnquoted';
+		}
+	}
 
-    private function attributeValueDoubleQuotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
+	private function attributeValueDoubleQuotedState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
 
-        if($char === '"') {
-            /* U+0022 QUOTATION MARK (")
+		if($char === '"') {
+			/* U+0022 QUOTATION MARK (")
             Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
+		} elseif($char === '&') {
+			/* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('double');
+			$this->entityInAttributeValueState('double');
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the character
             in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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';
-        }
-    }
+			$this->state = 'attributeValueDoubleQuoted';
+		}
+	}
 
-    private function attributeValueSingleQuotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
+	private function attributeValueSingleQuotedState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
 
-        if($char === '\'') {
-            /* U+0022 QUOTATION MARK (')
+		if($char === '\'') {
+			/* U+0022 QUOTATION MARK (')
             Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
+		} elseif($char === '&') {
+			/* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState('single');
+			$this->entityInAttributeValueState('single');
 
-        } elseif($this->char === $this->EOF) {
-            /* EOF
+		} elseif($this->char === $this->EOF) {
+			/* EOF
             Parse error. Emit the current tag token. Reconsume the character
             in the data state. */
-            $this->emitToken($this->token);
+			$this->emitToken($this->token);
 
-            $this->char--;
-            $this->state = 'data';
+			$this->char--;
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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';
-        }
-    }
+			$this->state = 'attributeValueSingleQuoted';
+		}
+	}
 
-    private function attributeValueUnquotedState() {
-        // Consume the next input character:
-        $this->char++;
-        $char = $this->character($this->char);
+	private function attributeValueUnquotedState() {
+		// Consume the next input character:
+		$this->char++;
+		$char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            /* U+0009 CHARACTER TABULATION
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			/* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
             U+000C FORM FEED (FF)
             U+0020 SPACE
             Switch to the before attribute name state. */
-            $this->state = 'beforeAttributeName';
+			$this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
-            /* U+0026 AMPERSAND (&)
+		} elseif($char === '&') {
+			/* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
-            $this->entityInAttributeValueState();
+			$this->entityInAttributeValueState();
 
-        } elseif($char === '>') {
-            /* U+003E GREATER-THAN SIGN (>)
+		} elseif($char === '>') {
+			/* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
-            $this->emitToken($this->token);
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->state = 'data';
 
-        } else {
-            /* Anything else
+		} else {
+			/* 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;
-
-            $this->state = 'attributeValueUnquoted';
-        }
-    }
-
-    private function entityInAttributeValueState() {
-        // Attempt to consume an entity.
-        $entity = $this->entity();
-
-        // If nothing is returned, append a U+0026 AMPERSAND character to the
-        // current attribute's value. Otherwise, emit the character token that
-        // was returned.
-        $char = (!$entity)
-            ? '&'
-            : $entity;
-
-        $last = count($this->token['attr']) - 1;
-        $this->token['attr'][$last]['value'] .= $char;
-    }
-
-    private function bogusCommentState() {
-        /* Consume every character up to the first U+003E GREATER-THAN SIGN
+			$last = count($this->token['attr']) - 1;
+			$this->token['attr'][$last]['value'] .= $char;
+
+			$this->state = 'attributeValueUnquoted';
+		}
+	}
+
+	private function entityInAttributeValueState() {
+		// Attempt to consume an entity.
+		$entity = $this->entity();
+
+		// If nothing is returned, append a U+0026 AMPERSAND character to the
+		// current attribute's value. Otherwise, emit the character token that
+		// was returned.
+		$char = (!$entity)
+			? '&'
+			: $entity;
+
+		$last = count($this->token['attr']) - 1;
+		$this->token['attr'][$last]['value'] .= $char;
+	}
+
+	private function bogusCommentState() {
+		/* Consume every character up to the first U+003E GREATER-THAN SIGN
         character (>) or the end of the file (EOF), whichever comes first. Emit
         a comment token whose data is the concatenation of all the characters
         starting from and including the character that caused the state machine
@@ -813,446 +813,446 @@ 
         consumed character before the U+003E character, if any, or up to the
         end of the file otherwise. (If the comment was started by the end of
         the file (EOF), the token is empty.) */
-        $data = $this->characters('^>', $this->char);
-        $this->emitToken(array(
-            'data' => $data,
-            'type' => self::COMMENT
-        ));
+		$data = $this->characters('^>', $this->char);
+		$this->emitToken(array(
+			'data' => $data,
+			'type' => self::COMMENT
+		));
 
-        $this->char += strlen($data);
+		$this->char += strlen($data);
 
-        /* Switch to the data state. */
-        $this->state = 'data';
+		/* Switch to the data state. */
+		$this->state = 'data';
 
-        /* If the end of the file was reached, reconsume the EOF character. */
-        if($this->char === $this->EOF) {
-            $this->char = $this->EOF - 1;
-        }
-    }
+		/* If the end of the file was reached, reconsume the EOF character. */
+		if($this->char === $this->EOF) {
+			$this->char = $this->EOF - 1;
+		}
+	}
 
-    private function markupDeclarationOpenState() {
-        /* If the next two characters are both U+002D HYPHEN-MINUS (-)
+	private function markupDeclarationOpenState() {
+		/* If the next two characters are both U+002D HYPHEN-MINUS (-)
         characters, consume those two characters, create a comment token whose
         data is the empty string, and switch to the comment state. */
-        if($this->character($this->char + 1, 2) === '--') {
-            $this->char += 2;
-            $this->state = 'comment';
-            $this->token = array(
-                'data' => null,
-                'type' => self::COMMENT
-            );
-
-        /* Otherwise if the next seven chacacters are a case-insensitive match
+		if($this->character($this->char + 1, 2) === '--') {
+			$this->char += 2;
+			$this->state = 'comment';
+			$this->token = array(
+				'data' => null,
+				'type' => self::COMMENT
+			);
+
+		/* Otherwise if the next seven chacacters are a case-insensitive match
         for the word "DOCTYPE", then consume those characters and switch to the
         DOCTYPE state. */
-        } elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
-            $this->char += 7;
-            $this->state = 'doctype';
+		} elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
+			$this->char += 7;
+			$this->state = 'doctype';
 
-        /* Otherwise, is is a parse error. Switch to the bogus comment state.
+		/* Otherwise, is is a parse error. Switch to the bogus comment state.
         The next character that is consumed, if any, is the first character
         that will be in the comment. */
-        } else {
-            $this->char++;
-            $this->state = 'bogusComment';
-        }
-    }
-
-    private function commentState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
-            /* Switch to the comment dash state  */
-            $this->state = 'commentDash';
-
-        /* EOF */
-        } elseif($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
+		} else {
+			$this->char++;
+			$this->state = 'bogusComment';
+		}
+	}
+
+	private function commentState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		/* U+002D HYPHEN-MINUS (-) */
+		if($char === '-') {
+			/* Switch to the comment dash state  */
+			$this->state = 'commentDash';
+
+		/* EOF */
+		} elseif($this->char === $this->EOF) {
+			/* Parse error. Emit the comment token. Reconsume the EOF character
             in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
 
-        /* Anything else */
-        } else {
-            /* Append the input character to the comment token's data. Stay in
+		/* Anything else */
+		} else {
+			/* Append the input character to the comment token's data. Stay in
             the comment state. */
-            $this->token['data'] .= $char;
-        }
-    }
-
-    private function commentDashState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
-            /* Switch to the comment end state  */
-            $this->state = 'commentEnd';
-
-        /* EOF */
-        } elseif($this->char === $this->EOF) {
-            /* Parse error. Emit the comment token. Reconsume the EOF character
+			$this->token['data'] .= $char;
+		}
+	}
+
+	private function commentDashState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		/* U+002D HYPHEN-MINUS (-) */
+		if($char === '-') {
+			/* Switch to the comment end state  */
+			$this->state = 'commentEnd';
+
+		/* EOF */
+		} elseif($this->char === $this->EOF) {
+			/* Parse error. Emit the comment token. Reconsume the EOF character
             in the data state. */
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
 
-        /* Anything else */
-        } else {
-            /* Append a U+002D HYPHEN-MINUS (-) character and the input
+		/* Anything else */
+		} 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->state = 'comment';
-        }
-    }
-
-    private function commentEndState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($char === '-') {
-            $this->token['data'] .= '-';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['data'] .= '--'.$char;
-            $this->state = 'comment';
-        }
-    }
-
-    private function doctypeState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'beforeDoctypeName';
-
-        } else {
-            $this->char--;
-            $this->state = 'beforeDoctypeName';
-        }
-    }
-
-    private function beforeDoctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the before DOCTYPE name state.
-
-        } elseif(preg_match('/^[a-z]$/', $char)) {
-            $this->token = array(
-                'name' => strtoupper($char),
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-
-        } elseif($char === '>') {
-            $this->emitToken(array(
-                'name' => null,
-                'type' => self::DOCTYPE,
-                'error' => true
-            ));
-
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken(array(
-                'name' => null,
-                'type' => self::DOCTYPE,
-                'error' => true
-            ));
-
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token = array(
-                'name' => $char,
-                'type' => self::DOCTYPE,
-                'error' => true
-            );
-
-            $this->state = 'doctypeName';
-        }
-    }
-
-    private function doctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            $this->state = 'AfterDoctypeName';
-
-        } elseif($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif(preg_match('/^[a-z]$/', $char)) {
-            $this->token['name'] .= strtoupper($char);
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['name'] .= $char;
-        }
-
-        $this->token['error'] = ($this->token['name'] === 'HTML')
-            ? false
-            : true;
-    }
-
-    private function afterDoctypeNameState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
-            // Stay in the DOCTYPE name state.
-
-        } elseif($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            $this->token['error'] = true;
-            $this->state = 'bogusDoctype';
-        }
-    }
-
-    private function bogusDoctypeState() {
-        /* Consume the next input character: */
-        $this->char++;
-        $char = $this->char();
-
-        if($char === '>') {
-            $this->emitToken($this->token);
-            $this->state = 'data';
-
-        } elseif($this->char === $this->EOF) {
-            $this->emitToken($this->token);
-            $this->char--;
-            $this->state = 'data';
-
-        } else {
-            // Stay in the bogus DOCTYPE state.
-        }
-    }
-
-    private function entity() {
-        $start = $this->char;
-
-        // This section defines how to consume an entity. This definition is
-        // used when parsing entities in text and in attributes.
-
-        // The behaviour depends on the identity of the next character (the
-        // one immediately after the U+0026 AMPERSAND character): 
-
-        switch($this->character($this->char + 1)) {
-            // U+0023 NUMBER SIGN (#)
-            case '#':
-
-                // The behaviour further depends on the character after the
-                // U+0023 NUMBER SIGN:
-                switch($this->character($this->char + 1)) {
-                    // U+0078 LATIN SMALL LETTER X
-                    // U+0058 LATIN CAPITAL LETTER X
-                    case 'x':
-                    case 'X':
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE, U+0061 LATIN SMALL LETTER A through to U+0066
-                        // LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
-                        // A, through to U+0046 LATIN CAPITAL LETTER F (in other
-                        // words, 0-9, A-F, a-f).
-                        $char = 1;
-                        $char_class = '0-9A-Fa-f';
-                    break;
-
-                    // Anything else
-                    default:
-                        // Follow the steps below, but using the range of
-                        // characters U+0030 DIGIT ZERO through to U+0039 DIGIT
-                        // NINE (i.e. just 0-9).
-                        $char = 0;
-                        $char_class = '0-9';
-                    break;
-                }
-
-                // Consume as many characters as match the range of characters
-                // given above.
-                $this->char++;
-                $e_name = $this->characters($char_class, $this->char + $char + 1);
-                $entity = $this->character($start, $this->char);
-                $cond = strlen($e_name) > 0;
-
-                // The rest of the parsing happens bellow.
-            break;
-
-            // Anything else
-            default:
-                // Consume the maximum number of characters possible, with the
-                // consumed characters case-sensitively matching one of the
-                // identifiers in the first column of the entities table.
-                $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
-                $len = strlen($e_name);
-
-                for($c = 1; $c <= $len; $c++) {
-                    $id = substr($e_name, 0, $c);
-                    $this->char++;
-
-                    if(in_array($id, $this->entities)) {
-                        if ($e_name[$c-1] !== ';') {
-                            if ($c < $len && $e_name[$c] == ';') {
-                                $this->char++; // consume extra semicolon
-                            }
-                        }
-                        $entity = $id;
-                        break;
-                    }
-                }
-
-                $cond = isset($entity);
-                // The rest of the parsing happens bellow.
-            break;
-        }
-
-        if(!$cond) {
-            // If no match can be made, then this is a parse error. No
-            // characters are consumed, and nothing is returned.
-            $this->char = $start;
-            return false;
-        }
-
-        // 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');
-    }
-
-    private function emitToken($token) {
-        $emit = $this->tree->emitToken($token);
-
-        if(is_int($emit)) {
-            $this->content_model = $emit;
-
-        } elseif($token['type'] === self::ENDTAG) {
-            $this->content_model = self::PCDATA;
-        }
-    }
-
-    private function EOF() {
-        $this->state = null;
-        $this->tree->emitToken(array(
-            'type' => self::EOF
-        ));
-    }
+			$this->token['data'] .= '-'.$char;
+			$this->state = 'comment';
+		}
+	}
+
+	private function commentEndState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if($char === '>') {
+			$this->emitToken($this->token);
+			$this->state = 'data';
+
+		} elseif($char === '-') {
+			$this->token['data'] .= '-';
+
+		} elseif($this->char === $this->EOF) {
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
+
+		} else {
+			$this->token['data'] .= '--'.$char;
+			$this->state = 'comment';
+		}
+	}
+
+	private function doctypeState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			$this->state = 'beforeDoctypeName';
+
+		} else {
+			$this->char--;
+			$this->state = 'beforeDoctypeName';
+		}
+	}
+
+	private function beforeDoctypeNameState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			// Stay in the before DOCTYPE name state.
+
+		} elseif(preg_match('/^[a-z]$/', $char)) {
+			$this->token = array(
+				'name' => strtoupper($char),
+				'type' => self::DOCTYPE,
+				'error' => true
+			);
+
+			$this->state = 'doctypeName';
+
+		} elseif($char === '>') {
+			$this->emitToken(array(
+				'name' => null,
+				'type' => self::DOCTYPE,
+				'error' => true
+			));
+
+			$this->state = 'data';
+
+		} elseif($this->char === $this->EOF) {
+			$this->emitToken(array(
+				'name' => null,
+				'type' => self::DOCTYPE,
+				'error' => true
+			));
+
+			$this->char--;
+			$this->state = 'data';
+
+		} else {
+			$this->token = array(
+				'name' => $char,
+				'type' => self::DOCTYPE,
+				'error' => true
+			);
+
+			$this->state = 'doctypeName';
+		}
+	}
+
+	private function doctypeNameState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			$this->state = 'AfterDoctypeName';
+
+		} elseif($char === '>') {
+			$this->emitToken($this->token);
+			$this->state = 'data';
+
+		} elseif(preg_match('/^[a-z]$/', $char)) {
+			$this->token['name'] .= strtoupper($char);
+
+		} elseif($this->char === $this->EOF) {
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
+
+		} else {
+			$this->token['name'] .= $char;
+		}
+
+		$this->token['error'] = ($this->token['name'] === 'HTML')
+			? false
+			: true;
+	}
+
+	private function afterDoctypeNameState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+			// Stay in the DOCTYPE name state.
+
+		} elseif($char === '>') {
+			$this->emitToken($this->token);
+			$this->state = 'data';
+
+		} elseif($this->char === $this->EOF) {
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
+
+		} else {
+			$this->token['error'] = true;
+			$this->state = 'bogusDoctype';
+		}
+	}
+
+	private function bogusDoctypeState() {
+		/* Consume the next input character: */
+		$this->char++;
+		$char = $this->char();
+
+		if($char === '>') {
+			$this->emitToken($this->token);
+			$this->state = 'data';
+
+		} elseif($this->char === $this->EOF) {
+			$this->emitToken($this->token);
+			$this->char--;
+			$this->state = 'data';
+
+		} else {
+			// Stay in the bogus DOCTYPE state.
+		}
+	}
+
+	private function entity() {
+		$start = $this->char;
+
+		// This section defines how to consume an entity. This definition is
+		// used when parsing entities in text and in attributes.
+
+		// The behaviour depends on the identity of the next character (the
+		// one immediately after the U+0026 AMPERSAND character): 
+
+		switch($this->character($this->char + 1)) {
+			// U+0023 NUMBER SIGN (#)
+			case '#':
+
+				// The behaviour further depends on the character after the
+				// U+0023 NUMBER SIGN:
+				switch($this->character($this->char + 1)) {
+					// U+0078 LATIN SMALL LETTER X
+					// U+0058 LATIN CAPITAL LETTER X
+					case 'x':
+					case 'X':
+						// Follow the steps below, but using the range of
+						// characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+						// NINE, U+0061 LATIN SMALL LETTER A through to U+0066
+						// LATIN SMALL LETTER F, and U+0041 LATIN CAPITAL LETTER
+						// A, through to U+0046 LATIN CAPITAL LETTER F (in other
+						// words, 0-9, A-F, a-f).
+						$char = 1;
+						$char_class = '0-9A-Fa-f';
+					break;
+
+					// Anything else
+					default:
+						// Follow the steps below, but using the range of
+						// characters U+0030 DIGIT ZERO through to U+0039 DIGIT
+						// NINE (i.e. just 0-9).
+						$char = 0;
+						$char_class = '0-9';
+					break;
+				}
+
+				// Consume as many characters as match the range of characters
+				// given above.
+				$this->char++;
+				$e_name = $this->characters($char_class, $this->char + $char + 1);
+				$entity = $this->character($start, $this->char);
+				$cond = strlen($e_name) > 0;
+
+				// The rest of the parsing happens bellow.
+			break;
+
+			// Anything else
+			default:
+				// Consume the maximum number of characters possible, with the
+				// consumed characters case-sensitively matching one of the
+				// identifiers in the first column of the entities table.
+				$e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
+				$len = strlen($e_name);
+
+				for($c = 1; $c <= $len; $c++) {
+					$id = substr($e_name, 0, $c);
+					$this->char++;
+
+					if(in_array($id, $this->entities)) {
+						if ($e_name[$c-1] !== ';') {
+							if ($c < $len && $e_name[$c] == ';') {
+								$this->char++; // consume extra semicolon
+							}
+						}
+						$entity = $id;
+						break;
+					}
+				}
+
+				$cond = isset($entity);
+				// The rest of the parsing happens bellow.
+			break;
+		}
+
+		if(!$cond) {
+			// If no match can be made, then this is a parse error. No
+			// characters are consumed, and nothing is returned.
+			$this->char = $start;
+			return false;
+		}
+
+		// 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');
+	}
+
+	private function emitToken($token) {
+		$emit = $this->tree->emitToken($token);
+
+		if(is_int($emit)) {
+			$this->content_model = $emit;
+
+		} elseif($token['type'] === self::ENDTAG) {
+			$this->content_model = self::PCDATA;
+		}
+	}
+
+	private function EOF() {
+		$this->state = null;
+		$this->tree->emitToken(array(
+			'type' => self::EOF
+		));
+	}
 }
 
 class HTML5TreeConstructer {
-    public $stack = array();
-
-    private $phase;
-    private $mode;
-    private $dom;
-    private $foster_parent = null;
-    private $a_formatting  = array();
-
-    private $head_pointer = null;
-    private $form_pointer = null;
-
-    private $scoping = array('button','caption','html','marquee','object','table','td','th');
-    private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
-    private $special = array('address','area','base','basefont','bgsound',
-    'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
-    'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
-    'h6','head','hr','iframe','image','img','input','isindex','li','link',
-    'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
-    'option','p','param','plaintext','pre','script','select','spacer','style',
-    'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
-
-    // The different phases.
-    const INIT_PHASE = 0;
-    const ROOT_PHASE = 1;
-    const MAIN_PHASE = 2;
-    const END_PHASE  = 3;
-
-    // The different insertion modes for the main phase.
-    const BEFOR_HEAD = 0;
-    const IN_HEAD    = 1;
-    const AFTER_HEAD = 2;
-    const IN_BODY    = 3;
-    const IN_TABLE   = 4;
-    const IN_CAPTION = 5;
-    const IN_CGROUP  = 6;
-    const IN_TBODY   = 7;
-    const IN_ROW     = 8;
-    const IN_CELL    = 9;
-    const IN_SELECT  = 10;
-    const AFTER_BODY = 11;
-    const IN_FRAME   = 12;
-    const AFTR_FRAME = 13;
-
-    // The different types of elements.
-    const SPECIAL    = 0;
-    const SCOPING    = 1;
-    const FORMATTING = 2;
-    const PHRASING   = 3;
-
-    const MARKER     = 0;
-
-    public function __construct() {
-        $this->phase = self::INIT_PHASE;
-        $this->mode = self::BEFOR_HEAD;
-        $this->dom = new DOMDocument;
-
-        $this->dom->encoding = 'UTF-8';
-        $this->dom->preserveWhiteSpace = true;
-        $this->dom->substituteEntities = true;
-        $this->dom->strictErrorChecking = false;
-    }
-
-    // Process tag tokens
-    public function emitToken($token) {
-        switch($this->phase) {
-            case self::INIT_PHASE: return $this->initPhase($token); break;
-            case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
-            case self::MAIN_PHASE: return $this->mainPhase($token); break;
-            case self::END_PHASE : return $this->trailingEndPhase($token); break;
-        }
-    }
-
-    private function initPhase($token) {
-        /* Initially, the tree construction stage must handle each token
+	public $stack = array();
+
+	private $phase;
+	private $mode;
+	private $dom;
+	private $foster_parent = null;
+	private $a_formatting  = array();
+
+	private $head_pointer = null;
+	private $form_pointer = null;
+
+	private $scoping = array('button','caption','html','marquee','object','table','td','th');
+	private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
+	private $special = array('address','area','base','basefont','bgsound',
+	'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
+	'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
+	'h6','head','hr','iframe','image','img','input','isindex','li','link',
+	'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
+	'option','p','param','plaintext','pre','script','select','spacer','style',
+	'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
+
+	// The different phases.
+	const INIT_PHASE = 0;
+	const ROOT_PHASE = 1;
+	const MAIN_PHASE = 2;
+	const END_PHASE  = 3;
+
+	// The different insertion modes for the main phase.
+	const BEFOR_HEAD = 0;
+	const IN_HEAD    = 1;
+	const AFTER_HEAD = 2;
+	const IN_BODY    = 3;
+	const IN_TABLE   = 4;
+	const IN_CAPTION = 5;
+	const IN_CGROUP  = 6;
+	const IN_TBODY   = 7;
+	const IN_ROW     = 8;
+	const IN_CELL    = 9;
+	const IN_SELECT  = 10;
+	const AFTER_BODY = 11;
+	const IN_FRAME   = 12;
+	const AFTR_FRAME = 13;
+
+	// The different types of elements.
+	const SPECIAL    = 0;
+	const SCOPING    = 1;
+	const FORMATTING = 2;
+	const PHRASING   = 3;
+
+	const MARKER     = 0;
+
+	public function __construct() {
+		$this->phase = self::INIT_PHASE;
+		$this->mode = self::BEFOR_HEAD;
+		$this->dom = new DOMDocument;
+
+		$this->dom->encoding = 'UTF-8';
+		$this->dom->preserveWhiteSpace = true;
+		$this->dom->substituteEntities = true;
+		$this->dom->strictErrorChecking = false;
+	}
+
+	// Process tag tokens
+	public function emitToken($token) {
+		switch($this->phase) {
+			case self::INIT_PHASE: return $this->initPhase($token); break;
+			case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
+			case self::MAIN_PHASE: return $this->mainPhase($token); break;
+			case self::END_PHASE : return $this->trailingEndPhase($token); break;
+		}
+	}
+
+	private function initPhase($token) {
+		/* Initially, the tree construction stage must handle each token
         emitted from the tokenisation stage as follows: */
 
-        /* A DOCTYPE token that is marked as being in error
+		/* A DOCTYPE token that is marked as being in error
         A comment token
         A start tag token
         An end tag token
@@ -1260,575 +1260,575 @@ 
             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']))) {
-            /* This specification does not define how to handle this case. In
+		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
             altogether for such documents, and instead invoke special parse modes
             with a greater emphasis on backwards compatibility. */
 
-            $this->phase = self::ROOT_PHASE;
-            return $this->rootElementPhase($token);
+			$this->phase = self::ROOT_PHASE;
+			return $this->rootElementPhase($token);
 
-        /* A DOCTYPE token marked as being correct */
-        } elseif(isset($token['error']) && !$token['error']) {
-            /* Append a DocumentType node to the Document  node, with the name
+		/* A DOCTYPE token marked as being correct */
+		} 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
             set to null, empty lists, or the empty string as appropriate. */
-            $doctype = new DOMDocumentType(null, null, 'HTML');
+			$doctype = new DOMDocumentType(null, null, 'HTML');
 
-            /* Then, switch to the root element phase of the tree construction
+			/* Then, switch to the root element phase of the tree construction
             stage. */
-            $this->phase = self::ROOT_PHASE;
+			$this->phase = self::ROOT_PHASE;
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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('/^[\t\n\x0b\x0c ]+$/',
-        $token['data'])) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
-        }
-    }
-
-    private function rootElementPhase($token) {
-        /* After the initial phase, as each token is emitted from the tokenisation
+		} elseif(isset($token['data']) && preg_match('/^[\t\n\x0b\x0c ]+$/',
+		$token['data'])) {
+			/* Append that character  to the Document node. */
+			$text = $this->dom->createTextNode($token['data']);
+			$this->dom->appendChild($text);
+		}
+	}
+
+	private function rootElementPhase($token) {
+		/* After the initial phase, as each token is emitted from the tokenisation
         stage, it must be processed as described in this section. */
 
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
+		/* A DOCTYPE token */
+		if($token['type'] === HTML5::DOCTYPE) {
+			// Parse error. Ignore the token.
 
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
+		/* A comment token */
+		} 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']);
-            $this->dom->appendChild($comment);
+			$comment = $this->dom->createComment($token['data']);
+			$this->dom->appendChild($comment);
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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'])) {
-            /* Append that character  to the Document node. */
-            $text = $this->dom->createTextNode($token['data']);
-            $this->dom->appendChild($text);
+		} 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']);
+			$this->dom->appendChild($text);
 
-        /* A character token that is not one of U+0009 CHARACTER TABULATION,
+		/* 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
         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) {
-            /* Create an HTMLElement node with the tag name html, in the HTML
+		} 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;
+			$html = $this->dom->createElement('html');
+			$this->dom->appendChild($html);
+			$this->stack[] = $html;
 
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-        }
-    }
+			$this->phase = self::MAIN_PHASE;
+			return $this->mainPhase($token);
+		}
+	}
 
-    private function mainPhase($token) {
-        /* Tokens in the main phase must be handled as follows: */
+	private function mainPhase($token) {
+		/* Tokens in the main phase must be handled as follows: */
 
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
+		/* A DOCTYPE token */
+		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') {
-            /* If this start tag token was not the first start tag token, then
+		/* A start tag token with the tag 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. */
 
-            /* For each attribute on the token, check to see if the attribute
+			/* For each attribute on the token, check to see if the attribute
             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']);
-                }
-            }
-
-        /* An end-of-file token */
-        } elseif($token['type'] === HTML5::EOF) {
-            /* Generate implied end tags. */
-            $this->generateImpliedEndTags();
-
-        /* Anything else. */
-        } else {
-            /* Depends on the insertion mode: */
-            switch($this->mode) {
-                case self::BEFOR_HEAD: return $this->beforeHead($token); break;
-                case self::IN_HEAD:    return $this->inHead($token); break;
-                case self::AFTER_HEAD: return $this->afterHead($token); break;
-                case self::IN_BODY:    return $this->inBody($token); break;
-                case self::IN_TABLE:   return $this->inTable($token); break;
-                case self::IN_CAPTION: return $this->inCaption($token); break;
-                case self::IN_CGROUP:  return $this->inColumnGroup($token); break;
-                case self::IN_TBODY:   return $this->inTableBody($token); break;
-                case self::IN_ROW:     return $this->inRow($token); break;
-                case self::IN_CELL:    return $this->inCell($token); break;
-                case self::IN_SELECT:  return $this->inSelect($token); break;
-                case self::AFTER_BODY: return $this->afterBody($token); break;
-                case self::IN_FRAME:   return $this->inFrameset($token); break;
-                case self::AFTR_FRAME: return $this->afterFrameset($token); break;
-                case self::END_PHASE:  return $this->trailingEndPhase($token); break;
-            }
-        }
-    }
-
-    private function beforeHead($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+			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) {
+			/* Generate implied end tags. */
+			$this->generateImpliedEndTags();
+
+		/* Anything else. */
+		} else {
+			/* Depends on the insertion mode: */
+			switch($this->mode) {
+				case self::BEFOR_HEAD: return $this->beforeHead($token); break;
+				case self::IN_HEAD:    return $this->inHead($token); break;
+				case self::AFTER_HEAD: return $this->afterHead($token); break;
+				case self::IN_BODY:    return $this->inBody($token); break;
+				case self::IN_TABLE:   return $this->inTable($token); break;
+				case self::IN_CAPTION: return $this->inCaption($token); break;
+				case self::IN_CGROUP:  return $this->inColumnGroup($token); break;
+				case self::IN_TBODY:   return $this->inTableBody($token); break;
+				case self::IN_ROW:     return $this->inRow($token); break;
+				case self::IN_CELL:    return $this->inCell($token); break;
+				case self::IN_SELECT:  return $this->inSelect($token); break;
+				case self::AFTER_BODY: return $this->afterBody($token); break;
+				case self::IN_FRAME:   return $this->inFrameset($token); break;
+				case self::AFTR_FRAME: return $this->afterFrameset($token); break;
+				case self::END_PHASE:  return $this->trailingEndPhase($token); break;
+			}
+		}
+	}
+
+	private function beforeHead($token) {
+		/* Handle the token as follows: */
+
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
+		if($token['type'] === HTML5::CHARACTR &&
+		preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+			/* Append the character to the current node. */
+			$this->insertText($token['data']);
+
+		/* A comment token */
+		} 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') {
-            /* Create an element for the token, append the new element to the
+		/* A start tag token with the tag 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);
+			$element = $this->insertElement($token);
 
-            /* Set the head element pointer to this new element node. */
-            $this->head_pointer = $element;
+			/* Set the head element pointer to this new element node. */
+			$this->head_pointer = $element;
 
-            /* Change the insertion mode to "in head". */
-            $this->mode = self::IN_HEAD;
+			/* Change the insertion mode to "in head". */
+			$this->mode = self::IN_HEAD;
 
-        /* A start tag token whose tag name is one of: "base", "link", "meta",
+		/* A start tag token whose tag name is one of: "base", "link", "meta",
         "script", "style", "title". Or an end tag with the tag name "html".
         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('/^[\t\n\x0b\x0c ]$/',
-        $token['data']))) {
-            /* Act as if a start tag token with the tag name "head" and no
+		} elseif($token['type'] === HTML5::STARTTAG ||
+		($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
+		($token['type'] === HTML5::CHARACTR && !preg_match('/^[\t\n\x0b\x0c ]$/',
+		$token['data']))) {
+			/* Act as if a start tag token with the tag name "head" and no
             attributes had been seen, then reprocess the current token. */
-            $this->beforeHead(array(
-                'name' => 'head',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
+			$this->beforeHead(array(
+				'name' => 'head',
+				'type' => HTML5::STARTTAG,
+				'attr' => array()
+			));
 
-            return $this->inHead($token);
+			return $this->inHead($token);
 
-        /* Any other end tag */
-        } elseif($token['type'] === HTML5::ENDTAG) {
-            /* Parse error. Ignore the token. */
-        }
-    }
+		/* Any other end tag */
+		} elseif($token['type'] === HTML5::ENDTAG) {
+			/* Parse error. Ignore the token. */
+		}
+	}
 
-    private function inHead($token) {
-        /* Handle the token as follows: */
+	private function inHead($token) {
+		/* Handle the token as follows: */
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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.
 
         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(end($this->stack)->nodeName,
-        array('title', 'style', 'script')))) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
+		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']);
+
+		/* A comment token */
+		} 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'))) {
-            array_pop($this->stack);
-            return HTML5::PCDATA;
+		} 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') {
-            /* Create an element for the token and append the new element to the
+		/* A start tag with the tag 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. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
+			if($this->head_pointer !== null) {
+				$element = $this->insertElement($token, false);
+				$this->head_pointer->appendChild($element);
 
-            } else {
-                $element = $this->insertElement($token);
-            }
+			} else {
+				$element = $this->insertElement($token);
+			}
 
-            /* Switch the tokeniser's content model flag  to the RCDATA state. */
-            return HTML5::RCDATA;
+			/* Switch the tokeniser's content model flag  to the RCDATA state. */
+			return HTML5::RCDATA;
 
-        /* A start tag with the tag name "style" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'style') {
-            /* Create an element for the token and append the new element to the
+		/* A start tag with the tag 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. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-        /* A start tag with the tag 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);
-
-            /* Switch the tokeniser's content model flag  to the CDATA state. */
-            return HTML5::CDATA;
-
-        /* A start tag with the tag name "base", "link", or "meta" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('base', 'link', 'meta'))) {
-            /* Create an element for the token and append the new element to the
+			if($this->head_pointer !== null) {
+				$element = $this->insertElement($token, false);
+				$this->head_pointer->appendChild($element);
+
+			} else {
+				$this->insertElement($token);
+			}
+
+			/* Switch the tokeniser's content model flag  to the CDATA state. */
+			return HTML5::CDATA;
+
+		/* A start tag with the tag 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);
+
+			/* Switch the tokeniser's content model flag  to the CDATA state. */
+			return HTML5::CDATA;
+
+		/* A start tag with the tag name "base", "link", or "meta" */
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('base', 'link', 'meta'))) {
+			/* 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. */
-            if($this->head_pointer !== null) {
-                $element = $this->insertElement($token, false);
-                $this->head_pointer->appendChild($element);
-                array_pop($this->stack);
-
-            } else {
-                $this->insertElement($token);
-            }
-
-        /* An end tag with the tag name "head" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'head') {
-            /* If the current node is a head element, pop the current node off
+			if($this->head_pointer !== null) {
+				$element = $this->insertElement($token, false);
+				$this->head_pointer->appendChild($element);
+				array_pop($this->stack);
+
+			} else {
+				$this->insertElement($token);
+			}
+
+		/* An end tag with the tag 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))) {
-                array_pop($this->stack);
+			if($this->head_pointer->isSameNode(end($this->stack))) {
+				array_pop($this->stack);
 
-            /* Otherwise, this is a parse error. */
-            } else {
-                // k
-            }
+			/* Otherwise, this is a parse error. */
+			} else {
+				// k
+			}
 
-            /* Change the insertion mode to "after head". */
-            $this->mode = self::AFTER_HEAD;
+			/* Change the insertion mode to "after head". */
+			$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')) {
-            // Parse error. Ignore the token.
+		/* 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')) {
+			// Parse error. Ignore the token.
 
-        /* Anything else */
-        } else {
-            /* If the current node is a head element, act as if an end tag
+		/* Anything else */
+		} else {
+			/* If the current node is a head element, act as if an end tag
             token with the tag name "head" had been seen. */
-            if($this->head_pointer->isSameNode(end($this->stack))) {
-                $this->inHead(array(
-                    'name' => 'head',
-                    'type' => HTML5::ENDTAG
-                ));
-
-            /* Otherwise, change the insertion mode to "after head". */
-            } else {
-                $this->mode = self::AFTER_HEAD;
-            }
-
-            /* Then, reprocess the current token. */
-            return $this->afterHead($token);
-        }
-    }
-
-    private function afterHead($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+			if($this->head_pointer->isSameNode(end($this->stack))) {
+				$this->inHead(array(
+					'name' => 'head',
+					'type' => HTML5::ENDTAG
+				));
+
+			/* Otherwise, change the insertion mode to "after head". */
+			} else {
+				$this->mode = self::AFTER_HEAD;
+			}
+
+			/* Then, reprocess the current token. */
+			return $this->afterHead($token);
+		}
+	}
+
+	private function afterHead($token) {
+		/* Handle the token as follows: */
+
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data attribute
+		if($token['type'] === HTML5::CHARACTR &&
+		preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
+			/* Append the character to the current node. */
+			$this->insertText($token['data']);
+
+		/* A comment token */
+		} 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') {
-            /* Insert a body element for the token. */
-            $this->insertElement($token);
+		/* A start tag token with the tag name "body" */
+		} elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'body') {
+			/* Insert a body element for the token. */
+			$this->insertElement($token);
 
-            /* Change the insertion mode to "in body". */
-            $this->mode = self::IN_BODY;
+			/* Change the insertion mode to "in body". */
+			$this->mode = self::IN_BODY;
 
-        /* A start tag token with the tag name "frameset" */
-        } elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
-            /* Insert a frameset element for the token. */
-            $this->insertElement($token);
+		/* A start tag token with the tag name "frameset" */
+		} elseif($token['type'] === HTML5::STARTTAG && $token['name'] === 'frameset') {
+			/* Insert a frameset element for the token. */
+			$this->insertElement($token);
 
-            /* Change the insertion mode to "in frameset". */
-            $this->mode = self::IN_FRAME;
+			/* Change the insertion mode to "in frameset". */
+			$this->mode = self::IN_FRAME;
 
-        /* A start tag token whose tag name is one of: "base", "link", "meta",
+		/* 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'],
-        array('base', 'link', 'meta', 'script', 'style', 'title'))) {
-            /* Parse error. Switch the insertion mode back to "in head" and
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('base', 'link', 'meta', 'script', 'style', 'title'))) {
+			/* Parse error. Switch the insertion mode back to "in head" and
             reprocess the token. */
-            $this->mode = self::IN_HEAD;
-            return $this->inHead($token);
+			$this->mode = self::IN_HEAD;
+			return $this->inHead($token);
 
-        /* Anything else */
-        } else {
-            /* Act as if a start tag token with the tag name "body" and no
+		/* Anything else */
+		} else {
+			/* Act as if a start tag token with the tag name "body" and no
             attributes had been seen, and then reprocess the current token. */
-            $this->afterHead(array(
-                'name' => 'body',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inBody($token);
-        }
-    }
-
-    private function inBody($token) {
-        /* Handle the token as follows: */
-
-        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']);
-            break;
-
-            /* A comment token */
-            case HTML5::COMMENT:
-                /* Append a Comment node to the current node with the data
+			$this->afterHead(array(
+				'name' => 'body',
+				'type' => HTML5::STARTTAG,
+				'attr' => array()
+			));
+
+			return $this->inBody($token);
+		}
+	}
+
+	private function inBody($token) {
+		/* Handle the token as follows: */
+
+		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']);
+			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']);
-            break;
+				$this->insertComment($token['data']);
+			break;
 
-            case HTML5::STARTTAG:
-            switch($token['name']) {
-                /* A start tag token whose tag name is one of: "script",
+			case HTML5::STARTTAG:
+			switch($token['name']) {
+				/* A start tag token whose tag name is one of: "script",
                 "style" */
-                case 'script': case 'style':
-                    /* Process the token as if the insertion mode had been "in
+				case 'script': case 'style':
+					/* Process the token as if the insertion mode had been "in
                     head". */
-                    return $this->inHead($token);
-                break;
+					return $this->inHead($token);
+				break;
 
-                /* A start tag token whose tag name is one of: "base", "link",
+				/* A start tag token whose tag name is one of: "base", "link",
                 "meta", "title" */
-                case 'base': case 'link': case 'meta': case 'title':
-                    /* Parse error. Process the token as if the insertion mode
+				case 'base': case 'link': case 'meta': case 'title':
+					/* Parse error. Process the token as if the insertion mode
                     had    been "in head". */
-                    return $this->inHead($token);
-                break;
+					return $this->inHead($token);
+				break;
 
-                /* A start tag token with the tag name "body" */
-                case 'body':
-                    /* Parse error. If the second element on the stack of open
+				/* A start tag token with the tag name "body" */
+				case 'body':
+					/* Parse error. If the second element on the stack of open
                     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') {
-                        // Ignore
+					if(count($this->stack) === 1 || $this->stack[1]->nodeName !== 'body') {
+						// Ignore
 
-                    /* Otherwise, for each attribute on the token, check to see
+					/* Otherwise, for each attribute on the token, check to see
                     if the attribute is already present on the body element (the
                     second element)    on the stack of open elements. If it is not,
                     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']);
-                            }
-                        }
-                    }
-                break;
-
-                /* A start tag whose tag name is one of: "address",
+					} else {
+						foreach($token['attr'] as $attr) {
+							if(!$this->stack[1]->hasAttribute($attr['name'])) {
+								$this->stack[1]->setAttribute($attr['name'], $attr['value']);
+							}
+						}
+					}
+				break;
+
+				/* A start tag whose tag name is one of: "address",
                 "blockquote", "center", "dir", "div", "dl", "fieldset",
                 "listing", "menu", "ol", "p", "ul" */
-                case 'address': case 'blockquote': case 'center': case 'dir':
-                case 'div': case 'dl': case 'fieldset': case 'listing':
-                case 'menu': case 'ol': case 'p': case 'ul':
-                    /* If the stack of open elements has a p element in scope,
+				case 'address': case 'blockquote': case 'center': case 'dir':
+				case 'div': case 'dl': case 'fieldset': case 'listing':
+				case 'menu': case 'ol': case 'p': case 'ul':
+					/* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-                break;
-
-                /* A start tag whose tag name is "form" */
-                case 'form':
-                    /* If the form element pointer is not null, ignore the
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
+
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
+				break;
+
+				/* A start tag whose tag name is "form" */
+				case 'form':
+					/* If the form element pointer is not null, ignore the
                     token with a parse error. */
-                    if($this->form_pointer !== null) {
-                        // Ignore.
+					if($this->form_pointer !== null) {
+						// Ignore.
 
-                    /* Otherwise: */
-                    } else {
-                        /* If the stack of open elements has a p element in
+					/* Otherwise: */
+					} else {
+						/* If the stack of open elements has a p element in
                         scope, then act as if an end tag with the tag name p
                         had been seen. */
-                        if($this->elementInScope('p')) {
-                            $this->emitToken(array(
-                                'name' => 'p',
-                                'type' => HTML5::ENDTAG
-                            ));
-                        }
-
-                        /* Insert an HTML element for the token, and set the
+						if($this->elementInScope('p')) {
+							$this->emitToken(array(
+								'name' => 'p',
+								'type' => HTML5::ENDTAG
+							));
+						}
+
+						/* Insert an HTML element for the token, and set the
                         form element pointer to point to the element created. */
-                        $element = $this->insertElement($token);
-                        $this->form_pointer = $element;
-                    }
-                break;
-
-                /* A start tag whose tag name is "li", "dd" or "dt" */
-                case 'li': case 'dd': case 'dt':
-                    /* If the stack of open elements has a p  element in scope,
+						$element = $this->insertElement($token);
+						$this->form_pointer = $element;
+					}
+				break;
+
+				/* A start tag whose tag name is "li", "dd" or "dt" */
+				case 'li': case 'dd': case 'dt':
+					/* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
 
-                    $stack_length = count($this->stack) - 1;
+					$stack_length = count($this->stack) - 1;
 
-                    for($n = $stack_length; 0 <= $n; $n--) {
-                        /* 1. Initialise node to be the current node (the
+					for($n = $stack_length; 0 <= $n; $n--) {
+						/* 1. Initialise node to be the current node (the
                         bottommost node of the stack). */
-                        $stop = false;
-                        $node = $this->stack[$n];
-                        $cat  = $this->getElementCategory($node->tagName);
+						$stop = false;
+						$node = $this->stack[$n];
+						$cat  = $this->getElementCategory($node->tagName);
 
-                        /* 2. If node is an li, dd or dt element, then pop all
+						/* 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'
-                        && ($node->tagName === 'dd' || $node->tagName === 'dt'))) {
-                            for($x = $stack_length; $x >= $n ; $x--) {
-                                array_pop($this->stack);
-                            }
+						if($token['name'] === $node->tagName ||    ($token['name'] !== 'li'
+						&& ($node->tagName === 'dd' || $node->tagName === 'dt'))) {
+							for($x = $stack_length; $x >= $n ; $x--) {
+								array_pop($this->stack);
+							}
 
-                            break;
-                        }
+							break;
+						}
 
-                        /* 3. If node is not in the formatting category, and is
+						/* 3. If node is not in the formatting category, and is
                         not    in the phrasing category, and is not an address or
                         div element, then stop this algorithm. */
-                        if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
-                        $node->tagName !== 'address' && $node->tagName !== 'div') {
-                            break;
-                        }
-                    }
+						if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
+						$node->tagName !== 'address' && $node->tagName !== 'div') {
+							break;
+						}
+					}
 
-                    /* Finally, insert an HTML element with the same tag
+					/* Finally, insert an HTML element with the same tag
                     name as the    token's. */
-                    $this->insertElement($token);
-                break;
+					$this->insertElement($token);
+				break;
 
-                /* A start tag token whose tag name is "plaintext" */
-                case 'plaintext':
-                    /* If the stack of open elements has a p  element in scope,
+				/* A start tag token whose tag name is "plaintext" */
+				case 'plaintext':
+					/* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    return HTML5::PLAINTEXT;
-                break;
+					return HTML5::PLAINTEXT;
+				break;
 
-                /* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
+				/* A start tag whose tag name is one of: "h1", "h2", "h3", "h4",
                 "h5", "h6" */
-                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
-                    /* If the stack of open elements has a p  element in scope,
+				case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
+					/* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* If the stack of open elements has in scope an element whose
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
+
+					/* If the stack of open elements has in scope an element whose
                     tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
                     this is a parse error; pop elements from the stack until an
                     element with one of those tag names has been popped from the
                     stack. */
-                    while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-                        array_pop($this->stack);
-                    }
+					while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+						array_pop($this->stack);
+					}
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-                break;
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
+				break;
 
-                /* A start tag whose tag name is "a" */
-                case 'a':
-                    /* If the list of active formatting elements contains
+				/* A start tag whose tag name is "a" */
+				case 'a':
+					/* If the list of active formatting elements contains
                     an element whose tag name is "a" between the end of the
                     list and the last marker on the list (or the start of
                     the list if there is no marker on the list), then this
@@ -1837,940 +1837,940 @@ 
                     of active formatting elements and the stack of open
                     elements if the end tag didn't already remove it (it
                     might not have if the element is not in table scope). */
-                    $leng = count($this->a_formatting);
+					$leng = count($this->a_formatting);
 
-                    for($n = $leng - 1; $n >= 0; $n--) {
-                        if($this->a_formatting[$n] === self::MARKER) {
-                            break;
+					for($n = $leng - 1; $n >= 0; $n--) {
+						if($this->a_formatting[$n] === self::MARKER) {
+							break;
 
-                        } elseif($this->a_formatting[$n]->nodeName === 'a') {
-                            $this->emitToken(array(
-                                'name' => 'a',
-                                'type' => HTML5::ENDTAG
-                            ));
-                            break;
-                        }
-                    }
+						} elseif($this->a_formatting[$n]->nodeName === 'a') {
+							$this->emitToken(array(
+								'name' => 'a',
+								'type' => HTML5::ENDTAG
+							));
+							break;
+						}
+					}
 
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $el = $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$el = $this->insertElement($token);
 
-                    /* Add that element to the list of active formatting
+					/* Add that element to the list of active formatting
                     elements. */
-                    $this->a_formatting[] = $el;
-                break;
+					$this->a_formatting[] = $el;
+				break;
 
-                /* A start tag whose tag name is one of: "b", "big", "em", "font",
+				/* A start tag whose tag name is one of: "b", "big", "em", "font",
                 "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                case 'b': case 'big': case 'em': case 'font': case 'i':
-                case 'nobr': case 's': case 'small': case 'strike':
-                case 'strong': case 'tt': case 'u':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+				case 'b': case 'big': case 'em': case 'font': case 'i':
+				case 'nobr': case 's': case 'small': case 'strike':
+				case 'strong': case 'tt': case 'u':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $el = $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$el = $this->insertElement($token);
 
-                    /* Add that element to the list of active formatting
+					/* Add that element to the list of active formatting
                     elements. */
-                    $this->a_formatting[] = $el;
-                break;
+					$this->a_formatting[] = $el;
+				break;
 
-                /* A start tag token whose tag name is "button" */
-                case 'button':
-                    /* If the stack of open elements has a button element in scope,
+				/* A start tag token whose tag name is "button" */
+				case 'button':
+					/* If the stack of open elements has a button element in scope,
                     then this is a parse error; act as if an end tag with the tag
                     name "button" had been seen, then reprocess the token. (We don't
                     do that. Unnecessary.) */
-                    if($this->elementInScope('button')) {
-                        $this->inBody(array(
-                            'name' => 'button',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
+					if($this->elementInScope('button')) {
+						$this->inBody(array(
+							'name' => 'button',
+							'type' => HTML5::ENDTAG
+						));
+					}
 
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    /* Insert a marker at the end of the list of active
+					/* Insert a marker at the end of the list of active
                     formatting elements. */
-                    $this->a_formatting[] = self::MARKER;
-                break;
+					$this->a_formatting[] = self::MARKER;
+				break;
 
-                /* A start tag token whose tag name is one of: "marquee", "object" */
-                case 'marquee': case 'object':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+				/* A start tag token whose tag name is one of: "marquee", "object" */
+				case 'marquee': case 'object':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    /* Insert a marker at the end of the list of active
+					/* Insert a marker at the end of the list of active
                     formatting elements. */
-                    $this->a_formatting[] = self::MARKER;
-                break;
+					$this->a_formatting[] = self::MARKER;
+				break;
 
-                /* A start tag token whose tag name is "xmp" */
-                case 'xmp':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+				/* A start tag token whose tag name is "xmp" */
+				case 'xmp':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    /* Switch the content model flag to the CDATA state. */
-                    return HTML5::CDATA;
-                break;
+					/* Switch the content model flag to the CDATA state. */
+					return HTML5::CDATA;
+				break;
 
-                /* A start tag whose tag name is "table" */
-                case 'table':
-                    /* If the stack of open elements has a p element in scope,
+				/* A start tag whose tag name is "table" */
+				case 'table':
+					/* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    /* Change the insertion mode to "in table". */
-                    $this->mode = self::IN_TABLE;
-                break;
+					/* Change the insertion mode to "in table". */
+					$this->mode = self::IN_TABLE;
+				break;
 
-                /* A start tag whose tag name is one of: "area", "basefont",
+				/* A start tag whose tag name is one of: "area", "basefont",
                 "bgsound", "br", "embed", "img", "param", "spacer", "wbr" */
-                case 'area': case 'basefont': case 'bgsound': case 'br':
-                case 'embed': case 'img': case 'param': case 'spacer':
-                case 'wbr':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Immediately pop the current node off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
-
-                /* A start tag whose tag name is "hr" */
-                case 'hr':
-                    /* If the stack of open elements has a p element in scope,
+				case 'area': case 'basefont': case 'bgsound': case 'br':
+				case 'embed': case 'img': case 'param': case 'spacer':
+				case 'wbr':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
+
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
+
+					/* Immediately pop the current node off the stack of open elements. */
+					array_pop($this->stack);
+				break;
+
+				/* A start tag whose tag name is "hr" */
+				case 'hr':
+					/* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
-                        $this->emitToken(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
-
-                    /* Immediately pop the current node off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
-
-                /* A start tag whose tag name is "image" */
-                case 'image':
-                    /* Parse error. Change the token's tag name to "img" and
+					if($this->elementInScope('p')) {
+						$this->emitToken(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
+					}
+
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
+
+					/* Immediately pop the current node off the stack of open elements. */
+					array_pop($this->stack);
+				break;
+
+				/* A start tag whose tag name is "image" */
+				case 'image':
+					/* Parse error. Change the token's tag name to "img" and
                     reprocess it. (Don't ask.) */
-                    $token['name'] = 'img';
-                    return $this->inBody($token);
-                break;
+					$token['name'] = 'img';
+					return $this->inBody($token);
+				break;
 
-                /* A start tag whose tag name is "input" */
-                case 'input':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+				/* A start tag whose tag name is "input" */
+				case 'input':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an input element for the token. */
-                    $element = $this->insertElement($token, false);
+					/* Insert an input element for the token. */
+					$element = $this->insertElement($token, false);
 
-                    /* If the form element pointer is not null, then associate the
+					/* If the form element pointer is not null, then associate the
                     input element with the form element pointed to by the form
                     element pointer. */
-                    $this->form_pointer !== null
-                        ? $this->form_pointer->appendChild($element)
-                        : end($this->stack)->appendChild($element);
+					$this->form_pointer !== null
+						? $this->form_pointer->appendChild($element)
+						: end($this->stack)->appendChild($element);
 
-                    /* Pop that input element off the stack of open elements. */
-                    array_pop($this->stack);
-                break;
+					/* Pop that input element off the stack of open elements. */
+					array_pop($this->stack);
+				break;
 
-                /* A start tag whose tag name is "isindex" */
-                case 'isindex':
-                    /* Parse error. */
-                    // w/e
+				/* A start tag whose tag name is "isindex" */
+				case 'isindex':
+					/* Parse error. */
+					// w/e
 
-                    /* If the form element pointer is not null,
+					/* If the form element pointer is not null,
                     then ignore the token. */
-                    if($this->form_pointer === null) {
-                        /* Act as if a start tag token with the tag name "form" had
+					if($this->form_pointer === null) {
+						/* Act as if a start tag token with the tag name "form" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'body',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
+						$this->inBody(array(
+							'name' => 'body',
+							'type' => HTML5::STARTTAG,
+							'attr' => array()
+						));
 
-                        /* Act as if a start tag token with the tag name "hr" had
+						/* Act as if a start tag token with the tag name "hr" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'hr',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
+						$this->inBody(array(
+							'name' => 'hr',
+							'type' => HTML5::STARTTAG,
+							'attr' => array()
+						));
 
-                        /* Act as if a start tag token with the tag name "p" had
+						/* Act as if a start tag token with the tag name "p" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'p',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
+						$this->inBody(array(
+							'name' => 'p',
+							'type' => HTML5::STARTTAG,
+							'attr' => array()
+						));
 
-                        /* Act as if a start tag token with the tag name "label"
+						/* Act as if a start tag token with the tag name "label"
                         had been seen. */
-                        $this->inBody(array(
-                            'name' => 'label',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => array()
-                        ));
+						$this->inBody(array(
+							'name' => 'label',
+							'type' => HTML5::STARTTAG,
+							'attr' => array()
+						));
 
-                        /* Act as if a stream of character tokens had been seen. */
-                        $this->insertText('This is a searchable index. '.
-                        'Insert your search keywords here: ');
+						/* Act as if a stream of character tokens had been seen. */
+						$this->insertText('This is a searchable index. '.
+						'Insert your search keywords here: ');
 
-                        /* Act as if a start tag token with the tag name "input"
+						/* Act as if a start tag token with the tag name "input"
                         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(
-                            'name' => 'input',
-                            'type' => HTML5::STARTTAG,
-                            'attr' => $attr
-                        ));
+						$this->inBody(array(
+							'name' => 'input',
+							'type' => HTML5::STARTTAG,
+							'attr' => $attr
+						));
 
-                        /* Act as if a stream of character tokens had been seen
+						/* 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. '.
-                        'Insert your search keywords here: ');
+						$this->insertText('This is a searchable index. '.
+						'Insert your search keywords here: ');
 
-                        /* Act as if an end tag token with the tag name "label"
+						/* Act as if an end tag token with the tag name "label"
                         had been seen. */
-                        $this->inBody(array(
-                            'name' => 'label',
-                            'type' => HTML5::ENDTAG
-                        ));
+						$this->inBody(array(
+							'name' => 'label',
+							'type' => HTML5::ENDTAG
+						));
 
-                        /* Act as if an end tag token with the tag name "p" had
+						/* Act as if an end tag token with the tag name "p" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'p',
-                            'type' => HTML5::ENDTAG
-                        ));
+						$this->inBody(array(
+							'name' => 'p',
+							'type' => HTML5::ENDTAG
+						));
 
-                        /* Act as if a start tag token with the tag name "hr" had
+						/* Act as if a start tag token with the tag name "hr" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'hr',
-                            'type' => HTML5::ENDTAG
-                        ));
+						$this->inBody(array(
+							'name' => 'hr',
+							'type' => HTML5::ENDTAG
+						));
 
-                        /* Act as if an end tag token with the tag name "form" had
+						/* Act as if an end tag token with the tag name "form" had
                         been seen. */
-                        $this->inBody(array(
-                            'name' => 'form',
-                            'type' => HTML5::ENDTAG
-                        ));
-                    }
-                break;
-
-                /* A start tag whose tag name is "textarea" */
-                case 'textarea':
-                    $this->insertElement($token);
-
-                    /* Switch the tokeniser's content model flag to the
+						$this->inBody(array(
+							'name' => 'form',
+							'type' => HTML5::ENDTAG
+						));
+					}
+				break;
+
+				/* A start tag whose tag name is "textarea" */
+				case 'textarea':
+					$this->insertElement($token);
+
+					/* Switch the tokeniser's content model flag to the
                     RCDATA state. */
-                    return HTML5::RCDATA;
-                break;
+					return HTML5::RCDATA;
+				break;
 
-                /* A start tag whose tag name is one of: "iframe", "noembed",
+				/* A start tag whose tag name is one of: "iframe", "noembed",
                 "noframes" */
-                case 'iframe': case 'noembed': case 'noframes':
-                    $this->insertElement($token);
+				case 'iframe': case 'noembed': case 'noframes':
+					$this->insertElement($token);
 
-                    /* Switch the tokeniser's content model flag to the CDATA state. */
-                    return HTML5::CDATA;
-                break;
+					/* Switch the tokeniser's content model flag to the CDATA state. */
+					return HTML5::CDATA;
+				break;
 
-                /* A start tag whose tag name is "select" */
-                case 'select':
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
+				/* A start tag whose tag name is "select" */
+				case 'select':
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
 
-                    /* Insert an HTML element for the token. */
-                    $this->insertElement($token);
+					/* Insert an HTML element for the token. */
+					$this->insertElement($token);
 
-                    /* Change the insertion mode to "in select". */
-                    $this->mode = self::IN_SELECT;
-                break;
+					/* Change the insertion mode to "in select". */
+					$this->mode = self::IN_SELECT;
+				break;
 
-                /* A start or end tag whose tag name is one of: "caption", "col",
+				/* A start or end tag whose tag name is one of: "caption", "col",
                 "colgroup", "frame", "frameset", "head", "option", "optgroup",
                 "tbody", "td", "tfoot", "th", "thead", "tr". */
-                case 'caption': case 'col': case 'colgroup': case 'frame':
-                case 'frameset': case 'head': case 'option': case 'optgroup':
-                case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead':
-                case 'tr':
-                    // Parse error. Ignore the token.
-                break;
-
-                /* A start or end tag whose tag name is one of: "event-source",
+				case 'caption': case 'col': case 'colgroup': case 'frame':
+				case 'frameset': case 'head': case 'option': case 'optgroup':
+				case 'tbody': case 'td': case 'tfoot': case 'th': case 'thead':
+				case 'tr':
+					// Parse error. Ignore the token.
+				break;
+
+				/* A start or end tag whose tag name is one of: "event-source",
                 "section", "nav", "article", "aside", "header", "footer",
                 "datagrid", "command" */
-                case 'event-source': case 'section': case 'nav': case 'article':
-                case 'aside': case 'header': case 'footer': case 'datagrid':
-                case 'command':
-                    // Work in progress!
-                break;
-
-                /* A start tag token not covered by the previous entries */
-                default:
-                    /* Reconstruct the active formatting elements, if any. */
-                    $this->reconstructActiveFormattingElements();
-
-                    $this->insertElement($token, true, true);
-                break;
-            }
-            break;
-
-            case HTML5::ENDTAG:
-            switch($token['name']) {
-                /* An end tag with the tag name "body" */
-                case 'body':
-                    /* If the second element in the stack of open elements is
+				case 'event-source': case 'section': case 'nav': case 'article':
+				case 'aside': case 'header': case 'footer': case 'datagrid':
+				case 'command':
+					// Work in progress!
+				break;
+
+				/* A start tag token not covered by the previous entries */
+				default:
+					/* Reconstruct the active formatting elements, if any. */
+					$this->reconstructActiveFormattingElements();
+
+					$this->insertElement($token, true, true);
+				break;
+			}
+			break;
+
+			case HTML5::ENDTAG:
+			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') {
-                        // Ignore.
+					if(count($this->stack) < 2 || $this->stack[1]->nodeName !== 'body') {
+						// Ignore.
 
-                    /* If the current node is not the body element, then this
+					/* If the current node is not the body element, then this
                     is a parse error. */
-                    } elseif(end($this->stack)->nodeName !== 'body') {
-                        // Parse error.
-                    }
+					} elseif(end($this->stack)->nodeName !== 'body') {
+						// Parse error.
+					}
 
-                    /* Change the insertion mode to "after body". */
-                    $this->mode = self::AFTER_BODY;
-                break;
+					/* Change the insertion mode to "after body". */
+					$this->mode = self::AFTER_BODY;
+				break;
 
-                /* An end tag with the tag name "html" */
-                case 'html':
-                    /* Act as if an end tag with tag name "body" had been seen,
+				/* An end tag with the tag name "html" */
+				case 'html':
+					/* Act as if an end tag with tag name "body" had been seen,
                     then, if that token wasn't ignored, reprocess the current
                     token. */
-                    $this->inBody(array(
-                        'name' => 'body',
-                        'type' => HTML5::ENDTAG
-                    ));
+					$this->inBody(array(
+						'name' => 'body',
+						'type' => HTML5::ENDTAG
+					));
 
-                    return $this->afterBody($token);
-                break;
+					return $this->afterBody($token);
+				break;
 
-                /* An end tag whose tag name is one of: "address", "blockquote",
+				/* An end tag whose tag name is one of: "address", "blockquote",
                 "center", "dir", "div", "dl", "fieldset", "listing", "menu",
                 "ol", "pre", "ul" */
-                case 'address': case 'blockquote': case 'center': case 'dir':
-                case 'div': case 'dl': case 'fieldset': case 'listing':
-                case 'menu': case 'ol': case 'pre': case 'ul':
-                    /* If the stack of open elements has an element in scope
+				case 'address': case 'blockquote': case 'center': case 'dir':
+				case 'div': case 'dl': case 'fieldset': case 'listing':
+				case 'menu': case 'ol': case 'pre': case 'ul':
+					/* 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'])) {
-                        $this->generateImpliedEndTags();
+					if($this->elementInScope($token['name'])) {
+						$this->generateImpliedEndTags();
 
-                        /* Now, if the current node is not an element with
+						/* 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. */
-                        // w/e
+						// w/e
 
-                        /* If the stack of open elements has an element in
+						/* If the stack of open elements has an element in
                         scope with the same tag name as that of the token,
                         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']) {
-                                $n = -1;
-                            }
-
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is "form" */
-                case 'form':
-                    /* If the stack of open elements has an element in scope
+						for($n = count($this->stack) - 1; $n >= 0; $n--) {
+							if($this->stack[$n]->nodeName === $token['name']) {
+								$n = -1;
+							}
+
+							array_pop($this->stack);
+						}
+					}
+				break;
+
+				/* An end tag whose tag name is "form" */
+				case 'form':
+					/* 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'])) {
-                        $this->generateImpliedEndTags();
+					if($this->elementInScope($token['name'])) {
+						$this->generateImpliedEndTags();
 
-                    } 
+					} 
 
-                    if(end($this->stack)->nodeName !== $token['name']) {
-                        /* Now, if the current node is not an element with the
+					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. */
-                        // w/e
+						// w/e
 
-                    } else {
-                        /* Otherwise, if the current node is an element with
+					} else {
+						/* Otherwise, if the current node is an element with
                         the same tag name as that of the token pop that element
                         from the stack. */
-                        array_pop($this->stack);
-                    }
+						array_pop($this->stack);
+					}
 
-                    /* In any case, set the form element pointer to null. */
-                    $this->form_pointer = null;
-                break;
+					/* In any case, set the form element pointer to null. */
+					$this->form_pointer = null;
+				break;
 
-                /* An end tag whose tag name is "p" */
-                case 'p':
-                    /* If the stack of open elements has a p element in scope,
+				/* An end tag whose tag name is "p" */
+				case 'p':
+					/* If the stack of open elements has a p element in scope,
                     then generate implied end tags, except for p elements. */
-                    if($this->elementInScope('p')) {
-                        $this->generateImpliedEndTags(array('p'));
+					if($this->elementInScope('p')) {
+						$this->generateImpliedEndTags(array('p'));
 
-                        /* If the current node is not a p element, then this is
+						/* If the current node is not a p element, then this is
                         a parse error. */
-                        // k
+						// k
 
-                        /* If the stack of open elements has a p element in
+						/* If the stack of open elements has a p element in
                         scope, then pop elements from this stack until the stack
                         no longer has a p element in scope. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->elementInScope('p')) {
-                                array_pop($this->stack);
-
-                            } else {
-                                break;
-                            }
-                        }
-                    }
-                break;
-
-                /* An end tag whose tag name is "dd", "dt", or "li" */
-                case 'dd': case 'dt': case 'li':
-                    /* If the stack of open elements has an element in scope
+						for($n = count($this->stack) - 1; $n >= 0; $n--) {
+							if($this->elementInScope('p')) {
+								array_pop($this->stack);
+
+							} else {
+								break;
+							}
+						}
+					}
+				break;
+
+				/* An end tag whose tag name is "dd", "dt", or "li" */
+				case 'dd': case 'dt': case 'li':
+					/* If the stack of open elements has an element in scope
                     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
+						/* If the current node is not an element with the same
                         tag name as the token, then this is a parse error. */
-                        // w/e
+						// w/e
 
-                        /* If the stack of open elements has an element in scope
+						/* If the stack of open elements has an element in scope
                         whose tag name matches the tag name of the token, 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']) {
-                                $n = -1;
-                            }
+						for($n = count($this->stack) - 1; $n >= 0; $n--) {
+							if($this->stack[$n]->nodeName === $token['name']) {
+								$n = -1;
+							}
 
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
+							array_pop($this->stack);
+						}
+					}
+				break;
 
-                /* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
+				/* An end tag whose tag name is one of: "h1", "h2", "h3", "h4",
                 "h5", "h6" */
-                case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
-                    $elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
+				case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
+					$elements = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
 
-                    /* If the stack of open elements has in scope an element whose
+					/* If the stack of open elements has in scope an element whose
                     tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
                     generate implied end tags. */
-                    if($this->elementInScope($elements)) {
-                        $this->generateImpliedEndTags();
+					if($this->elementInScope($elements)) {
+						$this->generateImpliedEndTags();
 
-                        /* Now, if the current node is not an element with the same
+						/* 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. */
-                        // w/e
+						// w/e
 
-                        /* If the stack of open elements has in scope an element
+						/* If the stack of open elements has in scope an element
                         whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
                         "h6", then pop elements from the stack until an element
                         with one of those tag names has been popped from the stack. */
-                        while($this->elementInScope($elements)) {
-                            array_pop($this->stack);
-                        }
-                    }
-                break;
+						while($this->elementInScope($elements)) {
+							array_pop($this->stack);
+						}
+					}
+				break;
 
-                /* An end tag whose tag name is one of: "a", "b", "big", "em",
+				/* An end tag whose tag name is one of: "a", "b", "big", "em",
                 "font", "i", "nobr", "s", "small", "strike", "strong", "tt", "u" */
-                case 'a': case 'b': case 'big': case 'em': case 'font':
-                case 'i': case 'nobr': case 's': case 'small': case 'strike':
-                case 'strong': case 'tt': case 'u':
-                    /* 1. Let the formatting element be the last element in
+				case 'a': case 'b': case 'big': case 'em': case 'font':
+				case 'i': case 'nobr': case 's': case 'small': case 'strike':
+				case 'strong': case 'tt': case 'u':
+					/* 1. Let the formatting element be the last element in
                     the list of active formatting elements that:
                         * is between the end of the list and the last scope
                         marker in the list, if any, or the start of the list
                         otherwise, and
                         * has the same tag name as the token.
                     */
-                    while(true) {
-                        for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
-                            if($this->a_formatting[$a] === self::MARKER) {
-                                break;
-
-                            } 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;
-                            }
-                        }
-
-                        /* If there is no such node, or, if that node is
+					while(true) {
+						for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
+							if($this->a_formatting[$a] === self::MARKER) {
+								break;
+
+							} 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;
+							}
+						}
+
+						/* If there is no such node, or, if that node is
                         also in the stack of open elements but the element
                         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']))) {
-                            break;
+						if(!isset($formatting_element) || ($in_stack &&
+						!$this->elementInScope($token['name']))) {
+							break;
 
-                        /* Otherwise, if there is such a node, but that node
+						/* Otherwise, if there is such a node, but that node
                         is not in the stack of open elements, then this is a
                         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]);
-                            $this->a_formatting = array_merge($this->a_formatting);
-                            break;
-                        }
+						} elseif(isset($formatting_element) && !$in_stack) {
+							unset($this->a_formatting[$fe_af_pos]);
+							$this->a_formatting = array_merge($this->a_formatting);
+							break;
+						}
 
-                        /* 2. Let the furthest block be the topmost node in the
+						/* 2. Let the furthest block be the topmost node in the
                         stack of open elements that is lower in the stack
                         than the formatting element, and is not an element in
                         the phrasing or formatting categories. There might
                         not be one. */
-                        $fe_s_pos = array_search($formatting_element, $this->stack, true);
-                        $length = count($this->stack);
+						$fe_s_pos = array_search($formatting_element, $this->stack, true);
+						$length = count($this->stack);
 
-                        for($s = $fe_s_pos + 1; $s < $length; $s++) {
-                            $category = $this->getElementCategory($this->stack[$s]->nodeName);
+						for($s = $fe_s_pos + 1; $s < $length; $s++) {
+							$category = $this->getElementCategory($this->stack[$s]->nodeName);
 
-                            if($category !== self::PHRASING && $category !== self::FORMATTING) {
-                                $furthest_block = $this->stack[$s];
-                            }
-                        }
+							if($category !== self::PHRASING && $category !== self::FORMATTING) {
+								$furthest_block = $this->stack[$s];
+							}
+						}
 
-                        /* 3. If there is no furthest block, then the UA must
+						/* 3. If there is no furthest block, then the UA must
                         skip the subsequent steps and instead just pop all
                         the nodes from the bottom of the stack of open
                         elements, from the current node up to the formatting
                         element, and remove the formatting element from the
                         list of active formatting elements. */
-                        if(!isset($furthest_block)) {
-                            for($n = $length - 1; $n >= $fe_s_pos; $n--) {
-                                array_pop($this->stack);
-                            }
+						if(!isset($furthest_block)) {
+							for($n = $length - 1; $n >= $fe_s_pos; $n--) {
+								array_pop($this->stack);
+							}
 
-                            unset($this->a_formatting[$fe_af_pos]);
-                            $this->a_formatting = array_merge($this->a_formatting);
-                            break;
-                        }
+							unset($this->a_formatting[$fe_af_pos]);
+							$this->a_formatting = array_merge($this->a_formatting);
+							break;
+						}
 
-                        /* 4. Let the common ancestor be the element
+						/* 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
+						/* 5. If the furthest block has a parent node, then
                         remove the furthest block from its parent node. */
-                        if($furthest_block->parentNode !== null) {
-                            $furthest_block->parentNode->removeChild($furthest_block);
-                        }
+						if($furthest_block->parentNode !== null) {
+							$furthest_block->parentNode->removeChild($furthest_block);
+						}
 
-                        /* 6. Let a bookmark note the position of the
+						/* 6. Let a bookmark note the position of the
                         formatting element in the list of active formatting
                         elements relative to the elements on either side
                         of it in the list. */
-                        $bookmark = $fe_af_pos;
+						$bookmark = $fe_af_pos;
 
-                        /* 7. Let node and last node  be the furthest block.
+						/* 7. Let node and last node  be the furthest block.
                         Follow these steps: */
-                        $node = $furthest_block;
-                        $last_node = $furthest_block;
+						$node = $furthest_block;
+						$last_node = $furthest_block;
 
-                        while(true) {
-                            for($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
-                                /* 7.1 Let node be the element immediately
+						while(true) {
+							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
+								/* 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]);
-                                    $this->stack = array_merge($this->stack);
+								if(!in_array($node, $this->a_formatting, true)) {
+									unset($this->stack[$n]);
+									$this->stack = array_merge($this->stack);
 
-                                } else {
-                                    break;
-                                }
-                            }
+								} else {
+									break;
+								}
+							}
 
-                            /* 7.3 Otherwise, if node is the formatting
+							/* 7.3 Otherwise, if node is the formatting
                             element, then go to the next step in the overall
                             algorithm. */
-                            if($node === $formatting_element) {
-                                break;
+							if($node === $formatting_element) {
+								break;
 
-                            /* 7.4 Otherwise, if last node is the furthest
+							/* 7.4 Otherwise, if last node is the furthest
                             block, then move the aforementioned bookmark to
                             be immediately after the node in the list of
                             active formatting elements. */
-                            } elseif($last_node === $furthest_block) {
-                                $bookmark = array_search($node, $this->a_formatting, true) + 1;
-                            }
+							} elseif($last_node === $furthest_block) {
+								$bookmark = array_search($node, $this->a_formatting, true) + 1;
+							}
 
-                            /* 7.5 If node has any children, perform a
+							/* 7.5 If node has any children, perform a
                             shallow clone of node, replace the entry for
                             node in the list of active formatting elements
                             with an entry for the clone, replace the entry
                             for node in the stack of open elements with an
                             entry for the clone, and let node be the clone. */
-                            if($node->hasChildNodes()) {
-                                $clone = $node->cloneNode();
-                                $s_pos = array_search($node, $this->stack, true);
-                                $a_pos = array_search($node, $this->a_formatting, true);
+							if($node->hasChildNodes()) {
+								$clone = $node->cloneNode();
+								$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;
-                                $node = $clone;
-                            }
+								$this->stack[$s_pos] = $clone;
+								$this->a_formatting[$a_pos] = $clone;
+								$node = $clone;
+							}
 
-                            /* 7.6 Insert last node into node, first removing
+							/* 7.6 Insert last node into node, first removing
                             it from its previous parent node if any. */
-                            if($last_node->parentNode !== null) {
-                                $last_node->parentNode->removeChild($last_node);
-                            }
+							if($last_node->parentNode !== null) {
+								$last_node->parentNode->removeChild($last_node);
+							}
 
-                            $node->appendChild($last_node);
+							$node->appendChild($last_node);
 
-                            /* 7.7 Let last node be node. */
-                            $last_node = $node;
-                        }
+							/* 7.7 Let last node be node. */
+							$last_node = $node;
+						}
 
-                        /* 8. Insert whatever last node ended up being in
+						/* 8. Insert whatever last node ended up being in
                         the previous step into the common ancestor node,
                         first removing it from its previous parent node if
                         any. */
-                        if($last_node->parentNode !== null) {
-                            $last_node->parentNode->removeChild($last_node);
-                        }
+						if($last_node->parentNode !== null) {
+							$last_node->parentNode->removeChild($last_node);
+						}
 
-                        $common_ancestor->appendChild($last_node);
+						$common_ancestor->appendChild($last_node);
 
-                        /* 9. Perform a shallow clone of the formatting
+						/* 9. Perform a shallow clone of the formatting
                         element. */
-                        $clone = $formatting_element->cloneNode();
+						$clone = $formatting_element->cloneNode();
 
-                        /* 10. Take all of the child nodes of the furthest
+						/* 10. Take all of the child nodes of the furthest
                         block and append them to the clone created in the
                         last step. */
-                        while($furthest_block->hasChildNodes()) {
-                            $child = $furthest_block->firstChild;
-                            $furthest_block->removeChild($child);
-                            $clone->appendChild($child);
-                        }
+						while($furthest_block->hasChildNodes()) {
+							$child = $furthest_block->firstChild;
+							$furthest_block->removeChild($child);
+							$clone->appendChild($child);
+						}
 
-                        /* 11. Append that clone to the furthest block. */
-                        $furthest_block->appendChild($clone);
+						/* 11. Append that clone to the furthest block. */
+						$furthest_block->appendChild($clone);
 
-                        /* 12. Remove the formatting element from the list
+						/* 12. Remove the formatting element from the list
                         of active formatting elements, and insert the clone
                         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]);
-                        $this->a_formatting = array_merge($this->a_formatting);
+						$fe_af_pos = array_search($formatting_element, $this->a_formatting, true);
+						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);
-                        $af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
-                        $this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
+						$af_part1 = array_slice($this->a_formatting, 0, $bookmark - 1);
+						$af_part2 = array_slice($this->a_formatting, $bookmark, count($this->a_formatting));
+						$this->a_formatting = array_merge($af_part1, array($clone), $af_part2);
 
-                        /* 13. Remove the formatting element from the stack
+						/* 13. Remove the formatting element from the stack
                         of open elements, and insert the clone into the stack
                         of open elements immediately after (i.e. in a more
                         deeply nested position than) the position of the
                         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]);
+						$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]);
 
-                        $s_part1 = array_slice($this->stack, 0, $fb_s_pos);
-                        $s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
-                        $this->stack = array_merge($s_part1, array($clone), $s_part2);
+						$s_part1 = array_slice($this->stack, 0, $fb_s_pos);
+						$s_part2 = array_slice($this->stack, $fb_s_pos + 1, count($this->stack));
+						$this->stack = array_merge($s_part1, array($clone), $s_part2);
 
-                        /* 14. Jump back to step 1 in this series of steps. */
-                        unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
-                    }
-                break;
+						/* 14. Jump back to step 1 in this series of steps. */
+						unset($formatting_element, $fe_af_pos, $fe_s_pos, $furthest_block);
+					}
+				break;
 
-                /* An end tag token whose tag name is one of: "button",
+				/* An end tag token whose tag name is one of: "button",
                 "marquee", "object" */
-                case 'button': case 'marquee': case 'object':
-                    /* If the stack of open elements has an element in scope whose
+				case 'button': case 'marquee': case 'object':
+					/* 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'])) {
-                        $this->generateImpliedEndTags();
+					if($this->elementInScope($token['name'])) {
+						$this->generateImpliedEndTags();
 
-                        /* Now, if the current node is not an element with the same
+						/* Now, if the current node is not an element with the same
                         tag name as the token, then this is a parse error. */
-                        // k
+						// k
 
-                        /* Now, if the stack of open elements has an element in scope
+						/* Now, if the stack of open elements has an element in scope
                         whose tag name matches the tag name of the token, then pop
                         elements from the stack until that element has been popped from
                         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']) {
-                                $n = -1;
-                            }
+						for($n = count($this->stack) - 1; $n >= 0; $n--) {
+							if($this->stack[$n]->nodeName === $token['name']) {
+								$n = -1;
+							}
 
-                            array_pop($this->stack);
-                        }
+							array_pop($this->stack);
+						}
 
-                        $marker = end(array_keys($this->a_formatting, self::MARKER, true));
+						$marker = end(array_keys($this->a_formatting, self::MARKER, true));
 
-                        for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
-                            array_pop($this->a_formatting);
-                        }
-                    }
-                break;
+						for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
+							array_pop($this->a_formatting);
+						}
+					}
+				break;
 
-                /* Or an end tag whose tag name is one of: "area", "basefont",
+				/* Or an end tag whose tag name is one of: "area", "basefont",
                 "bgsound", "br", "embed", "hr", "iframe", "image", "img",
                 "input", "isindex", "noembed", "noframes", "param", "select",
                 "spacer", "table", "textarea", "wbr" */
-                case 'area': case 'basefont': case 'bgsound': case 'br':
-                case 'embed': case 'hr': case 'iframe': case 'image':
-                case 'img': case 'input': case 'isindex': case 'noembed':
-                case 'noframes': case 'param': case 'select': case 'spacer':
-                case 'table': case 'textarea': case 'wbr':
-                    // Parse error. Ignore the token.
-                break;
-
-                /* An end tag token not covered by the previous entries */
-                default:
-                    for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                        /* Initialise node to be the current node (the bottommost
+				case 'area': case 'basefont': case 'bgsound': case 'br':
+				case 'embed': case 'hr': case 'iframe': case 'image':
+				case 'img': case 'input': case 'isindex': case 'noembed':
+				case 'noframes': case 'param': case 'select': case 'spacer':
+				case 'table': case 'textarea': case 'wbr':
+					// Parse error. Ignore the token.
+				break;
+
+				/* An end tag token not covered by the previous entries */
+				default:
+					for($n = count($this->stack) - 1; $n >= 0; $n--) {
+						/* Initialise node to be the current node (the bottommost
                         node of the stack). */
-                        $node = end($this->stack);
+						$node = end($this->stack);
 
-                        /* If node has the same tag name as the end tag token,
+						/* If node has the same tag name as the end tag token,
                         then: */
-                        if($token['name'] === $node->nodeName) {
-                            /* Generate implied end tags. */
-                            $this->generateImpliedEndTags();
+						if($token['name'] === $node->nodeName) {
+							/* Generate implied end tags. */
+							$this->generateImpliedEndTags();
 
-                            /* If the tag name of the end tag token does not
+							/* If the tag name of the end tag token does not
                             match the tag name of the current node, this is a
                             parse error. */
-                            // k
+							// k
 
-                            /* Pop all the nodes from the current node up to
+							/* Pop all the nodes from the current node up to
                             node, including node, then stop this algorithm. */
-                            for($x = count($this->stack) - $n; $x >= $n; $x--) {
-                                array_pop($this->stack);
-                            }
+							for($x = count($this->stack) - $n; $x >= $n; $x--) {
+								array_pop($this->stack);
+							}
                                     
-                        } else {
-                            $category = $this->getElementCategory($node);
+						} else {
+							$category = $this->getElementCategory($node);
 
-                            if($category !== self::SPECIAL && $category !== self::SCOPING) {
-                                /* Otherwise, if node is in neither the formatting
+							if($category !== self::SPECIAL && $category !== self::SCOPING) {
+								/* Otherwise, if node is in neither the formatting
                                 category nor the phrasing category, then this is a
                                 parse error. Stop this algorithm. The end tag token
                                 is ignored. */
-                                return false;
-                            }
-                        }
-                    }
-                break;
-            }
-            break;
-        }
-    }
-
-    private function inTable($token) {
-        $clear = array('html', 'table');
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+								return false;
+							}
+						}
+					}
+				break;
+			}
+			break;
+		}
+	}
+
+	private function inTable($token) {
+		$clear = array('html', 'table');
+
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the 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']);
+			end($this->stack)->appendChild($text);
+
+		/* A comment token */
+		} 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']);
-            end($this->stack)->appendChild($comment);
+			$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') {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
+		/* A start tag whose tag name is "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
+			/* 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
+			/* Insert an HTML element for the token, then switch the
             insertion mode to "in caption". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CAPTION;
+			$this->insertElement($token);
+			$this->mode = self::IN_CAPTION;
 
-        /* A start tag whose tag name is "colgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'colgroup') {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
+		/* A start tag whose tag name is "colgroup" */
+		} elseif($token['type'] === HTML5::STARTTAG &&
+		$token['name'] === 'colgroup') {
+			/* Clear the stack back to a table context. */
+			$this->clearStackToTableContext($clear);
 
-            /* Insert an HTML element for the token, then switch the
+			/* Insert an HTML element for the token, then switch the
             insertion mode to "in column group". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CGROUP;
-
-        /* A start tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'col') {
-            $this->inTable(array(
-                'name' => 'colgroup',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            $this->inColumnGroup($token);
-
-        /* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
-        array('tbody', 'tfoot', 'thead'))) {
-            /* Clear the stack back to a table context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
+			$this->insertElement($token);
+			$this->mode = self::IN_CGROUP;
+
+		/* A start tag whose tag name is "col" */
+		} elseif($token['type'] === HTML5::STARTTAG &&
+		$token['name'] === 'col') {
+			$this->inTable(array(
+				'name' => 'colgroup',
+				'type' => HTML5::STARTTAG,
+				'attr' => array()
+			));
+
+			$this->inColumnGroup($token);
+
+		/* A start tag whose tag name is one of: "tbody", "tfoot", "thead" */
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('tbody', 'tfoot', 'thead'))) {
+			/* Clear the stack back to a table context. */
+			$this->clearStackToTableContext($clear);
+
+			/* Insert an HTML element for the token, then switch the insertion
             mode to "in table body". */
-            $this->insertElement($token);
-            $this->mode = self::IN_TBODY;
+			$this->insertElement($token);
+			$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'))) {
-            /* Act as if a start tag token with the tag name "tbody" had been
+		/* 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'))) {
+			/* Act as if a start tag token with the tag name "tbody" had been
             seen, then reprocess the current token. */
-            $this->inTable(array(
-                'name' => 'tbody',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            return $this->inTableBody($token);
-
-        /* A start tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'table') {
-            /* Parse error. Act as if an end tag token with the tag name "table"
+			$this->inTable(array(
+				'name' => 'tbody',
+				'type' => HTML5::STARTTAG,
+				'attr' => array()
+			));
+
+			return $this->inTableBody($token);
+
+		/* A start tag whose tag name is "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
             current token. */
-            $this->inTable(array(
-                'name' => 'table',
-                'type' => HTML5::ENDTAG
-            ));
+			$this->inTable(array(
+				'name' => 'table',
+				'type' => HTML5::ENDTAG
+			));
 
-            return $this->mainPhase($token);
+			return $this->mainPhase($token);
 
-        /* An end tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'table') {
-            /* If the stack of open elements does not have an element in table
+		/* An end tag whose tag name is "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)) {
-                return false;
+			if(!$this->elementInScope($token['name'], true)) {
+				return false;
 
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
+			/* Otherwise: */
+			} else {
+				/* Generate implied end tags. */
+				$this->generateImpliedEndTags();
 
-                /* Now, if the current node is not a table element, then this
+				/* Now, if the current node is not a table element, then this
                 is a parse error. */
-                // w/e
+				// w/e
 
-                /* Pop elements from this stack until a table element has been
+				/* Pop elements from this stack until a table element has been
                 popped from the stack. */
-                while(true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
+				while(true) {
+					$current = end($this->stack)->nodeName;
+					array_pop($this->stack);
 
-                    if($current === 'table') {
-                        break;
-                    }
-                }
+					if($current === 'table') {
+						break;
+					}
+				}
 
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
+				/* Reset the insertion mode appropriately. */
+				$this->resetInsertionMode();
+			}
 
-        /* An end tag whose tag name is one of: "body", "caption", "col",
+		/* 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'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td',
-        'tfoot', 'th', 'thead', 'tr'))) {
-            // Parse error. Ignore the token.
-
-        /* Anything else */
-        } else {
-            /* Parse error. Process the token as if the insertion mode was "in
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('body', 'caption', 'col', 'colgroup', 'html', 'tbody', 'td',
+		'tfoot', 'th', 'thead', 'tr'))) {
+			// Parse error. Ignore the token.
+
+		/* Anything else */
+		} else {
+			/* Parse error. Process the token as if the insertion mode was "in
             body", with the following exception: */
 
-            /* If the current node is a table, tbody, tfoot, thead, or tr
+			/* If the current node is a table, tbody, tfoot, thead, or tr
             element, then, whenever a node would be inserted into the current
             node, it must instead be inserted into the foster parent element. */
-            if(in_array(end($this->stack)->nodeName,
-            array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
-                /* The foster parent element is the parent element of the last
+			if(in_array(end($this->stack)->nodeName,
+			array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
+				/* The foster parent element is the parent element of the last
                 table element in the stack of open elements, if there is a
                 table element and it has such a parent element. If there is no
                 table element in the stack of open elements (innerHTML case),
@@ -2781,1124 +2781,1124 @@ 
                 its parent node is not an element, then the foster parent
                 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];
-                        break;
-                    }
-                }
-
-                if(isset($table) && $table->parentNode !== null) {
-                    $this->foster_parent = $table->parentNode;
-
-                } elseif(!isset($table)) {
-                    $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->inBody($token);
-        }
-    }
-
-    private function inCaption($token) {
-        /* An end tag whose tag name is "caption" */
-        if($token['type'] === HTML5::ENDTAG && $token['name'] === 'caption') {
-            /* If the stack of open elements does not have an element in table
+				for($n = count($this->stack) - 1; $n >= 0; $n--) {
+					if($this->stack[$n]->nodeName === 'table') {
+						$table = $this->stack[$n];
+						break;
+					}
+				}
+
+				if(isset($table) && $table->parentNode !== null) {
+					$this->foster_parent = $table->parentNode;
+
+				} elseif(!isset($table)) {
+					$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->inBody($token);
+		}
+	}
+
+	private function inCaption($token) {
+		/* An end tag whose tag name is "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)) {
-                // Ignore
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore
 
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags. */
-                $this->generateImpliedEndTags();
+			/* Otherwise: */
+			} else {
+				/* Generate implied end tags. */
+				$this->generateImpliedEndTags();
 
-                /* Now, if the current node is not a caption element, then this
+				/* Now, if the current node is not a caption element, then this
                 is a parse error. */
-                // w/e
+				// w/e
 
-                /* Pop elements from this stack until a caption element has
+				/* Pop elements from this stack until a caption element has
                 been popped from the stack. */
-                while(true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
+				while(true) {
+					$node = end($this->stack)->nodeName;
+					array_pop($this->stack);
 
-                    if($node === 'caption') {
-                        break;
-                    }
-                }
+					if($node === 'caption') {
+						break;
+					}
+				}
 
-                /* Clear the list of active formatting elements up to the last
+				/* Clear the list of active formatting elements up to the last
                 marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+				$this->clearTheActiveFormattingElementsUpToTheLastMarker();
 
-                /* Switch the insertion mode to "in table". */
-                $this->mode = self::IN_TABLE;
-            }
+				/* Switch the insertion mode to "in table". */
+				$this->mode = self::IN_TABLE;
+			}
 
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+		/* 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'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) || ($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'table')) {
-            /* Parse error. Act as if an end tag with the tag name "caption"
+		} elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+		'thead', 'tr'))) || ($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
             current token. */
-            $this->inCaption(array(
-                'name' => 'caption',
-                'type' => HTML5::ENDTAG
-            ));
+			$this->inCaption(array(
+				'name' => 'caption',
+				'type' => HTML5::ENDTAG
+			));
 
-            return $this->inTable($token);
+			return $this->inTable($token);
 
-        /* An end tag whose tag name is one of: "body", "col", "colgroup",
+		/* 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'],
-        array('body', 'col', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            // Parse error. Ignore the token.
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inColumnGroup($token) {
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('body', 'col', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
+		'thead', 'tr'))) {
+			// Parse error. Ignore the token.
+
+		/* Anything else */
+		} else {
+			/* Process the token as if the insertion mode was "in body". */
+			$this->inBody($token);
+		}
+	}
+
+	private function inColumnGroup($token) {
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $text = $this->dom->createTextNode($token['data']);
-            end($this->stack)->appendChild($text);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the 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']);
+			end($this->stack)->appendChild($text);
+
+		/* A comment token */
+		} 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']);
-            end($this->stack)->appendChild($comment);
+			$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') {
-            /* Insert a col element for the token. Immediately pop the current
+		/* A start tag whose tag name is "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);
+			$this->insertElement($token);
+			array_pop($this->stack);
 
-        /* An end tag whose tag name is "colgroup" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'colgroup') {
-            /* If the current node is the root html element, then this is a
+		/* An end tag whose tag name is "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) */
-            if(end($this->stack)->nodeName === 'html') {
-                // Ignore
+			if(end($this->stack)->nodeName === 'html') {
+				// Ignore
 
-            /* Otherwise, pop the current node (which will be a colgroup
+			/* Otherwise, pop the current node (which will be a colgroup
             element) from the stack of open elements. Switch the insertion
             mode to "in table". */
-            } else {
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
-
-        /* An end tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Act as if an end tag with the tag name "colgroup" had been seen,
+			} else {
+				array_pop($this->stack);
+				$this->mode = self::IN_TABLE;
+			}
+
+		/* An end tag whose tag name is "col" */
+		} elseif($token['type'] === HTML5::ENDTAG && $token['name'] === 'col') {
+			/* Parse error. Ignore the token. */
+
+		/* Anything else */
+		} else {
+			/* Act as if an end tag with the tag name "colgroup" had been seen,
             and then, if that token wasn't ignored, reprocess the current token. */
-            $this->inColumnGroup(array(
-                'name' => 'colgroup',
-                'type' => HTML5::ENDTAG
-            ));
+			$this->inColumnGroup(array(
+				'name' => 'colgroup',
+				'type' => HTML5::ENDTAG
+			));
 
-            return $this->inTable($token);
-        }
-    }
+			return $this->inTable($token);
+		}
+	}
 
-    private function inTableBody($token) {
-        $clear = array('tbody', 'tfoot', 'thead', 'html');
+	private function inTableBody($token) {
+		$clear = array('tbody', 'tfoot', 'thead', 'html');
 
-        /* A start tag whose tag name is "tr" */
-        if($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
-            /* Clear the stack back to a table body context. */
-            $this->clearStackToTableContext($clear);
+		/* A start tag whose tag name is "tr" */
+		if($token['type'] === HTML5::STARTTAG && $token['name'] === 'tr') {
+			/* Clear the stack back to a table body context. */
+			$this->clearStackToTableContext($clear);
 
-            /* Insert a tr element for the token, then switch the insertion
+			/* Insert a tr element for the token, then switch the insertion
             mode to "in row". */
-            $this->insertElement($token);
-            $this->mode = self::IN_ROW;
+			$this->insertElement($token);
+			$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')) {
-            /* Parse error. Act as if a start tag with the tag name "tr" had
+		/* A start tag whose tag name is one of: "th", "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. */
-            $this->inTableBody(array(
-                'name' => 'tr',
-                'type' => HTML5::STARTTAG,
-                'attr' => array()
-            ));
-
-            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'))) {
-            /* If the stack of open elements does not have an element in table
+			$this->inTableBody(array(
+				'name' => 'tr',
+				'type' => HTML5::STARTTAG,
+				'attr' => array()
+			));
+
+			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'))) {
+			/* 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)) {
-                // Ignore
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore
 
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
+			/* Otherwise: */
+			} else {
+				/* Clear the stack back to a table body context. */
+				$this->clearStackToTableContext($clear);
 
-                /* Pop the current node from the stack of open elements. Switch
+				/* Pop the current node from the stack of open elements. Switch
                 the insertion mode to "in table". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TABLE;
-            }
+				array_pop($this->stack);
+				$this->mode = self::IN_TABLE;
+			}
 
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+		/* 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'],
-        array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead'))) ||
-        ($token['type'] === HTML5::STARTTAG && $token['name'] === 'table')) {
-            /* If the stack of open elements does not have a tbody, thead, or
+		} elseif(($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('caption', 'col', 'colgroup', 'tbody', 'tfoor', 'thead'))) ||
+		($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
             token. (innerHTML case) */
-            if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
-                // Ignore.
+			if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
+				// Ignore.
 
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table body context. */
-                $this->clearStackToTableContext($clear);
+			/* Otherwise: */
+			} else {
+				/* Clear the stack back to a table body context. */
+				$this->clearStackToTableContext($clear);
 
-                /* Act as if an end tag with the same tag name as the current
+				/* Act as if an end tag with the same tag name as the current
                 node ("tbody", "tfoot", or "thead") had been seen, then
                 reprocess the current token. */
-                $this->inTableBody(array(
-                    'name' => end($this->stack)->nodeName,
-                    'type' => HTML5::ENDTAG
-                ));
+				$this->inTableBody(array(
+					'name' => end($this->stack)->nodeName,
+					'type' => HTML5::ENDTAG
+				));
 
-                return $this->mainPhase($token);
-            }
+				return $this->mainPhase($token);
+			}
 
-        /* An end tag whose tag name is one of: "body", "caption", "col",
+		/* 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'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    private function inRow($token) {
-        $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')) {
-            /* Clear the stack back to a table row context. */
-            $this->clearStackToTableContext($clear);
-
-            /* Insert an HTML element for the token, then switch the insertion
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
+			/* Parse error. Ignore the token. */
+
+		/* Anything else */
+		} else {
+			/* Process the token as if the insertion mode was "in table". */
+			$this->inTable($token);
+		}
+	}
+
+	private function inRow($token) {
+		$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')) {
+			/* Clear the stack back to a table row context. */
+			$this->clearStackToTableContext($clear);
+
+			/* Insert an HTML element for the token, then switch the insertion
             mode to "in cell". */
-            $this->insertElement($token);
-            $this->mode = self::IN_CELL;
+			$this->insertElement($token);
+			$this->mode = self::IN_CELL;
 
-            /* Insert a marker at the end of the list of active formatting
+			/* 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') {
-            /* If the stack of open elements does not have an element in table
+		/* An end tag whose tag name is "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)) {
-                // Ignore.
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore.
 
-            /* Otherwise: */
-            } else {
-                /* Clear the stack back to a table row context. */
-                $this->clearStackToTableContext($clear);
+			/* Otherwise: */
+			} else {
+				/* Clear the stack back to a table row context. */
+				$this->clearStackToTableContext($clear);
 
-                /* Pop the current node (which will be a tr element) from the
+				/* Pop the current node (which will be a tr element) from the
                 stack of open elements. Switch the insertion mode to "in table
                 body". */
-                array_pop($this->stack);
-                $this->mode = self::IN_TBODY;
-            }
+				array_pop($this->stack);
+				$this->mode = self::IN_TBODY;
+			}
 
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+		/* 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'],
-        array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr'))) {
-            /* Act as if an end tag with the tag name "tr" had been seen, then,
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('caption', 'col', 'colgroup', 'tbody', 'tfoot', 'thead', 'tr'))) {
+			/* Act as if an end tag with the tag name "tr" had been seen, then,
             if that token wasn't ignored, reprocess the current token. */
-            $this->inRow(array(
-                'name' => 'tr',
-                'type' => HTML5::ENDTAG
-            ));
+			$this->inRow(array(
+				'name' => 'tr',
+				'type' => HTML5::ENDTAG
+			));
 
-            return $this->inCell($token);
+			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'))) {
-            /* If the stack of open elements does not have an element in table
+		/* 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'))) {
+			/* 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)) {
-                // Ignore.
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore.
 
-            /* Otherwise: */
-            } else {
-                /* Otherwise, act as if an end tag with the tag name "tr" had
+			/* Otherwise: */
+			} else {
+				/* Otherwise, act as if an end tag with the tag name "tr" had
                 been seen, then reprocess the current token. */
-                $this->inRow(array(
-                    'name' => 'tr',
-                    'type' => HTML5::ENDTAG
-                ));
+				$this->inRow(array(
+					'name' => 'tr',
+					'type' => HTML5::ENDTAG
+				));
 
-                return $this->inCell($token);
-            }
+				return $this->inCell($token);
+			}
 
-        /* An end tag whose tag name is one of: "body", "caption", "col",
+		/* 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'],
-        array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
-            /* Parse error. Ignore the token. */
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in table". */
-            $this->inTable($token);
-        }
-    }
-
-    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 the stack of open elements does not have an element in table
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('body', 'caption', 'col', 'colgroup', 'html', 'td', 'th', 'tr'))) {
+			/* Parse error. Ignore the token. */
+
+		/* Anything else */
+		} else {
+			/* Process the token as if the insertion mode was "in table". */
+			$this->inTable($token);
+		}
+	}
+
+	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 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)) {
-                // Ignore.
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore.
 
-            /* Otherwise: */
-            } else {
-                /* Generate implied end tags, except for elements with the same
+			/* 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
+				/* Now, if the current node is not an element with the same tag
                 name as the token, then this is a parse error. */
-                // k
+				// k
 
-                /* Pop elements from this stack until an element with the same
+				/* Pop elements from this stack until an element with the same
                 tag name as the token has been popped from the stack. */
-                while(true) {
-                    $node = end($this->stack)->nodeName;
-                    array_pop($this->stack);
+				while(true) {
+					$node = end($this->stack)->nodeName;
+					array_pop($this->stack);
 
-                    if($node === $token['name']) {
-                        break;
-                    }
-                }
+					if($node === $token['name']) {
+						break;
+					}
+				}
 
-                /* Clear the list of active formatting elements up to the last
+				/* Clear the list of active formatting elements up to the last
                 marker. */
-                $this->clearTheActiveFormattingElementsUpToTheLastMarker();
+				$this->clearTheActiveFormattingElementsUpToTheLastMarker();
 
-                /* Switch the insertion mode to "in row". (The current node
+				/* Switch the insertion mode to "in row". (The current node
                 will be a tr element at this point.) */
-                $this->mode = self::IN_ROW;
-            }
+				$this->mode = self::IN_ROW;
+			}
 
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+		/* 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'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            /* If the stack of open elements does not have a td or th element
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+		'thead', 'tr'))) {
+			/* If the stack of open elements does not have a td or th element
             in table scope, then this is a parse error; ignore the token.
             (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
+			if(!$this->elementInScope(array('td', 'th'), true)) {
+				// Ignore.
 
-            /* Otherwise, close the cell (see below) and reprocess the current
+			/* Otherwise, close the cell (see below) and reprocess the current
             token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
+			} else {
+				$this->closeCell();
+				return $this->inRow($token);
+			}
 
-        /* A start tag whose tag name is one of: "caption", "col", "colgroup",
+		/* 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'],
-        array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
-        'thead', 'tr'))) {
-            /* If the stack of open elements does not have a td or th element
+		} elseif($token['type'] === HTML5::STARTTAG && in_array($token['name'],
+		array('caption', 'col', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
+		'thead', 'tr'))) {
+			/* If the stack of open elements does not have a td or th element
             in table scope, then this is a parse error; ignore the token.
             (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
-                // Ignore.
+			if(!$this->elementInScope(array('td', 'th'), true)) {
+				// Ignore.
 
-            /* Otherwise, close the cell (see below) and reprocess the current
+			/* Otherwise, close the cell (see below) and reprocess the current
             token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
+			} else {
+				$this->closeCell();
+				return $this->inRow($token);
+			}
 
-        /* An end tag whose tag name is one of: "body", "caption", "col",
+		/* An end tag whose tag name is one of: "body", "caption", "col",
         "colgroup", "html" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('body', 'caption', 'col', 'colgroup', 'html'))) {
-            /* Parse error. Ignore the token. */
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('body', 'caption', 'col', 'colgroup', 'html'))) {
+			/* Parse error. Ignore the token. */
 
-        /* An end tag whose tag name is one of: "table", "tbody", "tfoot",
+		/* An end tag whose tag name is one of: "table", "tbody", "tfoot",
         "thead", "tr" */
-        } elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
-        array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
-            /* If the stack of open elements does not have an element in table
+		} elseif($token['type'] === HTML5::ENDTAG && in_array($token['name'],
+		array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
+			/* If the stack of open elements does not have an element in table
             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)) {
-                // Ignore.
+			if(!$this->elementInScope($token['name'], true)) {
+				// Ignore.
 
-            /* Otherwise, close the cell (see below) and reprocess the current
+			/* Otherwise, close the cell (see below) and reprocess the current
             token. */
-            } else {
-                $this->closeCell();
-                return $this->inRow($token);
-            }
-
-        /* Anything else */
-        } else {
-            /* Process the token as if the insertion mode was "in body". */
-            $this->inBody($token);
-        }
-    }
-
-    private function inSelect($token) {
-        /* Handle the token as follows: */
-
-        /* A character token */
-        if($token['type'] === HTML5::CHARACTR) {
-            /* Append the token's character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the data
+			} else {
+				$this->closeCell();
+				return $this->inRow($token);
+			}
+
+		/* Anything else */
+		} else {
+			/* Process the token as if the insertion mode was "in body". */
+			$this->inBody($token);
+		}
+	}
+
+	private function inSelect($token) {
+		/* Handle the token as follows: */
+
+		/* A character token */
+		if($token['type'] === HTML5::CHARACTR) {
+			/* Append the token's character to the current node. */
+			$this->insertText($token['data']);
+
+		/* A comment token */
+		} 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') {
-            /* If the current node is an option element, act as if an end tag
+		/* A start tag token whose tag name is "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. */
-            if(end($this->stack)->nodeName === 'option') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-        /* A start tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
-        $token['name'] === 'optgroup') {
-            /* If the current node is an option element, act as if an end tag
+			if(end($this->stack)->nodeName === 'option') {
+				$this->inSelect(array(
+					'name' => 'option',
+					'type' => HTML5::ENDTAG
+				));
+			}
+
+			/* Insert an HTML element for the token. */
+			$this->insertElement($token);
+
+		/* A start tag token whose tag name is "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. */
-            if(end($this->stack)->nodeName === 'option') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* If the current node is an optgroup element, act as if an end tag
+			if(end($this->stack)->nodeName === 'option') {
+				$this->inSelect(array(
+					'name' => 'option',
+					'type' => HTML5::ENDTAG
+				));
+			}
+
+			/* If the current node is an optgroup element, act as if an end tag
             with the tag name "optgroup" had been seen. */
-            if(end($this->stack)->nodeName === 'optgroup') {
-                $this->inSelect(array(
-                    'name' => 'optgroup',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
-
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-        /* An end tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'optgroup') {
-            /* First, if the current node is an option element, and the node
+			if(end($this->stack)->nodeName === 'optgroup') {
+				$this->inSelect(array(
+					'name' => 'optgroup',
+					'type' => HTML5::ENDTAG
+				));
+			}
+
+			/* Insert an HTML element for the token. */
+			$this->insertElement($token);
+
+		/* An end tag token whose tag name is "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
             element, then act as if an end tag with the tag name "option" had
             been seen. */
-            $elements_in_stack = count($this->stack);
+			$elements_in_stack = count($this->stack);
 
-            if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
-            $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
-                $this->inSelect(array(
-                    'name' => 'option',
-                    'type' => HTML5::ENDTAG
-                ));
-            }
+			if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
+			$this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
+				$this->inSelect(array(
+					'name' => 'option',
+					'type' => HTML5::ENDTAG
+				));
+			}
 
-            /* If the current node is an optgroup element, then pop that node
+			/* 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') {
-                array_pop($this->stack);
-            }
-
-        /* An end tag token whose tag name is "option" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'option') {
-            /* If the current node is an option element, then pop that node
+			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') {
+			/* If the current node is an option element, then pop that node
             from the stack of open elements. Otherwise, this is a parse error,
             ignore the token. */
-            if(end($this->stack)->nodeName === 'option') {
-                array_pop($this->stack);
-            }
-
-        /* An end tag whose tag name is "select" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
-        $token['name'] === 'select') {
-            /* If the stack of open elements does not have an element in table
+			if(end($this->stack)->nodeName === 'option') {
+				array_pop($this->stack);
+			}
+
+		/* An end tag whose tag name is "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)) {
-                // w/e
+			if(!$this->elementInScope($token['name'], true)) {
+				// w/e
 
-            /* Otherwise: */
-            } else {
-                /* Pop elements from the stack of open elements until a select
+			/* Otherwise: */
+			} else {
+				/* Pop elements from the stack of open elements until a select
                 element has been popped from the stack. */
-                while(true) {
-                    $current = end($this->stack)->nodeName;
-                    array_pop($this->stack);
-
-                    if($current === 'select') {
-                        break;
-                    }
-                }
-
-                /* Reset the insertion mode appropriately. */
-                $this->resetInsertionMode();
-            }
-
-        /* A start tag whose tag name is "select" */
-        } elseif($token['name'] === 'select' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Parse error. Act as if the token had been an end tag with the
+				while(true) {
+					$current = end($this->stack)->nodeName;
+					array_pop($this->stack);
+
+					if($current === 'select') {
+						break;
+					}
+				}
+
+				/* Reset the insertion mode appropriately. */
+				$this->resetInsertionMode();
+			}
+
+		/* A start tag whose tag name is "select" */
+		} 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. */
-            $this->inSelect(array(
-                'name' => 'select',
-                'type' => HTML5::ENDTAG
-            ));
+			$this->inSelect(array(
+				'name' => 'select',
+				'type' => HTML5::ENDTAG
+			));
 
-        /* An end tag whose tag name is one of: "caption", "table", "tbody",
+		/* An end tag whose tag name is one of: "caption", "table", "tbody",
         "tfoot", "thead", "tr", "td", "th" */
-        } elseif(in_array($token['name'], array('caption', 'table', 'tbody',
-        'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
-            /* Parse error. */
-            // w/e
+		} elseif(in_array($token['name'], array('caption', 'table', 'tbody',
+		'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
+			/* Parse error. */
+			// w/e
 
-            /* If the stack of open elements has an element in table scope with
+			/* If the stack of open elements has an element in table scope with
             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)) {
-                $this->inSelect(array(
-                    'name' => 'select',
-                    'type' => HTML5::ENDTAG
-                ));
+			if($this->elementInScope($token['name'], true)) {
+				$this->inSelect(array(
+					'name' => 'select',
+					'type' => HTML5::ENDTAG
+				));
 
-                $this->mainPhase($token);
-            }
+				$this->mainPhase($token);
+			}
 
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
+		/* Anything else */
+		} else {
+			/* Parse error. Ignore the token. */
+		}
+	}
 
-    private function afterBody($token) {
-        /* Handle the token as follows: */
+	private function afterBody($token) {
+		/* Handle the token as follows: */
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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'])) {
-            /* Process the token as it would be processed if the insertion mode
+		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);
+			$this->inBody($token);
 
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the first element in the stack of open
+		/* A comment token */
+		} 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') {
-            /* If the parser was originally created in order to handle the
+		/* An end tag with the tag 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
             case.) (innerHTML case) */
 
-            /* Otherwise, switch to the trailing end phase. */
-            $this->phase = self::END_PHASE;
+			/* Otherwise, switch to the trailing end phase. */
+			$this->phase = self::END_PHASE;
 
-        /* Anything else */
-        } else {
-            /* Parse error. Set the insertion mode to "in body" and reprocess
+		/* Anything else */
+		} else {
+			/* Parse error. Set the insertion mode to "in body" and reprocess
             the token. */
-            $this->mode = self::IN_BODY;
-            return $this->inBody($token);
-        }
-    }
+			$this->mode = self::IN_BODY;
+			return $this->inBody($token);
+		}
+	}
 
-    private function inFrameset($token) {
-        /* Handle the token as follows: */
+	private function inFrameset($token) {
+		/* Handle the token as follows: */
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the 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']);
+
+		/* A comment token */
+		} 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) {
-            $this->insertElement($token);
+		/* A start tag with the tag name "frameset" */
+		} 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) {
-            /* If the current node is the root html element, then this is a
+		/* An end tag with the tag name "frameset" */
+		} 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) */
-            if(end($this->stack)->nodeName === 'html') {
-                // Ignore
+			if(end($this->stack)->nodeName === 'html') {
+				// Ignore
 
-            } else {
-                /* Otherwise, pop the current node from the stack of open
+			} else {
+				/* Otherwise, pop the current node from the stack of open
                 elements. */
-                array_pop($this->stack);
+				array_pop($this->stack);
 
-                /* If the parser was not originally created in order to handle
+				/* If the parser was not originally created in order to handle
                 the setting of an element's innerHTML attribute (innerHTML case),
                 and the current node is no longer a frameset element, then change
                 the insertion mode to "after frameset". */
-                $this->mode = self::AFTR_FRAME;
-            }
-
-        /* A start tag with the tag name "frame" */
-        } elseif($token['name'] === 'frame' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Insert an HTML element for the token. */
-            $this->insertElement($token);
-
-            /* Immediately pop the current node off the stack of open elements. */
-            array_pop($this->stack);
-
-        /* A start tag with the tag name "noframes" */
-        } elseif($token['name'] === 'noframes' &&
-        $token['type'] === HTML5::STARTTAG) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function afterFrameset($token) {
-        /* Handle the token as follows: */
-
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+				$this->mode = self::AFTR_FRAME;
+			}
+
+		/* A start tag with the tag name "frame" */
+		} elseif($token['name'] === 'frame' &&
+		$token['type'] === HTML5::STARTTAG) {
+			/* Insert an HTML element for the token. */
+			$this->insertElement($token);
+
+			/* Immediately pop the current node off the stack of open elements. */
+			array_pop($this->stack);
+
+		/* A start tag with the tag name "noframes" */
+		} elseif($token['name'] === 'noframes' &&
+		$token['type'] === HTML5::STARTTAG) {
+			/* Process the token as if the insertion mode had been "in body". */
+			$this->inBody($token);
+
+		/* Anything else */
+		} else {
+			/* Parse error. Ignore the token. */
+		}
+	}
+
+	private function afterFrameset($token) {
+		/* Handle the token as follows: */
+
+		/* 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'])) {
-            /* Append the character to the current node. */
-            $this->insertText($token['data']);
-
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the current node with the 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']);
+
+		/* A comment token */
+		} 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']);
-
-        /* An end tag with the tag name "html" */
-        } 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) {
-            /* Process the token as if the insertion mode had been "in body". */
-            $this->inBody($token);
-
-        /* Anything else */
-        } else {
-            /* Parse error. Ignore the token. */
-        }
-    }
-
-    private function trailingEndPhase($token) {
-        /* After the main phase, as each token is emitted from the tokenisation
+			$this->insertComment($token['data']);
+
+		/* An end tag with the tag name "html" */
+		} 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) {
+			/* Process the token as if the insertion mode had been "in body". */
+			$this->inBody($token);
+
+		/* Anything else */
+		} else {
+			/* Parse error. Ignore the token. */
+		}
+	}
+
+	private function trailingEndPhase($token) {
+		/* After the main phase, as each token is emitted from the tokenisation
         stage, it must be processed as described in this section. */
 
-        /* A DOCTYPE token */
-        if($token['type'] === HTML5::DOCTYPE) {
-            // Parse error. Ignore the token.
+		/* A DOCTYPE token */
+		if($token['type'] === HTML5::DOCTYPE) {
+			// Parse error. Ignore the token.
 
-        /* A comment token */
-        } elseif($token['type'] === HTML5::COMMENT) {
-            /* Append a Comment node to the Document object with the data
+		/* A comment token */
+		} 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']);
-            $this->dom->appendChild($comment);
+			$comment = $this->dom->createComment($token['data']);
+			$this->dom->appendChild($comment);
 
-        /* A character token that is one of one of U+0009 CHARACTER TABULATION,
+		/* 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'])) {
-            /* Process the token as it would be processed in the main phase. */
-            $this->mainPhase($token);
+		} 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);
 
-        /* A character token that is not one of U+0009 CHARACTER TABULATION,
+		/* 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) {
-            /* Parse error. Switch back to the main phase and reprocess the
+		} 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. */
-            $this->phase = self::MAIN_PHASE;
-            return $this->mainPhase($token);
-
-        /* An end-of-file token */
-        } elseif($token['type'] === HTML5::EOF) {
-            /* OMG DONE!! */
-        }
-    }
-
-    private function insertElement($token, $append = true, $check = false) {
-        // Proprietary workaround for libxml2's limitations with tag names
-        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']);
-            // Remove leading hyphens and numbers
-            $token['name'] = ltrim($token['name'], '-0..9');
-            // In theory, this should ever be needed, but just in case
-            if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice
-        }
+			$this->phase = self::MAIN_PHASE;
+			return $this->mainPhase($token);
+
+		/* An end-of-file token */
+		} elseif($token['type'] === HTML5::EOF) {
+			/* OMG DONE!! */
+		}
+	}
+
+	private function insertElement($token, $append = true, $check = false) {
+		// Proprietary workaround for libxml2's limitations with tag names
+		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']);
+			// Remove leading hyphens and numbers
+			$token['name'] = ltrim($token['name'], '-0..9');
+			// In theory, this should ever be needed, but just in case
+			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->appendToRealParent($el);
+		$this->stack[] = $el;
 
-        return $el;
-    }
+		return $el;
+	}
 
-    private function insertText($data) {
-        $text = $this->dom->createTextNode($data);
-        $this->appendToRealParent($text);
-    }
+	private function insertText($data) {
+		$text = $this->dom->createTextNode($data);
+		$this->appendToRealParent($text);
+	}
 
-    private function insertComment($data) {
-        $comment = $this->dom->createComment($data);
-        $this->appendToRealParent($comment);
-    }
+	private function insertComment($data) {
+		$comment = $this->dom->createComment($data);
+		$this->appendToRealParent($comment);
+	}
 
-    private function appendToRealParent($node) {
-        if($this->foster_parent === null) {
-            end($this->stack)->appendChild($node);
+	private function appendToRealParent($node) {
+		if($this->foster_parent === null) {
+			end($this->stack)->appendChild($node);
 
-        } elseif($this->foster_parent !== null) {
-            /* If the foster parent element is the parent element of the
+		} elseif($this->foster_parent !== null) {
+			/* If the foster parent element is the parent element of the
             last table element in the stack of open elements, then the new
             node must be inserted immediately before the last table element
             in the stack of open elements in the foster parent element;
             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) {
-                    $table = $this->stack[$n];
-                    break;
-                }
-            }
-
-            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
-                $this->foster_parent->insertBefore($node, $table);
-            else
-                $this->foster_parent->appendChild($node);
-
-            $this->foster_parent = null;
-        }
-    }
-
-    private function elementInScope($el, $table = false) {
-        if(is_array($el)) {
-            foreach($el as $element) {
-                if($this->elementInScope($element, $table)) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        $leng = count($this->stack);
-
-        for($n = 0; $n < $leng; $n++) {
-            /* 1. Initialise node to be the current node (the bottommost node of
+			for($n = count($this->stack) - 1; $n >= 0; $n--) {
+				if($this->stack[$n]->nodeName === 'table' &&
+				$this->stack[$n]->parentNode !== null) {
+					$table = $this->stack[$n];
+					break;
+				}
+			}
+
+			if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
+				$this->foster_parent->insertBefore($node, $table);
+			else
+				$this->foster_parent->appendChild($node);
+
+			$this->foster_parent = null;
+		}
+	}
+
+	private function elementInScope($el, $table = false) {
+		if(is_array($el)) {
+			foreach($el as $element) {
+				if($this->elementInScope($element, $table)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		$leng = count($this->stack);
+
+		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. */
-                return true;
+			if($node->tagName === $el) {
+				/* 2. If node is the target node, terminate in a match state. */
+				return true;
 
-            } elseif($node->tagName === 'table') {
-                /* 3. Otherwise, if node is a table element, terminate in a failure
+			} elseif($node->tagName === 'table') {
+				/* 3. Otherwise, if node is a table element, terminate in a failure
                 state. */
-                return false;
+				return false;
 
-            } elseif($table === true && in_array($node->tagName, array('caption', 'td',
-            'th', 'button', 'marquee', 'object'))) {
-                /* 4. Otherwise, if the algorithm is the "has an element in scope"
+			} elseif($table === true && in_array($node->tagName, array('caption', 'td',
+			'th', 'button', 'marquee', 'object'))) {
+				/* 4. Otherwise, if the algorithm is the "has an element in scope"
                 variant (rather than the "has an element in table scope" variant),
                 and node is one of the following, terminate in a failure state. */
-                return false;
+				return false;
 
-            } elseif($node === $node->ownerDocument->documentElement) {
-                /* 5. Otherwise, if node is an html element (root element), terminate
+			} elseif($node === $node->ownerDocument->documentElement) {
+				/* 5. Otherwise, if node is an html element (root element), terminate
                 in a failure state. (This can only happen if the node is the topmost
                 node of the    stack of open elements, and prevents the next step from
                 being invoked if there are no more elements in the stack.) */
-                return false;
-            }
+				return false;
+			}
 
-            /* Otherwise, set node to the previous entry in the stack of open
+			/* Otherwise, set node to the previous entry in the stack of open
             elements and return to step 2. (This will never fail, since the loop
             will always terminate in the previous step if the top of the stack
             is reached.) */
-        }
-    }
+		}
+	}
 
-    private function reconstructActiveFormattingElements() {
-        /* 1. If there are no entries in the list of active formatting elements,
+	private function reconstructActiveFormattingElements() {
+		/* 1. If there are no entries in the list of active formatting elements,
         then there is nothing to reconstruct; stop this algorithm. */
-        $formatting_elements = count($this->a_formatting);
+		$formatting_elements = count($this->a_formatting);
 
-        if($formatting_elements === 0) {
-            return false;
-        }
+		if($formatting_elements === 0) {
+			return false;
+		}
 
-        /* 3. Let entry be the last (most recently added) element in the list
+		/* 3. Let entry be the last (most recently added) element in the list
         of active formatting elements. */
-        $entry = end($this->a_formatting);
+		$entry = end($this->a_formatting);
 
-        /* 2. If the last (most recently added) entry in the list of active
+		/* 2. If the last (most recently added) entry in the list of active
         formatting elements is a marker, or if it is an element that is in the
         stack of open elements, then there is nothing to reconstruct; stop this
         algorithm. */
-        if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-            return false;
-        }
+		if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+			return false;
+		}
 
-        for($a = $formatting_elements - 1; $a >= 0; true) {
-            /* 4. If there are no entries before entry in the list of active
+		for($a = $formatting_elements - 1; $a >= 0; true) {
+			/* 4. If there are no entries before entry in the list of active
             formatting elements, then jump to step 8. */
-            if($a === 0) {
-                $step_seven = false;
-                break;
-            }
+			if($a === 0) {
+				$step_seven = false;
+				break;
+			}
 
-            /* 5. Let entry be the entry one earlier than entry in the list of
+			/* 5. Let entry be the entry one earlier than entry in the list of
             active formatting elements. */
-            $a--;
-            $entry = $this->a_formatting[$a];
+			$a--;
+			$entry = $this->a_formatting[$a];
 
-            /* 6. If entry is neither a marker nor an element that is also in
+			/* 6. If entry is neither a marker nor an element that is also in
             thetack of open elements, go to step 4. */
-            if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
-                break;
-            }
-        }
+			if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+				break;
+			}
+		}
 
-        while(true) {
-            /* 7. Let entry be the element one later than entry in the list of
+		while(true) {
+			/* 7. Let entry be the element one later than entry in the list of
             active formatting elements. */
-            if(isset($step_seven) && $step_seven === true) {
-                $a++;
-                $entry = $this->a_formatting[$a];
-            }
+			if(isset($step_seven) && $step_seven === true) {
+				$a++;
+				$entry = $this->a_formatting[$a];
+			}
 
-            /* 8. Perform a shallow clone of the element entry to obtain clone. */
-            $clone = $entry->cloneNode();
+			/* 8. Perform a shallow clone of the element entry to obtain clone. */
+			$clone = $entry->cloneNode();
 
-            /* 9. Append clone to the current node and push it onto the stack
+			/* 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;
+			end($this->stack)->appendChild($clone);
+			$this->stack[] = $clone;
 
-            /* 10. Replace the entry for entry in the list with an entry for
+			/* 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
+			/* 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. */
-            if(end($this->a_formatting) !== $clone) {
-                $step_seven = true;
-            } else {
-                break;
-            }
-        }
-    }
-
-    private function clearTheActiveFormattingElementsUpToTheLastMarker() {
-        /* When the steps below require the UA to clear the list of active
+			if(end($this->a_formatting) !== $clone) {
+				$step_seven = true;
+			} else {
+				break;
+			}
+		}
+	}
+
+	private function clearTheActiveFormattingElementsUpToTheLastMarker() {
+		/* When the steps below require the UA to clear the list of active
         formatting elements up to the last marker, the UA must perform the
         following steps: */
 
-        while(true) {
-            /* 1. Let entry be the last (most recently added) entry in the list
+		while(true) {
+			/* 1. Let entry be the last (most recently added) entry in the list
             of active formatting elements. */
-            $entry = end($this->a_formatting);
+			$entry = end($this->a_formatting);
 
-            /* 2. Remove entry from the list of active formatting elements. */
-            array_pop($this->a_formatting);
+			/* 2. Remove entry from the list of active formatting elements. */
+			array_pop($this->a_formatting);
 
-            /* 3. If entry was a marker, then stop the algorithm at this point.
+			/* 3. If entry was a marker, then stop the algorithm at this point.
             The list has been cleared up to the last marker. */
-            if($entry === self::MARKER) {
-                break;
-            }
-        }
-    }
-
-    private function generateImpliedEndTags($exclude = array()) {
-        /* When the steps below require the UA to generate implied end tags,
+			if($entry === self::MARKER) {
+				break;
+			}
+		}
+	}
+
+	private function generateImpliedEndTags($exclude = array()) {
+		/* When the steps below require the UA to generate implied end tags,
         then, if the current node is a dd element, a dt element, an li element,
         a p element, a td element, a th  element, or a tr element, the UA must
         act as if an end tag with the respective tag name had been seen and
         then generate implied end tags again. */
-        $node = end($this->stack);
-        $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
+		$node = end($this->stack);
+		$elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
 
-        while(in_array(end($this->stack)->nodeName, $elements)) {
-            array_pop($this->stack);
-        }
-    }
+		while(in_array(end($this->stack)->nodeName, $elements)) {
+			array_pop($this->stack);
+		}
+	}
 
-    private function getElementCategory($node) {
-        $name = $node->tagName;
-        if(in_array($name, $this->special))
-            return self::SPECIAL;
+	private function getElementCategory($node) {
+		$name = $node->tagName;
+		if(in_array($name, $this->special))
+			return self::SPECIAL;
 
-        elseif(in_array($name, $this->scoping))
-            return self::SCOPING;
+		elseif(in_array($name, $this->scoping))
+			return self::SCOPING;
 
-        elseif(in_array($name, $this->formatting))
-            return self::FORMATTING;
+		elseif(in_array($name, $this->formatting))
+			return self::FORMATTING;
 
-        else
-            return self::PHRASING;
-    }
+		else
+			return self::PHRASING;
+	}
 
-    private function clearStackToTableContext($elements) {
-        /* When the steps above require the UA to clear the stack back to a
+	private function clearStackToTableContext($elements) {
+		/* When the steps above require the UA to clear the stack back to a
         table context, it means that the UA must, while the current node is not
         a table element or an html element, pop elements from the stack of open
         elements. If this causes any elements to be popped from the stack, then
         this is a parse error. */
-        while(true) {
-            $node = end($this->stack)->nodeName;
-
-            if(in_array($node, $elements)) {
-                break;
-            } else {
-                array_pop($this->stack);
-            }
-        }
-    }
-
-    private function resetInsertionMode() {
-        /* 1. Let last be false. */
-        $last = false;
-        $leng = count($this->stack);
-
-        for($n = $leng - 1; $n >= 0; $n--) {
-            /* 2. Let node be the last node in the stack of open elements. */
-            $node = $this->stack[$n];
-
-            /* 3. If node is the first node in the stack of open elements, then
+		while(true) {
+			$node = end($this->stack)->nodeName;
+
+			if(in_array($node, $elements)) {
+				break;
+			} else {
+				array_pop($this->stack);
+			}
+		}
+	}
+
+	private function resetInsertionMode() {
+		/* 1. Let last be false. */
+		$last = false;
+		$leng = count($this->stack);
+
+		for($n = $leng - 1; $n >= 0; $n--) {
+			/* 2. Let node be the last node in the stack of open elements. */
+			$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)) {
-                $last = true;
-            }
+			if($this->stack[0]->isSameNode($node)) {
+				$last = true;
+			}
 
-            /* 4. If node is a select element, then switch the insertion mode to
+			/* 4. If node is a select element, then switch the insertion mode to
             "in select" and abort these steps. (innerHTML case) */
-            if($node->nodeName === 'select') {
-                $this->mode = self::IN_SELECT;
-                break;
+			if($node->nodeName === 'select') {
+				$this->mode = self::IN_SELECT;
+				break;
 
-            /* 5. If node is a td or th element, then switch the insertion mode
+			/* 5. If node is a td or th element, then switch the insertion mode
             to "in cell" and abort these steps. */
-            } elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
-                $this->mode = self::IN_CELL;
-                break;
+			} elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
+				$this->mode = self::IN_CELL;
+				break;
 
-            /* 6. If node is a tr element, then switch the insertion mode to
+			/* 6. If node is a tr element, then switch the insertion mode to
             "in    row" and abort these steps. */
-            } elseif($node->nodeName === 'tr') {
-                $this->mode = self::IN_ROW;
-                break;
+			} elseif($node->nodeName === 'tr') {
+				$this->mode = self::IN_ROW;
+				break;
 
-            /* 7. If node is a tbody, thead, or tfoot element, then switch the
+			/* 7. If node is a tbody, thead, or tfoot element, then switch the
             insertion mode to "in table body" and abort these steps. */
-            } elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
-                $this->mode = self::IN_TBODY;
-                break;
+			} elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
+				$this->mode = self::IN_TBODY;
+				break;
 
-            /* 8. If node is a caption element, then switch the insertion mode
+			/* 8. If node is a caption element, then switch the insertion mode
             to "in caption" and abort these steps. */
-            } elseif($node->nodeName === 'caption') {
-                $this->mode = self::IN_CAPTION;
-                break;
+			} elseif($node->nodeName === 'caption') {
+				$this->mode = self::IN_CAPTION;
+				break;
 
-            /* 9. If node is a colgroup element, then switch the insertion mode
+			/* 9. If node is a colgroup element, then switch the insertion mode
             to "in column group" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'colgroup') {
-                $this->mode = self::IN_CGROUP;
-                break;
+			} elseif($node->nodeName === 'colgroup') {
+				$this->mode = self::IN_CGROUP;
+				break;
 
-            /* 10. If node is a table element, then switch the insertion mode
+			/* 10. If node is a table element, then switch the insertion mode
             to "in table" and abort these steps. */
-            } elseif($node->nodeName === 'table') {
-                $this->mode = self::IN_TABLE;
-                break;
+			} elseif($node->nodeName === 'table') {
+				$this->mode = self::IN_TABLE;
+				break;
 
-            /* 11. If node is a head element, then switch the insertion mode
+			/* 11. If node is a head element, then switch the insertion mode
             to "in body" ("in body"! not "in head"!) and abort these steps.
             (innerHTML case) */
-            } elseif($node->nodeName === 'head') {
-                $this->mode = self::IN_BODY;
-                break;
+			} elseif($node->nodeName === 'head') {
+				$this->mode = self::IN_BODY;
+				break;
 
-            /* 12. If node is a body element, then switch the insertion mode to
+			/* 12. If node is a body element, then switch the insertion mode to
             "in body" and abort these steps. */
-            } elseif($node->nodeName === 'body') {
-                $this->mode = self::IN_BODY;
-                break;
+			} elseif($node->nodeName === 'body') {
+				$this->mode = self::IN_BODY;
+				break;
 
-            /* 13. If node is a frameset element, then switch the insertion
+			/* 13. If node is a frameset element, then switch the insertion
             mode to "in frameset" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'frameset') {
-                $this->mode = self::IN_FRAME;
-                break;
+			} elseif($node->nodeName === 'frameset') {
+				$this->mode = self::IN_FRAME;
+				break;
 
-            /* 14. If node is an html element, then: if the head element
+			/* 14. If node is an html element, then: if the head element
             pointer is null, switch the insertion mode to "before head",
             otherwise, switch the insertion mode to "after head". In either
             case, abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'html') {
-                $this->mode = ($this->head_pointer === null)
-                    ? self::BEFOR_HEAD
-                    : self::AFTER_HEAD;
+			} elseif($node->nodeName === 'html') {
+				$this->mode = ($this->head_pointer === null)
+					? self::BEFOR_HEAD
+					: self::AFTER_HEAD;
 
-                break;
+				break;
 
-            /* 15. If last is true, then set the insertion mode to "in body"
+			/* 15. If last is true, then set the insertion mode to "in body"
             and    abort these steps. (innerHTML case) */
-            } elseif($last) {
-                $this->mode = self::IN_BODY;
-                break;
-            }
-        }
-    }
-
-    private function closeCell() {
-        /* If the stack of open elements has a td or th element in table scope,
+			} elseif($last) {
+				$this->mode = self::IN_BODY;
+				break;
+			}
+		}
+	}
+
+	private function closeCell() {
+		/* If the stack of open elements has a td or th element in table scope,
         then act as if an end tag token with that tag name had been seen. */
-        foreach(array('td', 'th') as $cell) {
-            if($this->elementInScope($cell, true)) {
-                $this->inCell(array(
-                    'name' => $cell,
-                    'type' => HTML5::ENDTAG
-                ));
-
-                break;
-            }
-        }
-    }
-
-    public function save() {
-        return $this->dom;
-    }
+		foreach(array('td', 'th') as $cell) {
+			if($this->elementInScope($cell, true)) {
+				$this->inCell(array(
+					'name' => $cell,
+					'type' => HTML5::ENDTAG
+				));
+
+				break;
+			}
+		}
+	}
+
+	public function save() {
+		return $this->dom;
+	}
 }
 ?>

Braces +18 added lines, -16 removed lines

@@ -3542,7 +3542,10 @@ 
             // Remove leading hyphens and numbers
             $token['name'] = ltrim($token['name'], '-0..9');
             // In theory, this should ever be needed, but just in case
-            if ($token['name'] === '') $token['name'] = 'span'; // arbitrary generic choice
+            if ($token['name'] === '') {
+            	$token['name'] = 'span';
+            }
+            // arbitrary generic choice
         }
         
         $el = $this->dom->createElement($token['name']);
@@ -3588,10 +3591,11 @@ 
                 }
             }
 
-            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
-                $this->foster_parent->insertBefore($node, $table);
-            else
-                $this->foster_parent->appendChild($node);
+            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode)) {
+                            $this->foster_parent->insertBefore($node, $table);
+            } else {
+                            $this->foster_parent->appendChild($node);
+            }
 
             $this->foster_parent = null;
         }
@@ -3754,17 +3758,15 @@ 
 
     private function getElementCategory($node) {
         $name = $node->tagName;
-        if(in_array($name, $this->special))
-            return self::SPECIAL;
-
-        elseif(in_array($name, $this->scoping))
-            return self::SCOPING;
-
-        elseif(in_array($name, $this->formatting))
-            return self::FORMATTING;
-
-        else
-            return self::PHRASING;
+        if(in_array($name, $this->special)) {
+                    return self::SPECIAL;
+        } elseif(in_array($name, $this->scoping)) {
+                    return self::SCOPING;
+        } elseif(in_array($name, $this->formatting)) {
+                    return self::FORMATTING;
+        } else {
+                    return self::PHRASING;
+        }
     }
 
     private function clearStackToTableContext($elements) {

Spacing +384 added lines, -384 removed lines

@@ -69,48 +69,48 @@ 
     private $token;
     private $content_model;
     private $escape = false;
-    private $entities = array('AElig;','AElig','AMP;','AMP','Aacute;','Aacute',
-    'Acirc;','Acirc','Agrave;','Agrave','Alpha;','Aring;','Aring','Atilde;',
-    'Atilde','Auml;','Auml','Beta;','COPY;','COPY','Ccedil;','Ccedil','Chi;',
-    'Dagger;','Delta;','ETH;','ETH','Eacute;','Eacute','Ecirc;','Ecirc','Egrave;',
-    'Egrave','Epsilon;','Eta;','Euml;','Euml','GT;','GT','Gamma;','Iacute;',
-    'Iacute','Icirc;','Icirc','Igrave;','Igrave','Iota;','Iuml;','Iuml','Kappa;',
-    'LT;','LT','Lambda;','Mu;','Ntilde;','Ntilde','Nu;','OElig;','Oacute;',
-    'Oacute','Ocirc;','Ocirc','Ograve;','Ograve','Omega;','Omicron;','Oslash;',
-    'Oslash','Otilde;','Otilde','Ouml;','Ouml','Phi;','Pi;','Prime;','Psi;',
-    'QUOT;','QUOT','REG;','REG','Rho;','Scaron;','Sigma;','THORN;','THORN',
-    'TRADE;','Tau;','Theta;','Uacute;','Uacute','Ucirc;','Ucirc','Ugrave;',
-    'Ugrave','Upsilon;','Uuml;','Uuml','Xi;','Yacute;','Yacute','Yuml;','Zeta;',
-    'aacute;','aacute','acirc;','acirc','acute;','acute','aelig;','aelig',
-    'agrave;','agrave','alefsym;','alpha;','amp;','amp','and;','ang;','apos;',
-    'aring;','aring','asymp;','atilde;','atilde','auml;','auml','bdquo;','beta;',
-    'brvbar;','brvbar','bull;','cap;','ccedil;','ccedil','cedil;','cedil',
-    'cent;','cent','chi;','circ;','clubs;','cong;','copy;','copy','crarr;',
-    'cup;','curren;','curren','dArr;','dagger;','darr;','deg;','deg','delta;',
-    'diams;','divide;','divide','eacute;','eacute','ecirc;','ecirc','egrave;',
-    'egrave','empty;','emsp;','ensp;','epsilon;','equiv;','eta;','eth;','eth',
-    'euml;','euml','euro;','exist;','fnof;','forall;','frac12;','frac12',
-    'frac14;','frac14','frac34;','frac34','frasl;','gamma;','ge;','gt;','gt',
-    'hArr;','harr;','hearts;','hellip;','iacute;','iacute','icirc;','icirc',
-    'iexcl;','iexcl','igrave;','igrave','image;','infin;','int;','iota;',
-    'iquest;','iquest','isin;','iuml;','iuml','kappa;','lArr;','lambda;','lang;',
-    'laquo;','laquo','larr;','lceil;','ldquo;','le;','lfloor;','lowast;','loz;',
-    'lrm;','lsaquo;','lsquo;','lt;','lt','macr;','macr','mdash;','micro;','micro',
-    'middot;','middot','minus;','mu;','nabla;','nbsp;','nbsp','ndash;','ne;',
-    'ni;','not;','not','notin;','nsub;','ntilde;','ntilde','nu;','oacute;',
-    'oacute','ocirc;','ocirc','oelig;','ograve;','ograve','oline;','omega;',
-    'omicron;','oplus;','or;','ordf;','ordf','ordm;','ordm','oslash;','oslash',
-    'otilde;','otilde','otimes;','ouml;','ouml','para;','para','part;','permil;',
-    'perp;','phi;','pi;','piv;','plusmn;','plusmn','pound;','pound','prime;',
-    'prod;','prop;','psi;','quot;','quot','rArr;','radic;','rang;','raquo;',
-    'raquo','rarr;','rceil;','rdquo;','real;','reg;','reg','rfloor;','rho;',
-    'rlm;','rsaquo;','rsquo;','sbquo;','scaron;','sdot;','sect;','sect','shy;',
-    'shy','sigma;','sigmaf;','sim;','spades;','sub;','sube;','sum;','sup1;',
-    'sup1','sup2;','sup2','sup3;','sup3','sup;','supe;','szlig;','szlig','tau;',
-    'there4;','theta;','thetasym;','thinsp;','thorn;','thorn','tilde;','times;',
-    'times','trade;','uArr;','uacute;','uacute','uarr;','ucirc;','ucirc',
-    'ugrave;','ugrave','uml;','uml','upsih;','upsilon;','uuml;','uuml','weierp;',
-    'xi;','yacute;','yacute','yen;','yen','yuml;','yuml','zeta;','zwj;','zwnj;');
+    private $entities = array('AElig;', 'AElig', 'AMP;', 'AMP', 'Aacute;', 'Aacute',
+    'Acirc;', 'Acirc', 'Agrave;', 'Agrave', 'Alpha;', 'Aring;', 'Aring', 'Atilde;',
+    'Atilde', 'Auml;', 'Auml', 'Beta;', 'COPY;', 'COPY', 'Ccedil;', 'Ccedil', 'Chi;',
+    'Dagger;', 'Delta;', 'ETH;', 'ETH', 'Eacute;', 'Eacute', 'Ecirc;', 'Ecirc', 'Egrave;',
+    'Egrave', 'Epsilon;', 'Eta;', 'Euml;', 'Euml', 'GT;', 'GT', 'Gamma;', 'Iacute;',
+    'Iacute', 'Icirc;', 'Icirc', 'Igrave;', 'Igrave', 'Iota;', 'Iuml;', 'Iuml', 'Kappa;',
+    'LT;', 'LT', 'Lambda;', 'Mu;', 'Ntilde;', 'Ntilde', 'Nu;', 'OElig;', 'Oacute;',
+    'Oacute', 'Ocirc;', 'Ocirc', 'Ograve;', 'Ograve', 'Omega;', 'Omicron;', 'Oslash;',
+    'Oslash', 'Otilde;', 'Otilde', 'Ouml;', 'Ouml', 'Phi;', 'Pi;', 'Prime;', 'Psi;',
+    'QUOT;', 'QUOT', 'REG;', 'REG', 'Rho;', 'Scaron;', 'Sigma;', 'THORN;', 'THORN',
+    'TRADE;', 'Tau;', 'Theta;', 'Uacute;', 'Uacute', 'Ucirc;', 'Ucirc', 'Ugrave;',
+    'Ugrave', 'Upsilon;', 'Uuml;', 'Uuml', 'Xi;', 'Yacute;', 'Yacute', 'Yuml;', 'Zeta;',
+    'aacute;', 'aacute', 'acirc;', 'acirc', 'acute;', 'acute', 'aelig;', 'aelig',
+    'agrave;', 'agrave', 'alefsym;', 'alpha;', 'amp;', 'amp', 'and;', 'ang;', 'apos;',
+    'aring;', 'aring', 'asymp;', 'atilde;', 'atilde', 'auml;', 'auml', 'bdquo;', 'beta;',
+    'brvbar;', 'brvbar', 'bull;', 'cap;', 'ccedil;', 'ccedil', 'cedil;', 'cedil',
+    'cent;', 'cent', 'chi;', 'circ;', 'clubs;', 'cong;', 'copy;', 'copy', 'crarr;',
+    'cup;', 'curren;', 'curren', 'dArr;', 'dagger;', 'darr;', 'deg;', 'deg', 'delta;',
+    'diams;', 'divide;', 'divide', 'eacute;', 'eacute', 'ecirc;', 'ecirc', 'egrave;',
+    'egrave', 'empty;', 'emsp;', 'ensp;', 'epsilon;', 'equiv;', 'eta;', 'eth;', 'eth',
+    'euml;', 'euml', 'euro;', 'exist;', 'fnof;', 'forall;', 'frac12;', 'frac12',
+    'frac14;', 'frac14', 'frac34;', 'frac34', 'frasl;', 'gamma;', 'ge;', 'gt;', 'gt',
+    'hArr;', 'harr;', 'hearts;', 'hellip;', 'iacute;', 'iacute', 'icirc;', 'icirc',
+    'iexcl;', 'iexcl', 'igrave;', 'igrave', 'image;', 'infin;', 'int;', 'iota;',
+    'iquest;', 'iquest', 'isin;', 'iuml;', 'iuml', 'kappa;', 'lArr;', 'lambda;', 'lang;',
+    'laquo;', 'laquo', 'larr;', 'lceil;', 'ldquo;', 'le;', 'lfloor;', 'lowast;', 'loz;',
+    'lrm;', 'lsaquo;', 'lsquo;', 'lt;', 'lt', 'macr;', 'macr', 'mdash;', 'micro;', 'micro',
+    'middot;', 'middot', 'minus;', 'mu;', 'nabla;', 'nbsp;', 'nbsp', 'ndash;', 'ne;',
+    'ni;', 'not;', 'not', 'notin;', 'nsub;', 'ntilde;', 'ntilde', 'nu;', 'oacute;',
+    'oacute', 'ocirc;', 'ocirc', 'oelig;', 'ograve;', 'ograve', 'oline;', 'omega;',
+    'omicron;', 'oplus;', 'or;', 'ordf;', 'ordf', 'ordm;', 'ordm', 'oslash;', 'oslash',
+    'otilde;', 'otilde', 'otimes;', 'ouml;', 'ouml', 'para;', 'para', 'part;', 'permil;',
+    'perp;', 'phi;', 'pi;', 'piv;', 'plusmn;', 'plusmn', 'pound;', 'pound', 'prime;',
+    'prod;', 'prop;', 'psi;', 'quot;', 'quot', 'rArr;', 'radic;', 'rang;', 'raquo;',
+    'raquo', 'rarr;', 'rceil;', 'rdquo;', 'real;', 'reg;', 'reg', 'rfloor;', 'rho;',
+    'rlm;', 'rsaquo;', 'rsquo;', 'sbquo;', 'scaron;', 'sdot;', 'sect;', 'sect', 'shy;',
+    'shy', 'sigma;', 'sigmaf;', 'sim;', 'spades;', 'sub;', 'sube;', 'sum;', 'sup1;',
+    'sup1', 'sup2;', 'sup2', 'sup3;', 'sup3', 'sup;', 'supe;', 'szlig;', 'szlig', 'tau;',
+    'there4;', 'theta;', 'thetasym;', 'thinsp;', 'thorn;', 'thorn', 'tilde;', 'times;',
+    'times', 'trade;', 'uArr;', 'uacute;', 'uacute', 'uarr;', 'ucirc;', 'ucirc',
+    'ugrave;', 'ugrave', 'uml;', 'uml', 'upsih;', 'upsilon;', 'uuml;', 'uuml', 'weierp;',
+    'xi;', 'yacute;', 'yacute', 'yen;', 'yen', 'yuml;', 'yuml', 'zeta;', 'zwj;', 'zwnj;');
 
     const PCDATA    = 0;
     const RCDATA    = 1;
@@ -134,7 +134,7 @@ 
 
         $this->state = 'data';
 
-        while($this->state !== null) {
+        while ($this->state !== null) {
             $this->{$this->state.'State'}();
         }
     }
@@ -150,8 +150,8 @@ 
     }
 
     private function character($s, $l = 0) {
-        if($s + $l < $this->EOF) {
-            if($l === 0) {
+        if ($s + $l < $this->EOF) {
+            if ($l === 0) {
                 return $this->data[$s];
             } else {
                 return substr($this->data, $s, $l);
@@ -168,21 +168,21 @@ 
         $this->char++;
         $char = $this->char();
 
-        if($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
+        if ($char === '&' && ($this->content_model === self::PCDATA || $this->content_model === self::RCDATA)) {
             /* U+0026 AMPERSAND (&)
             When the content model flag is set to one of the PCDATA or RCDATA
             states: switch to the entity data state. Otherwise: treat it as per
             the "anything else"    entry below. */
             $this->state = 'entityData';
 
-        } elseif($char === '-') {
+        } elseif ($char === '-') {
             /* If the content model flag is set to either the RCDATA state or
             the CDATA state, and the escape flag is false, and there are at
             least three characters before this one in the input stream, and the
             last four characters in the input stream, including this one, are
             U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
             and U+002D HYPHEN-MINUS ("<!--"), then set the escape flag to true. */
-            if(($this->content_model === self::RCDATA || $this->content_model ===
+            if (($this->content_model === self::RCDATA || $this->content_model ===
             self::CDATA) && $this->escape === false &&
             $this->char >= 3 && $this->character($this->char - 4, 4) === '<!--') {
                 $this->escape = true;
@@ -196,7 +196,7 @@ 
             ));
 
         /* U+003C LESS-THAN SIGN (<) */
-        } elseif($char === '<' && ($this->content_model === self::PCDATA ||
+        } elseif ($char === '<' && ($this->content_model === self::PCDATA ||
         (($this->content_model === self::RCDATA ||
         $this->content_model === self::CDATA) && $this->escape === false))) {
             /* When the content model flag is set to the PCDATA state: switch
@@ -210,13 +210,13 @@ 
             $this->state = 'tagOpen';
 
         /* U+003E GREATER-THAN SIGN (>) */
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* If the content model flag is set to either the RCDATA state or
             the CDATA state, and the escape flag is true, and the last three
             characters in the input stream including this one are U+002D
             HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN ("-->"),
             set the escape flag to false. */
-            if(($this->content_model === self::RCDATA ||
+            if (($this->content_model === self::RCDATA ||
             $this->content_model === self::CDATA) && $this->escape === true &&
             $this->character($this->char, 3) === '-->') {
                 $this->escape = false;
@@ -229,12 +229,12 @@ 
                 'data' => $char
             ));
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Emit an end-of-file token. */
             $this->EOF();
 
-        } elseif($this->content_model === self::PLAINTEXT) {
+        } elseif ($this->content_model === self::PLAINTEXT) {
             /* When the content model flag is set to the PLAINTEXT state
             THIS DIFFERS GREATLY FROM THE SPEC: Get the remaining characters of
             the text and emit it as a character token. */
@@ -280,7 +280,7 @@ 
     }
 
     private function tagOpenState() {
-        switch($this->content_model) {
+        switch ($this->content_model) {
             case self::RCDATA:
             case self::CDATA:
                 /* If the next input character is a U+002F SOLIDUS (/) character,
@@ -288,7 +288,7 @@ 
                 input character is not a U+002F SOLIDUS (/) character, emit a
                 U+003C LESS-THAN SIGN character token and switch to the data
                 state to process the next input character. */
-                if($this->character($this->char + 1) === '/') {
+                if ($this->character($this->char + 1) === '/') {
                     $this->char++;
                     $this->state = 'closeTagOpen';
 
@@ -308,17 +308,17 @@ 
                 $this->char++;
                 $char = $this->char();
 
-                if($char === '!') {
+                if ($char === '!') {
                     /* U+0021 EXCLAMATION MARK (!)
                     Switch to the markup declaration open state. */
                     $this->state = 'markupDeclarationOpen';
 
-                } elseif($char === '/') {
+                } elseif ($char === '/') {
                     /* U+002F SOLIDUS (/)
                     Switch to the close tag open state. */
                     $this->state = 'closeTagOpen';
 
-                } elseif(preg_match('/^[A-Za-z]$/', $char)) {
+                } elseif (preg_match('/^[A-Za-z]$/', $char)) {
                     /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
                     Create a new start tag token, set its tag name to the lowercase
                     version of the input character (add 0x0020 to the character's code
@@ -332,7 +332,7 @@ 
 
                     $this->state = 'tagName';
 
-                } elseif($char === '>') {
+                } elseif ($char === '>') {
                     /* U+003E GREATER-THAN SIGN (>)
                     Parse error. Emit a U+003C LESS-THAN SIGN character token and a
                     U+003E GREATER-THAN SIGN character token. Switch to the data state. */
@@ -343,7 +343,7 @@ 
 
                     $this->state = 'data';
 
-                } elseif($char === '?') {
+                } elseif ($char === '?') {
                     /* U+003F QUESTION MARK (?)
                     Parse error. Switch to the bogus comment state. */
                     $this->state = 'bogusComment';
@@ -368,7 +368,7 @@ 
         $next_node = strtolower($this->characters('A-Za-z', $this->char + 1));
         $the_same = count($this->tree->stack) > 0 && $next_node === end($this->tree->stack)->nodeName;
 
-        if(($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
+        if (($this->content_model === self::RCDATA || $this->content_model === self::CDATA) &&
         (!$the_same || ($the_same && (!preg_match('/[\t\n\x0b\x0c >\/]/',
         $this->character($this->char + 1 + strlen($next_node))) || $this->EOF === $this->char)))) {
             /* If the content model flag is set to the RCDATA or CDATA states then
@@ -400,7 +400,7 @@ 
             $this->char++;
             $char = $this->char();
 
-            if(preg_match('/^[A-Za-z]$/', $char)) {
+            if (preg_match('/^[A-Za-z]$/', $char)) {
                 /* U+0041 LATIN LETTER A through to U+005A LATIN LETTER Z
                 Create a new end tag token, set its tag name to the lowercase version
                 of the input character (add 0x0020 to the character's code point), then
@@ -413,12 +413,12 @@ 
 
                 $this->state = 'tagName';
 
-            } elseif($char === '>') {
+            } elseif ($char === '>') {
                 /* U+003E GREATER-THAN SIGN (>)
                 Parse error. Switch to the data state. */
                 $this->state = 'data';
 
-            } elseif($this->char === $this->EOF) {
+            } elseif ($this->char === $this->EOF) {
                 /* EOF
                 Parse error. Emit a U+003C LESS-THAN SIGN character token and a U+002F
                 SOLIDUS character token. Reconsume the EOF character in the data state. */
@@ -442,7 +442,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -451,13 +451,13 @@ 
             Switch to the before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
@@ -466,7 +466,7 @@ 
             $this->char--;
             $this->state = 'data';
 
-        } elseif($char === '/') {
+        } elseif ($char === '/') {
             /* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the before
             attribute name state. */
@@ -486,7 +486,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -495,19 +495,19 @@ 
             Stay in the before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($char === '/') {
+        } elseif ($char === '/') {
             /* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Stay in the before
             attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
@@ -535,7 +535,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -544,24 +544,24 @@ 
             Stay in the before attribute name state. */
             $this->state = 'afterAttributeName';
 
-        } elseif($char === '=') {
+        } elseif ($char === '=') {
             /* U+003D EQUALS SIGN (=)
             Switch to the before attribute value state. */
             $this->state = 'beforeAttributeValue';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+        } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
             /* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the before
             attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
@@ -586,7 +586,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -595,24 +595,24 @@ 
             Stay in the after attribute name state. */
             $this->state = 'afterAttributeName';
 
-        } elseif($char === '=') {
+        } elseif ($char === '=') {
             /* U+003D EQUALS SIGN (=)
             Switch to the before attribute value state. */
             $this->state = 'beforeAttributeValue';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($char === '/' && $this->character($this->char + 1) !== '>') {
+        } elseif ($char === '/' && $this->character($this->char + 1) !== '>') {
             /* U+002F SOLIDUS (/)
             Parse error unless this is a permitted slash. Switch to the
             before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the EOF
             character in the data state. */
@@ -640,7 +640,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -649,24 +649,24 @@ 
             Stay in the before attribute value state. */
             $this->state = 'beforeAttributeValue';
 
-        } elseif($char === '"') {
+        } elseif ($char === '"') {
             /* U+0022 QUOTATION MARK (")
             Switch to the attribute value (double-quoted) state. */
             $this->state = 'attributeValueDoubleQuoted';
 
-        } elseif($char === '&') {
+        } elseif ($char === '&') {
             /* U+0026 AMPERSAND (&)
             Switch to the attribute value (unquoted) state and reconsume
             this input character. */
             $this->char--;
             $this->state = 'attributeValueUnquoted';
 
-        } elseif($char === '\'') {
+        } elseif ($char === '\'') {
             /* U+0027 APOSTROPHE (')
             Switch to the attribute value (single-quoted) state. */
             $this->state = 'attributeValueSingleQuoted';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
@@ -688,17 +688,17 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if($char === '"') {
+        if ($char === '"') {
             /* U+0022 QUOTATION MARK (")
             Switch to the before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
+        } elseif ($char === '&') {
             /* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
             $this->entityInAttributeValueState('double');
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the character
             in the data state. */
@@ -723,17 +723,17 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if($char === '\'') {
+        if ($char === '\'') {
             /* U+0022 QUOTATION MARK (')
             Switch to the before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
+        } elseif ($char === '&') {
             /* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
             $this->entityInAttributeValueState('single');
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* EOF
             Parse error. Emit the current tag token. Reconsume the character
             in the data state. */
@@ -758,7 +758,7 @@ 
         $this->char++;
         $char = $this->character($this->char);
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             /* U+0009 CHARACTER TABULATION
             U+000A LINE FEED (LF)
             U+000B LINE TABULATION
@@ -767,12 +767,12 @@ 
             Switch to the before attribute name state. */
             $this->state = 'beforeAttributeName';
 
-        } elseif($char === '&') {
+        } elseif ($char === '&') {
             /* U+0026 AMPERSAND (&)
             Switch to the entity in attribute value state. */
             $this->entityInAttributeValueState();
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             /* U+003E GREATER-THAN SIGN (>)
             Emit the current tag token. Switch to the data state. */
             $this->emitToken($this->token);
@@ -825,7 +825,7 @@ 
         $this->state = 'data';
 
         /* If the end of the file was reached, reconsume the EOF character. */
-        if($this->char === $this->EOF) {
+        if ($this->char === $this->EOF) {
             $this->char = $this->EOF - 1;
         }
     }
@@ -834,7 +834,7 @@ 
         /* If the next two characters are both U+002D HYPHEN-MINUS (-)
         characters, consume those two characters, create a comment token whose
         data is the empty string, and switch to the comment state. */
-        if($this->character($this->char + 1, 2) === '--') {
+        if ($this->character($this->char + 1, 2) === '--') {
             $this->char += 2;
             $this->state = 'comment';
             $this->token = array(
@@ -845,7 +845,7 @@ 
         /* Otherwise if the next seven chacacters are a case-insensitive match
         for the word "DOCTYPE", then consume those characters and switch to the
         DOCTYPE state. */
-        } elseif(strtolower($this->character($this->char + 1, 7)) === 'doctype') {
+        } elseif (strtolower($this->character($this->char + 1, 7)) === 'doctype') {
             $this->char += 7;
             $this->state = 'doctype';
 
@@ -864,12 +864,12 @@ 
         $char = $this->char();
 
         /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
+        if ($char === '-') {
             /* Switch to the comment dash state  */
             $this->state = 'commentDash';
 
         /* EOF */
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* Parse error. Emit the comment token. Reconsume the EOF character
             in the data state. */
             $this->emitToken($this->token);
@@ -890,12 +890,12 @@ 
         $char = $this->char();
 
         /* U+002D HYPHEN-MINUS (-) */
-        if($char === '-') {
+        if ($char === '-') {
             /* Switch to the comment end state  */
             $this->state = 'commentEnd';
 
         /* EOF */
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             /* Parse error. Emit the comment token. Reconsume the EOF character
             in the data state. */
             $this->emitToken($this->token);
@@ -916,14 +916,14 @@ 
         $this->char++;
         $char = $this->char();
 
-        if($char === '>') {
+        if ($char === '>') {
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($char === '-') {
+        } elseif ($char === '-') {
             $this->token['data'] .= '-';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
             $this->char--;
             $this->state = 'data';
@@ -939,7 +939,7 @@ 
         $this->char++;
         $char = $this->char();
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             $this->state = 'beforeDoctypeName';
 
         } else {
@@ -953,10 +953,10 @@ 
         $this->char++;
         $char = $this->char();
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             // Stay in the before DOCTYPE name state.
 
-        } elseif(preg_match('/^[a-z]$/', $char)) {
+        } elseif (preg_match('/^[a-z]$/', $char)) {
             $this->token = array(
                 'name' => strtoupper($char),
                 'type' => self::DOCTYPE,
@@ -965,7 +965,7 @@ 
 
             $this->state = 'doctypeName';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             $this->emitToken(array(
                 'name' => null,
                 'type' => self::DOCTYPE,
@@ -974,7 +974,7 @@ 
 
             $this->state = 'data';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             $this->emitToken(array(
                 'name' => null,
                 'type' => self::DOCTYPE,
@@ -1000,17 +1000,17 @@ 
         $this->char++;
         $char = $this->char();
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             $this->state = 'AfterDoctypeName';
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif(preg_match('/^[a-z]$/', $char)) {
+        } elseif (preg_match('/^[a-z]$/', $char)) {
             $this->token['name'] .= strtoupper($char);
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
             $this->char--;
             $this->state = 'data';
@@ -1029,14 +1029,14 @@ 
         $this->char++;
         $char = $this->char();
 
-        if(preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
+        if (preg_match('/^[\t\n\x0b\x0c ]$/', $char)) {
             // Stay in the DOCTYPE name state.
 
-        } elseif($char === '>') {
+        } elseif ($char === '>') {
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
             $this->char--;
             $this->state = 'data';
@@ -1052,11 +1052,11 @@ 
         $this->char++;
         $char = $this->char();
 
-        if($char === '>') {
+        if ($char === '>') {
             $this->emitToken($this->token);
             $this->state = 'data';
 
-        } elseif($this->char === $this->EOF) {
+        } elseif ($this->char === $this->EOF) {
             $this->emitToken($this->token);
             $this->char--;
             $this->state = 'data';
@@ -1075,13 +1075,13 @@ 
         // The behaviour depends on the identity of the next character (the
         // one immediately after the U+0026 AMPERSAND character): 
 
-        switch($this->character($this->char + 1)) {
+        switch ($this->character($this->char + 1)) {
             // U+0023 NUMBER SIGN (#)
             case '#':
 
                 // The behaviour further depends on the character after the
                 // U+0023 NUMBER SIGN:
-                switch($this->character($this->char + 1)) {
+                switch ($this->character($this->char + 1)) {
                     // U+0078 LATIN SMALL LETTER X
                     // U+0058 LATIN CAPITAL LETTER X
                     case 'x':
@@ -1124,12 +1124,12 @@ 
                 $e_name = $this->characters('0-9A-Za-z;', $this->char + 1);
                 $len = strlen($e_name);
 
-                for($c = 1; $c <= $len; $c++) {
+                for ($c = 1; $c <= $len; $c++) {
                     $id = substr($e_name, 0, $c);
                     $this->char++;
 
-                    if(in_array($id, $this->entities)) {
-                        if ($e_name[$c-1] !== ';') {
+                    if (in_array($id, $this->entities)) {
+                        if ($e_name[$c - 1] !== ';') {
                             if ($c < $len && $e_name[$c] == ';') {
                                 $this->char++; // consume extra semicolon
                             }
@@ -1144,7 +1144,7 @@ 
             break;
         }
 
-        if(!$cond) {
+        if (!$cond) {
             // If no match can be made, then this is a parse error. No
             // characters are consumed, and nothing is returned.
             $this->char = $start;
@@ -1159,10 +1159,10 @@ 
     private function emitToken($token) {
         $emit = $this->tree->emitToken($token);
 
-        if(is_int($emit)) {
+        if (is_int($emit)) {
             $this->content_model = $emit;
 
-        } elseif($token['type'] === self::ENDTAG) {
+        } elseif ($token['type'] === self::ENDTAG) {
             $this->content_model = self::PCDATA;
         }
     }
@@ -1187,15 +1187,15 @@ 
     private $head_pointer = null;
     private $form_pointer = null;
 
-    private $scoping = array('button','caption','html','marquee','object','table','td','th');
-    private $formatting = array('a','b','big','em','font','i','nobr','s','small','strike','strong','tt','u');
-    private $special = array('address','area','base','basefont','bgsound',
-    'blockquote','body','br','center','col','colgroup','dd','dir','div','dl',
-    'dt','embed','fieldset','form','frame','frameset','h1','h2','h3','h4','h5',
-    'h6','head','hr','iframe','image','img','input','isindex','li','link',
-    'listing','menu','meta','noembed','noframes','noscript','ol','optgroup',
-    'option','p','param','plaintext','pre','script','select','spacer','style',
-    'tbody','textarea','tfoot','thead','title','tr','ul','wbr');
+    private $scoping = array('button', 'caption', 'html', 'marquee', 'object', 'table', 'td', 'th');
+    private $formatting = array('a', 'b', 'big', 'em', 'font', 'i', 'nobr', 's', 'small', 'strike', 'strong', 'tt', 'u');
+    private $special = array('address', 'area', 'base', 'basefont', 'bgsound',
+    'blockquote', 'body', 'br', 'center', 'col', 'colgroup', 'dd', 'dir', 'div', 'dl',
+    'dt', 'embed', 'fieldset', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5',
+    'h6', 'head', 'hr', 'iframe', 'image', 'img', 'input', 'isindex', 'li', 'link',
+    'listing', 'menu', 'meta', 'noembed', 'noframes', 'noscript', 'ol', 'optgroup',
+    'option', 'p', 'param', 'plaintext', 'pre', 'script', 'select', 'spacer', 'style',
+    'tbody', 'textarea', 'tfoot', 'thead', 'title', 'tr', 'ul', 'wbr');
 
     // The different phases.
     const INIT_PHASE = 0;
@@ -1240,7 +1240,7 @@ 
 
     // Process tag tokens
     public function emitToken($token) {
-        switch($this->phase) {
+        switch ($this->phase) {
             case self::INIT_PHASE: return $this->initPhase($token); break;
             case self::ROOT_PHASE: return $this->rootElementPhase($token); break;
             case self::MAIN_PHASE: return $this->mainPhase($token); break;
@@ -1260,7 +1260,7 @@ 
             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']) ||
+        if ((isset($token['error']) && $token['error']) ||
         $token['type'] === HTML5::COMMENT ||
         $token['type'] === HTML5::STARTTAG ||
         $token['type'] === HTML5::ENDTAG ||
@@ -1276,7 +1276,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
@@ -1290,7 +1290,7 @@ 
         /* 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('/^[\t\n\x0b\x0c ]+$/',
+        } elseif (isset($token['data']) && preg_match('/^[\t\n\x0b\x0c ]+$/',
         $token['data'])) {
             /* Append that character  to the Document node. */
             $text = $this->dom->createTextNode($token['data']);
@@ -1303,11 +1303,11 @@ 
         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']);
@@ -1316,7 +1316,7 @@ 
         /* 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 &&
+        } 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']);
@@ -1328,7 +1328,7 @@ 
         A start tag token
         An end tag token
         An end-of-file token */
-        } elseif(($token['type'] === HTML5::CHARACTR &&
+        } elseif (($token['type'] === HTML5::CHARACTR &&
         !preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) ||
         $token['type'] === HTML5::STARTTAG ||
         $token['type'] === HTML5::ENDTAG ||
@@ -1349,11 +1349,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. */
 
@@ -1361,21 +1361,21 @@ 
             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'])) {
+            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();
 
         /* Anything else. */
         } else {
             /* Depends on the insertion mode: */
-            switch($this->mode) {
+            switch ($this->mode) {
                 case self::BEFOR_HEAD: return $this->beforeHead($token); break;
                 case self::IN_HEAD:    return $this->inHead($token); break;
                 case self::AFTER_HEAD: return $this->afterHead($token); break;
@@ -1401,19 +1401,19 @@ 
         /* 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 &&
+        if ($token['type'] === HTML5::CHARACTR &&
         preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
             /* Append the character to the current node. */
             $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']);
 
         /* 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);
@@ -1429,7 +1429,7 @@ 
         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 ||
+        } elseif ($token['type'] === HTML5::STARTTAG ||
         ($token['type'] === HTML5::ENDTAG && $token['name'] === 'html') ||
         ($token['type'] === HTML5::CHARACTR && !preg_match('/^[\t\n\x0b\x0c ]$/',
         $token['data']))) {
@@ -1444,7 +1444,7 @@ 
             return $this->inHead($token);
 
         /* Any other end tag */
-        } elseif($token['type'] === HTML5::ENDTAG) {
+        } elseif ($token['type'] === HTML5::ENDTAG) {
             /* Parse error. Ignore the token. */
         }
     }
@@ -1459,7 +1459,7 @@ 
         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 &&
+        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')))) {
@@ -1467,22 +1467,22 @@ 
             $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']);
 
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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. */
-            if($this->head_pointer !== null) {
+            if ($this->head_pointer !== null) {
                 $element = $this->insertElement($token, false);
                 $this->head_pointer->appendChild($element);
 
@@ -1494,11 +1494,11 @@ 
             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. */
-            if($this->head_pointer !== null) {
+            if ($this->head_pointer !== null) {
                 $element = $this->insertElement($token, false);
                 $this->head_pointer->appendChild($element);
 
@@ -1510,7 +1510,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);
@@ -1519,12 +1519,12 @@ 
             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'))) {
             /* 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. */
-            if($this->head_pointer !== null) {
+            if ($this->head_pointer !== null) {
                 $element = $this->insertElement($token, false);
                 $this->head_pointer->appendChild($element);
                 array_pop($this->stack);
@@ -1534,10 +1534,10 @@ 
             }
 
         /* 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))) {
+            if ($this->head_pointer->isSameNode(end($this->stack))) {
                 array_pop($this->stack);
 
             /* Otherwise, this is a parse error. */
@@ -1549,7 +1549,7 @@ 
             $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') ||
+        } elseif (($token['type'] === HTML5::STARTTAG && $token['name'] === 'head') ||
         ($token['type'] === HTML5::ENDTAG && $token['name'] !== 'html')) {
             // Parse error. Ignore the token.
 
@@ -1557,7 +1557,7 @@ 
         } else {
             /* If the current node is a head element, act as if an end tag
             token with the tag name "head" had been seen. */
-            if($this->head_pointer->isSameNode(end($this->stack))) {
+            if ($this->head_pointer->isSameNode(end($this->stack))) {
                 $this->inHead(array(
                     'name' => 'head',
                     'type' => HTML5::ENDTAG
@@ -1579,19 +1579,19 @@ 
         /* 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 &&
+        if ($token['type'] === HTML5::CHARACTR &&
         preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
             /* Append the character to the current node. */
             $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']);
 
         /* 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);
 
@@ -1599,7 +1599,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);
 
@@ -1608,7 +1608,7 @@ 
 
         /* 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'))) {
             /* Parse error. Switch the insertion mode back to "in head" and
             reprocess the token. */
@@ -1632,7 +1632,7 @@ 
     private function inBody($token) {
         /* Handle the token as follows: */
 
-        switch($token['type']) {
+        switch ($token['type']) {
             /* A character token */
             case HTML5::CHARACTR:
                 /* Reconstruct the active formatting elements, if any. */
@@ -1650,7 +1650,7 @@ 
             break;
 
             case HTML5::STARTTAG:
-            switch($token['name']) {
+            switch ($token['name']) {
                 /* A start tag token whose tag name is one of: "script",
                 "style" */
                 case 'script': case 'style':
@@ -1673,7 +1673,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
@@ -1682,8 +1682,8 @@ 
                     add the attribute and its corresponding value to that
                     element. */
                     } else {
-                        foreach($token['attr'] as $attr) {
-                            if(!$this->stack[1]->hasAttribute($attr['name'])) {
+                        foreach ($token['attr'] as $attr) {
+                            if (!$this->stack[1]->hasAttribute($attr['name'])) {
                                 $this->stack[1]->setAttribute($attr['name'], $attr['value']);
                             }
                         }
@@ -1699,7 +1699,7 @@ 
                     /* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -1714,7 +1714,7 @@ 
                 case 'form':
                     /* If the form element pointer is not null, ignore the
                     token with a parse error. */
-                    if($this->form_pointer !== null) {
+                    if ($this->form_pointer !== null) {
                         // Ignore.
 
                     /* Otherwise: */
@@ -1722,7 +1722,7 @@ 
                         /* If the stack of open elements has a p element in
                         scope, then act as if an end tag with the tag name p
                         had been seen. */
-                        if($this->elementInScope('p')) {
+                        if ($this->elementInScope('p')) {
                             $this->emitToken(array(
                                 'name' => 'p',
                                 'type' => HTML5::ENDTAG
@@ -1741,7 +1741,7 @@ 
                     /* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -1750,7 +1750,7 @@ 
 
                     $stack_length = count($this->stack) - 1;
 
-                    for($n = $stack_length; 0 <= $n; $n--) {
+                    for ($n = $stack_length; 0 <= $n; $n--) {
                         /* 1. Initialise node to be the current node (the
                         bottommost node of the stack). */
                         $stop = false;
@@ -1760,9 +1760,9 @@ 
                         /* 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--) {
+                            for ($x = $stack_length; $x >= $n; $x--) {
                                 array_pop($this->stack);
                             }
 
@@ -1772,7 +1772,7 @@ 
                         /* 3. If node is not in the formatting category, and is
                         not    in the phrasing category, and is not an address or
                         div element, then stop this algorithm. */
-                        if($cat !== self::FORMATTING && $cat !== self::PHRASING &&
+                        if ($cat !== self::FORMATTING && $cat !== self::PHRASING &&
                         $node->tagName !== 'address' && $node->tagName !== 'div') {
                             break;
                         }
@@ -1788,7 +1788,7 @@ 
                     /* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been
                     seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -1806,7 +1806,7 @@ 
                 case 'h1': case 'h2': case 'h3': case 'h4': case 'h5': case 'h6':
                     /* If the stack of open elements has a p  element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -1818,7 +1818,7 @@ 
                     this is a parse error; pop elements from the stack until an
                     element with one of those tag names has been popped from the
                     stack. */
-                    while($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+                    while ($this->elementInScope(array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
                         array_pop($this->stack);
                     }
 
@@ -1839,11 +1839,11 @@ 
                     might not have if the element is not in table scope). */
                     $leng = count($this->a_formatting);
 
-                    for($n = $leng - 1; $n >= 0; $n--) {
-                        if($this->a_formatting[$n] === self::MARKER) {
+                    for ($n = $leng - 1; $n >= 0; $n--) {
+                        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',
                                 'type' => HTML5::ENDTAG
@@ -1885,7 +1885,7 @@ 
                     then this is a parse error; act as if an end tag with the tag
                     name "button" had been seen, then reprocess the token. (We don't
                     do that. Unnecessary.) */
-                    if($this->elementInScope('button')) {
+                    if ($this->elementInScope('button')) {
                         $this->inBody(array(
                             'name' => 'button',
                             'type' => HTML5::ENDTAG
@@ -1932,7 +1932,7 @@ 
                 case 'table':
                     /* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -1965,7 +1965,7 @@ 
                 case 'hr':
                     /* If the stack of open elements has a p element in scope,
                     then act as if an end tag with the tag name p had been seen. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->emitToken(array(
                             'name' => 'p',
                             'type' => HTML5::ENDTAG
@@ -2013,7 +2013,7 @@ 
 
                     /* If the form element pointer is not null,
                     then ignore the token. */
-                    if($this->form_pointer === null) {
+                    if ($this->form_pointer === null) {
                         /* Act as if a start tag token with the tag name "form" had
                         been seen. */
                         $this->inBody(array(
@@ -2158,18 +2158,18 @@ 
             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
                     is a parse error. */
-                    } elseif(end($this->stack)->nodeName !== 'body') {
+                    } elseif (end($this->stack)->nodeName !== 'body') {
                         // Parse error.
                     }
 
@@ -2199,7 +2199,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
@@ -2211,8 +2211,8 @@ 
                         scope with the same tag name as that of the token,
                         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']) {
+                        for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if ($this->stack[$n]->nodeName === $token['name']) {
                                 $n = -1;
                             }
 
@@ -2226,12 +2226,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. */
@@ -2252,7 +2252,7 @@ 
                 case 'p':
                     /* If the stack of open elements has a p element in scope,
                     then generate implied end tags, except for p elements. */
-                    if($this->elementInScope('p')) {
+                    if ($this->elementInScope('p')) {
                         $this->generateImpliedEndTags(array('p'));
 
                         /* If the current node is not a p element, then this is
@@ -2262,8 +2262,8 @@ 
                         /* If the stack of open elements has a p element in
                         scope, then pop elements from this stack until the stack
                         no longer has a p element in scope. */
-                        for($n = count($this->stack) - 1; $n >= 0; $n--) {
-                            if($this->elementInScope('p')) {
+                        for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if ($this->elementInScope('p')) {
                                 array_pop($this->stack);
 
                             } else {
@@ -2279,7 +2279,7 @@ 
                     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'])) {
+                    if ($this->elementInScope($token['name'])) {
                         $this->generateImpliedEndTags(array($token['name']));
 
                         /* If the current node is not an element with the same
@@ -2290,8 +2290,8 @@ 
                         whose tag name matches the tag name of the token, 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']) {
+                        for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if ($this->stack[$n]->nodeName === $token['name']) {
                                 $n = -1;
                             }
 
@@ -2308,7 +2308,7 @@ 
                     /* If the stack of open elements has in scope an element whose
                     tag name is one of "h1", "h2", "h3", "h4", "h5", or "h6", then
                     generate implied end tags. */
-                    if($this->elementInScope($elements)) {
+                    if ($this->elementInScope($elements)) {
                         $this->generateImpliedEndTags();
 
                         /* Now, if the current node is not an element with the same
@@ -2319,7 +2319,7 @@ 
                         whose tag name is one of "h1", "h2", "h3", "h4", "h5", or
                         "h6", then pop elements from the stack until an element
                         with one of those tag names has been popped from the stack. */
-                        while($this->elementInScope($elements)) {
+                        while ($this->elementInScope($elements)) {
                             array_pop($this->stack);
                         }
                     }
@@ -2337,12 +2337,12 @@ 
                         otherwise, and
                         * has the same tag name as the token.
                     */
-                    while(true) {
-                        for($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
-                            if($this->a_formatting[$a] === self::MARKER) {
+                    while (true) {
+                        for ($a = count($this->a_formatting) - 1; $a >= 0; $a--) {
+                            if ($this->a_formatting[$a] === self::MARKER) {
                                 break;
 
-                            } elseif($this->a_formatting[$a]->tagName === $token['name']) {
+                            } 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;
@@ -2354,7 +2354,7 @@ 
                         also in the stack of open elements but the element
                         is not in scope, then this is a parse error. Abort
                         these steps. The token is ignored. */
-                        if(!isset($formatting_element) || ($in_stack &&
+                        if (!isset($formatting_element) || ($in_stack &&
                         !$this->elementInScope($token['name']))) {
                             break;
 
@@ -2362,7 +2362,7 @@ 
                         is not in the stack of open elements, then this is a
                         parse error; remove the element from the list, and
                         abort these steps. */
-                        } elseif(isset($formatting_element) && !$in_stack) {
+                        } elseif (isset($formatting_element) && !$in_stack) {
                             unset($this->a_formatting[$fe_af_pos]);
                             $this->a_formatting = array_merge($this->a_formatting);
                             break;
@@ -2376,10 +2376,10 @@ 
                         $fe_s_pos = array_search($formatting_element, $this->stack, true);
                         $length = count($this->stack);
 
-                        for($s = $fe_s_pos + 1; $s < $length; $s++) {
+                        for ($s = $fe_s_pos + 1; $s < $length; $s++) {
                             $category = $this->getElementCategory($this->stack[$s]->nodeName);
 
-                            if($category !== self::PHRASING && $category !== self::FORMATTING) {
+                            if ($category !== self::PHRASING && $category !== self::FORMATTING) {
                                 $furthest_block = $this->stack[$s];
                             }
                         }
@@ -2390,8 +2390,8 @@ 
                         elements, from the current node up to the formatting
                         element, and remove the formatting element from the
                         list of active formatting elements. */
-                        if(!isset($furthest_block)) {
-                            for($n = $length - 1; $n >= $fe_s_pos; $n--) {
+                        if (!isset($furthest_block)) {
+                            for ($n = $length - 1; $n >= $fe_s_pos; $n--) {
                                 array_pop($this->stack);
                             }
 
@@ -2407,7 +2407,7 @@ 
 
                         /* 5. If the furthest block has a parent node, then
                         remove the furthest block from its parent node. */
-                        if($furthest_block->parentNode !== null) {
+                        if ($furthest_block->parentNode !== null) {
                             $furthest_block->parentNode->removeChild($furthest_block);
                         }
 
@@ -2422,8 +2422,8 @@ 
                         $node = $furthest_block;
                         $last_node = $furthest_block;
 
-                        while(true) {
-                            for($n = array_search($node, $this->stack, true) - 1; $n >= 0; $n--) {
+                        while (true) {
+                            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];
@@ -2432,7 +2432,7 @@ 
                                 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)) {
+                                if (!in_array($node, $this->a_formatting, true)) {
                                     unset($this->stack[$n]);
                                     $this->stack = array_merge($this->stack);
 
@@ -2444,14 +2444,14 @@ 
                             /* 7.3 Otherwise, if node is the formatting
                             element, then go to the next step in the overall
                             algorithm. */
-                            if($node === $formatting_element) {
+                            if ($node === $formatting_element) {
                                 break;
 
                             /* 7.4 Otherwise, if last node is the furthest
                             block, then move the aforementioned bookmark to
                             be immediately after the node in the list of
                             active formatting elements. */
-                            } elseif($last_node === $furthest_block) {
+                            } elseif ($last_node === $furthest_block) {
                                 $bookmark = array_search($node, $this->a_formatting, true) + 1;
                             }
 
@@ -2461,7 +2461,7 @@ 
                             with an entry for the clone, replace the entry
                             for node in the stack of open elements with an
                             entry for the clone, and let node be the clone. */
-                            if($node->hasChildNodes()) {
+                            if ($node->hasChildNodes()) {
                                 $clone = $node->cloneNode();
                                 $s_pos = array_search($node, $this->stack, true);
                                 $a_pos = array_search($node, $this->a_formatting, true);
@@ -2473,7 +2473,7 @@ 
 
                             /* 7.6 Insert last node into node, first removing
                             it from its previous parent node if any. */
-                            if($last_node->parentNode !== null) {
+                            if ($last_node->parentNode !== null) {
                                 $last_node->parentNode->removeChild($last_node);
                             }
 
@@ -2487,7 +2487,7 @@ 
                         the previous step into the common ancestor node,
                         first removing it from its previous parent node if
                         any. */
-                        if($last_node->parentNode !== null) {
+                        if ($last_node->parentNode !== null) {
                             $last_node->parentNode->removeChild($last_node);
                         }
 
@@ -2500,7 +2500,7 @@ 
                         /* 10. Take all of the child nodes of the furthest
                         block and append them to the clone created in the
                         last step. */
-                        while($furthest_block->hasChildNodes()) {
+                        while ($furthest_block->hasChildNodes()) {
                             $child = $furthest_block->firstChild;
                             $furthest_block->removeChild($child);
                             $clone->appendChild($child);
@@ -2545,7 +2545,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
@@ -2557,8 +2557,8 @@ 
                         elements from the stack until that element has been popped from
                         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']) {
+                        for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                            if ($this->stack[$n]->nodeName === $token['name']) {
                                 $n = -1;
                             }
 
@@ -2567,7 +2567,7 @@ 
 
                         $marker = end(array_keys($this->a_formatting, self::MARKER, true));
 
-                        for($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
+                        for ($n = count($this->a_formatting) - 1; $n > $marker; $n--) {
                             array_pop($this->a_formatting);
                         }
                     }
@@ -2587,14 +2587,14 @@ 
 
                 /* An end tag token not covered by the previous entries */
                 default:
-                    for($n = count($this->stack) - 1; $n >= 0; $n--) {
+                    for ($n = count($this->stack) - 1; $n >= 0; $n--) {
                         /* Initialise node to be the current node (the bottommost
                         node of the stack). */
                         $node = end($this->stack);
 
                         /* 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();
 
@@ -2605,14 +2605,14 @@ 
 
                             /* Pop all the nodes from the current node up to
                             node, including node, then stop this algorithm. */
-                            for($x = count($this->stack) - $n; $x >= $n; $x--) {
+                            for ($x = count($this->stack) - $n; $x >= $n; $x--) {
                                 array_pop($this->stack);
                             }
                                     
                         } else {
                             $category = $this->getElementCategory($node);
 
-                            if($category !== self::SPECIAL && $category !== self::SCOPING) {
+                            if ($category !== self::SPECIAL && $category !== self::SCOPING) {
                                 /* Otherwise, if node is in neither the formatting
                                 category nor the phrasing category, then this is a
                                 parse error. Stop this algorithm. The end tag token
@@ -2633,21 +2633,21 @@ 
         /* 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 &&
+        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']);
             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']);
             end($this->stack)->appendChild($comment);
 
         /* A start tag whose tag name is "caption" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } elseif ($token['type'] === HTML5::STARTTAG &&
         $token['name'] === 'caption') {
             /* Clear the stack back to a table context. */
             $this->clearStackToTableContext($clear);
@@ -2662,7 +2662,7 @@ 
             $this->mode = self::IN_CAPTION;
 
         /* A start tag whose tag name is "colgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } elseif ($token['type'] === HTML5::STARTTAG &&
         $token['name'] === 'colgroup') {
             /* Clear the stack back to a table context. */
             $this->clearStackToTableContext($clear);
@@ -2673,7 +2673,7 @@ 
             $this->mode = self::IN_CGROUP;
 
         /* A start tag whose tag name is "col" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } elseif ($token['type'] === HTML5::STARTTAG &&
         $token['name'] === 'col') {
             $this->inTable(array(
                 'name' => 'colgroup',
@@ -2684,7 +2684,7 @@ 
             $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'))) {
             /* Clear the stack back to a table context. */
             $this->clearStackToTableContext($clear);
@@ -2695,7 +2695,7 @@ 
             $this->mode = self::IN_TBODY;
 
         /* A start tag whose tag name is one of: "td", "th", "tr" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } 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. */
@@ -2708,7 +2708,7 @@ 
             return $this->inTableBody($token);
 
         /* A start tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } 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
@@ -2721,12 +2721,12 @@ 
             return $this->mainPhase($token);
 
         /* An end tag whose tag name is "table" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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: */
@@ -2740,11 +2740,11 @@ 
 
                 /* Pop elements from this stack until a table element has been
                 popped from the stack. */
-                while(true) {
+                while (true) {
                     $current = end($this->stack)->nodeName;
                     array_pop($this->stack);
 
-                    if($current === 'table') {
+                    if ($current === 'table') {
                         break;
                     }
                 }
@@ -2755,7 +2755,7 @@ 
 
         /* 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', 'col', 'colgroup', 'html', 'tbody', 'td',
         'tfoot', 'th', 'thead', 'tr'))) {
             // Parse error. Ignore the token.
@@ -2768,7 +2768,7 @@ 
             /* If the current node is a table, tbody, tfoot, thead, or tr
             element, then, whenever a node would be inserted into the current
             node, it must instead be inserted into the foster parent element. */
-            if(in_array(end($this->stack)->nodeName,
+            if (in_array(end($this->stack)->nodeName,
             array('table', 'tbody', 'tfoot', 'thead', 'tr'))) {
                 /* The foster parent element is the parent element of the last
                 table element in the stack of open elements, if there is a
@@ -2781,20 +2781,20 @@ 
                 its parent node is not an element, then the foster parent
                 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') {
+                for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                    if ($this->stack[$n]->nodeName === 'table') {
                         $table = $this->stack[$n];
                         break;
                     }
                 }
 
-                if(isset($table) && $table->parentNode !== null) {
+                if (isset($table) && $table->parentNode !== null) {
                     $this->foster_parent = $table->parentNode;
 
-                } elseif(!isset($table)) {
+                } elseif (!isset($table)) {
                     $this->foster_parent = $this->stack[0];
 
-                } elseif(isset($table) && ($table->parentNode === null ||
+                } elseif (isset($table) && ($table->parentNode === null ||
                 $table->parentNode->nodeType !== XML_ELEMENT_NODE)) {
                     $this->foster_parent = $this->stack[$n - 1];
                 }
@@ -2806,11 +2806,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: */
@@ -2824,11 +2824,11 @@ 
 
                 /* Pop elements from this stack until a caption element has
                 been popped from the stack. */
-                while(true) {
+                while (true) {
                     $node = end($this->stack)->nodeName;
                     array_pop($this->stack);
 
-                    if($node === 'caption') {
+                    if ($node === 'caption') {
                         break;
                     }
                 }
@@ -2844,7 +2844,7 @@ 
         /* 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', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
         'thead', 'tr'))) || ($token['type'] === HTML5::ENDTAG &&
         $token['name'] === 'table')) {
@@ -2860,7 +2860,7 @@ 
 
         /* 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', 'colgroup', 'html', 'tbody', 'tfoot', 'th',
         'thead', 'tr'))) {
             // Parse error. Ignore the token.
@@ -2876,32 +2876,32 @@ 
         /* 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 &&
+        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']);
             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']);
             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 &&
+        } 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) */
-            if(end($this->stack)->nodeName === 'html') {
+            if (end($this->stack)->nodeName === 'html') {
                 // Ignore
 
             /* Otherwise, pop the current node (which will be a colgroup
@@ -2913,7 +2913,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 */
@@ -2933,7 +2933,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);
 
@@ -2943,8 +2943,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. */
             $this->inTableBody(array(
@@ -2956,12 +2956,12 @@ 
             return $this->inRow($token);
 
         /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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: */
@@ -2977,13 +2977,13 @@ 
 
         /* 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')) {
             /* 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
             token. (innerHTML case) */
-            if(!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
+            if (!$this->elementInScope(array('tbody', 'thead', 'tfoot'), true)) {
                 // Ignore.
 
             /* Otherwise: */
@@ -3004,7 +3004,7 @@ 
 
         /* 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'))) {
             /* Parse error. Ignore the token. */
 
@@ -3019,7 +3019,7 @@ 
         $clear = array('tr', 'html');
 
         /* A start tag whose tag name is one of: "th", "td" */
-        if($token['type'] === HTML5::STARTTAG &&
+        if ($token['type'] === HTML5::STARTTAG &&
         ($token['name'] === 'th' || $token['name'] === 'td')) {
             /* Clear the stack back to a table row context. */
             $this->clearStackToTableContext($clear);
@@ -3034,11 +3034,11 @@ 
             $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: */
@@ -3055,7 +3055,7 @@ 
 
         /* 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'))) {
             /* Act as if an end tag with the tag name "tr" had been seen, then,
             if that token wasn't ignored, reprocess the current token. */
@@ -3067,12 +3067,12 @@ 
             return $this->inCell($token);
 
         /* An end tag whose tag name is one of: "tbody", "tfoot", "thead" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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: */
@@ -3089,7 +3089,7 @@ 
 
         /* 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'))) {
             /* Parse error. Ignore the token. */
 
@@ -3102,12 +3102,12 @@ 
 
     private function inCell($token) {
         /* An end tag whose tag name is one of: "td", "th" */
-        if($token['type'] === HTML5::ENDTAG &&
+        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: */
@@ -3122,11 +3122,11 @@ 
 
                 /* Pop elements from this stack until an element with the same
                 tag name as the token has been popped from the stack. */
-                while(true) {
+                while (true) {
                     $node = end($this->stack)->nodeName;
                     array_pop($this->stack);
 
-                    if($node === $token['name']) {
+                    if ($node === $token['name']) {
                         break;
                     }
                 }
@@ -3142,13 +3142,13 @@ 
 
         /* 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', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
         'thead', 'tr'))) {
             /* If the stack of open elements does not have a td or th element
             in table scope, then this is a parse error; ignore the token.
             (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
+            if (!$this->elementInScope(array('td', 'th'), true)) {
                 // Ignore.
 
             /* Otherwise, close the cell (see below) and reprocess the current
@@ -3160,13 +3160,13 @@ 
 
         /* 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', 'colgroup', 'tbody', 'td', 'tfoot', 'th',
         'thead', 'tr'))) {
             /* If the stack of open elements does not have a td or th element
             in table scope, then this is a parse error; ignore the token.
             (innerHTML case) */
-            if(!$this->elementInScope(array('td', 'th'), true)) {
+            if (!$this->elementInScope(array('td', 'th'), true)) {
                 // Ignore.
 
             /* Otherwise, close the cell (see below) and reprocess the current
@@ -3178,19 +3178,19 @@ 
 
         /* 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'))) {
             /* Parse error. Ignore the token. */
 
         /* 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'))) {
             /* If the stack of open elements does not have an element in table
             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
@@ -3211,22 +3211,22 @@ 
         /* 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']);
 
         /* 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']);
 
         /* A start tag token whose tag name is "option" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } 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. */
-            if(end($this->stack)->nodeName === 'option') {
+            if (end($this->stack)->nodeName === 'option') {
                 $this->inSelect(array(
                     'name' => 'option',
                     'type' => HTML5::ENDTAG
@@ -3237,11 +3237,11 @@ 
             $this->insertElement($token);
 
         /* A start tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::STARTTAG &&
+        } 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. */
-            if(end($this->stack)->nodeName === 'option') {
+            if (end($this->stack)->nodeName === 'option') {
                 $this->inSelect(array(
                     'name' => 'option',
                     'type' => HTML5::ENDTAG
@@ -3250,7 +3250,7 @@ 
 
             /* If the current node is an optgroup element, act as if an end tag
             with the tag name "optgroup" had been seen. */
-            if(end($this->stack)->nodeName === 'optgroup') {
+            if (end($this->stack)->nodeName === 'optgroup') {
                 $this->inSelect(array(
                     'name' => 'optgroup',
                     'type' => HTML5::ENDTAG
@@ -3261,7 +3261,7 @@ 
             $this->insertElement($token);
 
         /* An end tag token whose tag name is "optgroup" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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
@@ -3269,7 +3269,7 @@ 
             been seen. */
             $elements_in_stack = count($this->stack);
 
-            if($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
+            if ($this->stack[$elements_in_stack - 1]->nodeName === 'option' &&
             $this->stack[$elements_in_stack - 2]->nodeName === 'optgroup') {
                 $this->inSelect(array(
                     'name' => 'option',
@@ -3280,38 +3280,38 @@ 
             /* 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 &&
+        } 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,
             ignore the token. */
-            if(end($this->stack)->nodeName === 'option') {
+            if (end($this->stack)->nodeName === 'option') {
                 array_pop($this->stack);
             }
 
         /* An end tag whose tag name is "select" */
-        } elseif($token['type'] === HTML5::ENDTAG &&
+        } 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: */
             } else {
                 /* Pop elements from the stack of open elements until a select
                 element has been popped from the stack. */
-                while(true) {
+                while (true) {
                     $current = end($this->stack)->nodeName;
                     array_pop($this->stack);
 
-                    if($current === 'select') {
+                    if ($current === 'select') {
                         break;
                     }
                 }
@@ -3321,7 +3321,7 @@ 
             }
 
         /* A start tag whose tag name is "select" */
-        } elseif($token['name'] === 'select' &&
+        } 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. */
@@ -3332,7 +3332,7 @@ 
 
         /* An end tag whose tag name is one of: "caption", "table", "tbody",
         "tfoot", "thead", "tr", "td", "th" */
-        } elseif(in_array($token['name'], array('caption', 'table', 'tbody',
+        } elseif (in_array($token['name'], array('caption', 'table', 'tbody',
         'tfoot', 'thead', 'tr', 'td', 'th')) && $token['type'] === HTML5::ENDTAG) {
             /* Parse error. */
             // w/e
@@ -3341,7 +3341,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',
                     'type' => HTML5::ENDTAG
@@ -3362,14 +3362,14 @@ 
         /* 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 &&
+        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. */
@@ -3377,7 +3377,7 @@ 
             $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
@@ -3401,28 +3401,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 &&
+        if ($token['type'] === HTML5::CHARACTR &&
         preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
             /* Append the character to the current node. */
             $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']);
 
         /* A start tag with the tag name "frameset" */
-        } elseif($token['name'] === 'frameset' &&
+        } elseif ($token['name'] === 'frameset' &&
         $token['type'] === HTML5::STARTTAG) {
             $this->insertElement($token);
 
         /* An end tag with the tag name "frameset" */
-        } elseif($token['name'] === 'frameset' &&
+        } 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) */
-            if(end($this->stack)->nodeName === 'html') {
+            if (end($this->stack)->nodeName === 'html') {
                 // Ignore
 
             } else {
@@ -3438,7 +3438,7 @@ 
             }
 
         /* A start tag with the tag name "frame" */
-        } elseif($token['name'] === 'frame' &&
+        } elseif ($token['name'] === 'frame' &&
         $token['type'] === HTML5::STARTTAG) {
             /* Insert an HTML element for the token. */
             $this->insertElement($token);
@@ -3447,7 +3447,7 @@ 
             array_pop($this->stack);
 
         /* A start tag with the tag name "noframes" */
-        } elseif($token['name'] === 'noframes' &&
+        } elseif ($token['name'] === 'noframes' &&
         $token['type'] === HTML5::STARTTAG) {
             /* Process the token as if the insertion mode had been "in body". */
             $this->inBody($token);
@@ -3464,25 +3464,25 @@ 
         /* 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 &&
+        if ($token['type'] === HTML5::CHARACTR &&
         preg_match('/^[\t\n\x0b\x0c ]+$/', $token['data'])) {
             /* Append the character to the current node. */
             $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']);
 
         /* An end tag with the tag name "html" */
-        } elseif($token['name'] === 'html' &&
+        } 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' &&
+        } elseif ($token['name'] === 'noframes' &&
         $token['type'] === HTML5::STARTTAG) {
             /* Process the token as if the insertion mode had been "in body". */
             $this->inBody($token);
@@ -3498,11 +3498,11 @@ 
         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']);
@@ -3511,7 +3511,7 @@ 
         /* 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 &&
+        } 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);
@@ -3519,7 +3519,7 @@ 
         /* 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 &&
+        } 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
@@ -3528,7 +3528,7 @@ 
             return $this->mainPhase($token);
 
         /* An end-of-file token */
-        } elseif($token['type'] === HTML5::EOF) {
+        } elseif ($token['type'] === HTML5::EOF) {
             /* OMG DONE!! */
         }
     }
@@ -3547,8 +3547,8 @@ 
         
         $el = $this->dom->createElement($token['name']);
 
-        foreach($token['attr'] as $attr) {
-            if(!$el->hasAttribute($attr['name'])) {
+        foreach ($token['attr'] as $attr) {
+            if (!$el->hasAttribute($attr['name'])) {
                 $el->setAttribute($attr['name'], $attr['value']);
             }
         }
@@ -3570,25 +3570,25 @@ 
     }
 
     private function appendToRealParent($node) {
-        if($this->foster_parent === null) {
+        if ($this->foster_parent === null) {
             end($this->stack)->appendChild($node);
 
-        } elseif($this->foster_parent !== null) {
+        } elseif ($this->foster_parent !== null) {
             /* If the foster parent element is the parent element of the
             last table element in the stack of open elements, then the new
             node must be inserted immediately before the last table element
             in the stack of open elements in the foster parent element;
             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' &&
+            for ($n = count($this->stack) - 1; $n >= 0; $n--) {
+                if ($this->stack[$n]->nodeName === 'table' &&
                 $this->stack[$n]->parentNode !== null) {
                     $table = $this->stack[$n];
                     break;
                 }
             }
 
-            if(isset($table) && $this->foster_parent->isSameNode($table->parentNode))
+            if (isset($table) && $this->foster_parent->isSameNode($table->parentNode))
                 $this->foster_parent->insertBefore($node, $table);
             else
                 $this->foster_parent->appendChild($node);
@@ -3598,9 +3598,9 @@ 
     }
 
     private function elementInScope($el, $table = false) {
-        if(is_array($el)) {
-            foreach($el as $element) {
-                if($this->elementInScope($element, $table)) {
+        if (is_array($el)) {
+            foreach ($el as $element) {
+                if ($this->elementInScope($element, $table)) {
                     return true;
                 }
             }
@@ -3610,28 +3610,28 @@ 
 
         $leng = count($this->stack);
 
-        for($n = 0; $n < $leng; $n++) {
+        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];
 
-            if($node->tagName === $el) {
+            if ($node->tagName === $el) {
                 /* 2. If node is the target node, terminate in a match state. */
                 return true;
 
-            } elseif($node->tagName === 'table') {
+            } elseif ($node->tagName === 'table') {
                 /* 3. Otherwise, if node is a table element, terminate in a failure
                 state. */
                 return false;
 
-            } elseif($table === true && in_array($node->tagName, array('caption', 'td',
+            } elseif ($table === true && in_array($node->tagName, array('caption', 'td',
             'th', 'button', 'marquee', 'object'))) {
                 /* 4. Otherwise, if the algorithm is the "has an element in scope"
                 variant (rather than the "has an element in table scope" variant),
                 and node is one of the following, terminate in a failure state. */
                 return false;
 
-            } elseif($node === $node->ownerDocument->documentElement) {
+            } elseif ($node === $node->ownerDocument->documentElement) {
                 /* 5. Otherwise, if node is an html element (root element), terminate
                 in a failure state. (This can only happen if the node is the topmost
                 node of the    stack of open elements, and prevents the next step from
@@ -3651,7 +3651,7 @@ 
         then there is nothing to reconstruct; stop this algorithm. */
         $formatting_elements = count($this->a_formatting);
 
-        if($formatting_elements === 0) {
+        if ($formatting_elements === 0) {
             return false;
         }
 
@@ -3663,14 +3663,14 @@ 
         formatting elements is a marker, or if it is an element that is in the
         stack of open elements, then there is nothing to reconstruct; stop this
         algorithm. */
-        if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+        if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
             return false;
         }
 
-        for($a = $formatting_elements - 1; $a >= 0; true) {
+        for ($a = $formatting_elements - 1; $a >= 0; true) {
             /* 4. If there are no entries before entry in the list of active
             formatting elements, then jump to step 8. */
-            if($a === 0) {
+            if ($a === 0) {
                 $step_seven = false;
                 break;
             }
@@ -3682,15 +3682,15 @@ 
 
             /* 6. If entry is neither a marker nor an element that is also in
             thetack of open elements, go to step 4. */
-            if($entry === self::MARKER || in_array($entry, $this->stack, true)) {
+            if ($entry === self::MARKER || in_array($entry, $this->stack, true)) {
                 break;
             }
         }
 
-        while(true) {
+        while (true) {
             /* 7. Let entry be the element one later than entry in the list of
             active formatting elements. */
-            if(isset($step_seven) && $step_seven === true) {
+            if (isset($step_seven) && $step_seven === true) {
                 $a++;
                 $entry = $this->a_formatting[$a];
             }
@@ -3709,7 +3709,7 @@ 
 
             /* 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. */
-            if(end($this->a_formatting) !== $clone) {
+            if (end($this->a_formatting) !== $clone) {
                 $step_seven = true;
             } else {
                 break;
@@ -3722,7 +3722,7 @@ 
         formatting elements up to the last marker, the UA must perform the
         following steps: */
 
-        while(true) {
+        while (true) {
             /* 1. Let entry be the last (most recently added) entry in the list
             of active formatting elements. */
             $entry = end($this->a_formatting);
@@ -3732,7 +3732,7 @@ 
 
             /* 3. If entry was a marker, then stop the algorithm at this point.
             The list has been cleared up to the last marker. */
-            if($entry === self::MARKER) {
+            if ($entry === self::MARKER) {
                 break;
             }
         }
@@ -3747,20 +3747,20 @@ 
         $node = end($this->stack);
         $elements = array_diff(array('dd', 'dt', 'li', 'p', 'td', 'th', 'tr'), $exclude);
 
-        while(in_array(end($this->stack)->nodeName, $elements)) {
+        while (in_array(end($this->stack)->nodeName, $elements)) {
             array_pop($this->stack);
         }
     }
 
     private function getElementCategory($node) {
         $name = $node->tagName;
-        if(in_array($name, $this->special))
+        if (in_array($name, $this->special))
             return self::SPECIAL;
 
-        elseif(in_array($name, $this->scoping))
+        elseif (in_array($name, $this->scoping))
             return self::SCOPING;
 
-        elseif(in_array($name, $this->formatting))
+        elseif (in_array($name, $this->formatting))
             return self::FORMATTING;
 
         else
@@ -3773,10 +3773,10 @@ 
         a table element or an html element, pop elements from the stack of open
         elements. If this causes any elements to be popped from the stack, then
         this is a parse error. */
-        while(true) {
+        while (true) {
             $node = end($this->stack)->nodeName;
 
-            if(in_array($node, $elements)) {
+            if (in_array($node, $elements)) {
                 break;
             } else {
                 array_pop($this->stack);
@@ -3789,7 +3789,7 @@ 
         $last = false;
         $leng = count($this->stack);
 
-        for($n = $leng - 1; $n >= 0; $n--) {
+        for ($n = $leng - 1; $n >= 0; $n--) {
             /* 2. Let node be the last node in the stack of open elements. */
             $node = $this->stack[$n];
 
@@ -3797,68 +3797,68 @@ 
             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;
             }
 
             /* 4. If node is a select element, then switch the insertion mode to
             "in select" and abort these steps. (innerHTML case) */
-            if($node->nodeName === 'select') {
+            if ($node->nodeName === 'select') {
                 $this->mode = self::IN_SELECT;
                 break;
 
             /* 5. If node is a td or th element, then switch the insertion mode
             to "in cell" and abort these steps. */
-            } elseif($node->nodeName === 'td' || $node->nodeName === 'th') {
+            } elseif ($node->nodeName === 'td' || $node->nodeName === 'th') {
                 $this->mode = self::IN_CELL;
                 break;
 
             /* 6. If node is a tr element, then switch the insertion mode to
             "in    row" and abort these steps. */
-            } elseif($node->nodeName === 'tr') {
+            } elseif ($node->nodeName === 'tr') {
                 $this->mode = self::IN_ROW;
                 break;
 
             /* 7. If node is a tbody, thead, or tfoot element, then switch the
             insertion mode to "in table body" and abort these steps. */
-            } elseif(in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
+            } elseif (in_array($node->nodeName, array('tbody', 'thead', 'tfoot'))) {
                 $this->mode = self::IN_TBODY;
                 break;
 
             /* 8. If node is a caption element, then switch the insertion mode
             to "in caption" and abort these steps. */
-            } elseif($node->nodeName === 'caption') {
+            } elseif ($node->nodeName === 'caption') {
                 $this->mode = self::IN_CAPTION;
                 break;
 
             /* 9. If node is a colgroup element, then switch the insertion mode
             to "in column group" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'colgroup') {
+            } elseif ($node->nodeName === 'colgroup') {
                 $this->mode = self::IN_CGROUP;
                 break;
 
             /* 10. If node is a table element, then switch the insertion mode
             to "in table" and abort these steps. */
-            } elseif($node->nodeName === 'table') {
+            } elseif ($node->nodeName === 'table') {
                 $this->mode = self::IN_TABLE;
                 break;
 
             /* 11. If node is a head element, then switch the insertion mode
             to "in body" ("in body"! not "in head"!) and abort these steps.
             (innerHTML case) */
-            } elseif($node->nodeName === 'head') {
+            } elseif ($node->nodeName === 'head') {
                 $this->mode = self::IN_BODY;
                 break;
 
             /* 12. If node is a body element, then switch the insertion mode to
             "in body" and abort these steps. */
-            } elseif($node->nodeName === 'body') {
+            } elseif ($node->nodeName === 'body') {
                 $this->mode = self::IN_BODY;
                 break;
 
             /* 13. If node is a frameset element, then switch the insertion
             mode to "in frameset" and abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'frameset') {
+            } elseif ($node->nodeName === 'frameset') {
                 $this->mode = self::IN_FRAME;
                 break;
 
@@ -3866,7 +3866,7 @@ 
             pointer is null, switch the insertion mode to "before head",
             otherwise, switch the insertion mode to "after head". In either
             case, abort these steps. (innerHTML case) */
-            } elseif($node->nodeName === 'html') {
+            } elseif ($node->nodeName === 'html') {
                 $this->mode = ($this->head_pointer === null)
                     ? self::BEFOR_HEAD
                     : self::AFTER_HEAD;
@@ -3875,7 +3875,7 @@ 
 
             /* 15. If last is true, then set the insertion mode to "in body"
             and    abort these steps. (innerHTML case) */
-            } elseif($last) {
+            } elseif ($last) {
                 $this->mode = self::IN_BODY;
                 break;
             }
@@ -3885,8 +3885,8 @@ 
     private function closeCell() {
         /* If the stack of open elements has a td or th element in table scope,
         then act as if an end tag token with that tag name had been seen. */
-        foreach(array('td', 'th') as $cell) {
-            if($this->elementInScope($cell, true)) {
+        foreach (array('td', 'th') as $cell) {
+            if ($this->elementInScope($cell, true)) {
                 $this->inCell(array(
                     'name' => $cell,
                     'type' => HTML5::ENDTAG

classes/security/htmlpurifier/library/HTMLPurifier/Printer.php

Doc Comments +4 added lines, -1 removed lines

@@ -60,7 +60,7 @@ 
 
     /**
      * Prints a complete element with content inside
-     * @param $tag Tag name
+     * @param string $tag Tag name
      * @param $contents Element contents
      * @param $attr Tag attributes
      * @param $escape Bool whether or not to escape contents
@@ -71,6 +71,9 @@ 
                $this->end($tag);
     }
 
+    /**
+     * @param string $tag
+     */
     protected function elementEmpty($tag, $attr = array()) {
         return $this->generator->generateFromToken(
             new HTMLPurifier_Token_Empty($tag, $attr)

Indentation +164 added lines, -164 removed lines

@@ -6,170 +6,170 @@
 class HTMLPurifier_Printer
 {
 
-    /**
-     * Instance of HTMLPurifier_Generator for HTML generation convenience funcs
-     */
-    protected $generator;
-
-    /**
-     * Instance of HTMLPurifier_Config, for easy access
-     */
-    protected $config;
-
-    /**
-     * Initialize $generator.
-     */
-    public function __construct() {
-    }
-
-    /**
-     * Give generator necessary configuration if possible
-     */
-    public function prepareGenerator($config) {
-        $all = $config->getAll();
-        $context = new HTMLPurifier_Context();
-        $this->generator = new HTMLPurifier_Generator($config, $context);
-    }
-
-    /**
-     * Main function that renders object or aspect of that object
-     * @note Parameters vary depending on printer
-     */
-    // function render() {}
-
-    /**
-     * Returns a start tag
-     * @param $tag Tag name
-     * @param $attr Attribute array
-     */
-    protected function start($tag, $attr = array()) {
-        return $this->generator->generateFromToken(
-                    new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
-               );
-    }
-
-    /**
-     * Returns an end teg
-     * @param $tag Tag name
-     */
-    protected function end($tag) {
-        return $this->generator->generateFromToken(
-                    new HTMLPurifier_Token_End($tag)
-               );
-    }
-
-    /**
-     * Prints a complete element with content inside
-     * @param $tag Tag name
-     * @param $contents Element contents
-     * @param $attr Tag attributes
-     * @param $escape Bool whether or not to escape contents
-     */
-    protected function element($tag, $contents, $attr = array(), $escape = true) {
-        return $this->start($tag, $attr) .
-               ($escape ? $this->escape($contents) : $contents) .
-               $this->end($tag);
-    }
-
-    protected function elementEmpty($tag, $attr = array()) {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Empty($tag, $attr)
-        );
-    }
-
-    protected function text($text) {
-        return $this->generator->generateFromToken(
-            new HTMLPurifier_Token_Text($text)
-        );
-    }
-
-    /**
-     * Prints a simple key/value row in a table.
-     * @param $name Key
-     * @param $value Value
-     */
-    protected function row($name, $value) {
-        if (is_bool($value)) $value = $value ? 'On' : 'Off';
-        return
-            $this->start('tr') . "\n" .
-                $this->element('th', $name) . "\n" .
-                $this->element('td', $value) . "\n" .
-            $this->end('tr')
-        ;
-    }
-
-    /**
-     * Escapes a string for HTML output.
-     * @param $string String to escape
-     */
-    protected function escape($string) {
-        $string = HTMLPurifier_Encoder::cleanUTF8($string);
-        $string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
-        return $string;
-    }
-
-    /**
-     * Takes a list of strings and turns them into a single list
-     * @param $array List of strings
-     * @param $polite Bool whether or not to add an end before the last
-     */
-    protected function listify($array, $polite = false) {
-        if (empty($array)) return 'None';
-        $ret = '';
-        $i = count($array);
-        foreach ($array as $value) {
-            $i--;
-            $ret .= $value;
-            if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
-            if ($polite && $i == 1) $ret .= 'and ';
-        }
-        return $ret;
-    }
-
-    /**
-     * Retrieves the class of an object without prefixes, as well as metadata
-     * @param $obj Object to determine class of
-     * @param $prefix Further prefix to remove
-     */
-    protected function getClass($obj, $sec_prefix = '') {
-        static $five = null;
-        if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
-        if (!$five) $prefix = strtolower($prefix);
-        $class = str_replace($prefix, '', get_class($obj));
-        $lclass = strtolower($class);
-        $class .= '(';
-        switch ($lclass) {
-            case 'enum':
-                $values = array();
-                foreach ($obj->valid_values as $value => $bool) {
-                    $values[] = $value;
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_composite':
-                $values = array();
-                foreach ($obj->defs as $def) {
-                    $values[] = $this->getClass($def, $sec_prefix);
-                }
-                $class .= implode(', ', $values);
-                break;
-            case 'css_multiple':
-                $class .= $this->getClass($obj->single, $sec_prefix) . ', ';
-                $class .= $obj->max;
-                break;
-            case 'css_denyelementdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix) . ', ';
-                $class .= $obj->element;
-                break;
-            case 'css_importantdecorator':
-                $class .= $this->getClass($obj->def, $sec_prefix);
-                if ($obj->allow) $class .= ', !important';
-                break;
-        }
-        $class .= ')';
-        return $class;
-    }
+	/**
+	 * Instance of HTMLPurifier_Generator for HTML generation convenience funcs
+	 */
+	protected $generator;
+
+	/**
+	 * Instance of HTMLPurifier_Config, for easy access
+	 */
+	protected $config;
+
+	/**
+	 * Initialize $generator.
+	 */
+	public function __construct() {
+	}
+
+	/**
+	 * Give generator necessary configuration if possible
+	 */
+	public function prepareGenerator($config) {
+		$all = $config->getAll();
+		$context = new HTMLPurifier_Context();
+		$this->generator = new HTMLPurifier_Generator($config, $context);
+	}
+
+	/**
+	 * Main function that renders object or aspect of that object
+	 * @note Parameters vary depending on printer
+	 */
+	// function render() {}
+
+	/**
+	 * Returns a start tag
+	 * @param $tag Tag name
+	 * @param $attr Attribute array
+	 */
+	protected function start($tag, $attr = array()) {
+		return $this->generator->generateFromToken(
+					new HTMLPurifier_Token_Start($tag, $attr ? $attr : array())
+			   );
+	}
+
+	/**
+	 * Returns an end teg
+	 * @param $tag Tag name
+	 */
+	protected function end($tag) {
+		return $this->generator->generateFromToken(
+					new HTMLPurifier_Token_End($tag)
+			   );
+	}
+
+	/**
+	 * Prints a complete element with content inside
+	 * @param $tag Tag name
+	 * @param $contents Element contents
+	 * @param $attr Tag attributes
+	 * @param $escape Bool whether or not to escape contents
+	 */
+	protected function element($tag, $contents, $attr = array(), $escape = true) {
+		return $this->start($tag, $attr) .
+			   ($escape ? $this->escape($contents) : $contents) .
+			   $this->end($tag);
+	}
+
+	protected function elementEmpty($tag, $attr = array()) {
+		return $this->generator->generateFromToken(
+			new HTMLPurifier_Token_Empty($tag, $attr)
+		);
+	}
+
+	protected function text($text) {
+		return $this->generator->generateFromToken(
+			new HTMLPurifier_Token_Text($text)
+		);
+	}
+
+	/**
+	 * Prints a simple key/value row in a table.
+	 * @param $name Key
+	 * @param $value Value
+	 */
+	protected function row($name, $value) {
+		if (is_bool($value)) $value = $value ? 'On' : 'Off';
+		return
+			$this->start('tr') . "\n" .
+				$this->element('th', $name) . "\n" .
+				$this->element('td', $value) . "\n" .
+			$this->end('tr')
+		;
+	}
+
+	/**
+	 * Escapes a string for HTML output.
+	 * @param $string String to escape
+	 */
+	protected function escape($string) {
+		$string = HTMLPurifier_Encoder::cleanUTF8($string);
+		$string = htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false);
+		return $string;
+	}
+
+	/**
+	 * Takes a list of strings and turns them into a single list
+	 * @param $array List of strings
+	 * @param $polite Bool whether or not to add an end before the last
+	 */
+	protected function listify($array, $polite = false) {
+		if (empty($array)) return 'None';
+		$ret = '';
+		$i = count($array);
+		foreach ($array as $value) {
+			$i--;
+			$ret .= $value;
+			if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
+			if ($polite && $i == 1) $ret .= 'and ';
+		}
+		return $ret;
+	}
+
+	/**
+	 * Retrieves the class of an object without prefixes, as well as metadata
+	 * @param $obj Object to determine class of
+	 * @param $prefix Further prefix to remove
+	 */
+	protected function getClass($obj, $sec_prefix = '') {
+		static $five = null;
+		if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
+		$prefix = 'HTMLPurifier_' . $sec_prefix;
+		if (!$five) $prefix = strtolower($prefix);
+		$class = str_replace($prefix, '', get_class($obj));
+		$lclass = strtolower($class);
+		$class .= '(';
+		switch ($lclass) {
+			case 'enum':
+				$values = array();
+				foreach ($obj->valid_values as $value => $bool) {
+					$values[] = $value;
+				}
+				$class .= implode(', ', $values);
+				break;
+			case 'css_composite':
+				$values = array();
+				foreach ($obj->defs as $def) {
+					$values[] = $this->getClass($def, $sec_prefix);
+				}
+				$class .= implode(', ', $values);
+				break;
+			case 'css_multiple':
+				$class .= $this->getClass($obj->single, $sec_prefix) . ', ';
+				$class .= $obj->max;
+				break;
+			case 'css_denyelementdecorator':
+				$class .= $this->getClass($obj->def, $sec_prefix) . ', ';
+				$class .= $obj->element;
+				break;
+			case 'css_importantdecorator':
+				$class .= $this->getClass($obj->def, $sec_prefix);
+				if ($obj->allow) $class .= ', !important';
+				break;
+		}
+		$class .= ')';
+		return $class;
+	}
 
 }
 

Braces +21 added lines, -7 removed lines

@@ -89,7 +89,9 @@ 
      * @param $value Value
      */
     protected function row($name, $value) {
-        if (is_bool($value)) $value = $value ? 'On' : 'Off';
+        if (is_bool($value)) {
+        	$value = $value ? 'On' : 'Off';
+        }
         return
             $this->start('tr') . "\n" .
                 $this->element('th', $name) . "\n" .
@@ -114,14 +116,20 @@ 
      * @param $polite Bool whether or not to add an end before the last
      */
     protected function listify($array, $polite = false) {
-        if (empty($array)) return 'None';
+        if (empty($array)) {
+        	return 'None';
+        }
         $ret = '';
         $i = count($array);
         foreach ($array as $value) {
             $i--;
             $ret .= $value;
-            if ($i > 0 && !($polite && $i == 1)) $ret .= ', ';
-            if ($polite && $i == 1) $ret .= 'and ';
+            if ($i > 0 && !($polite && $i == 1)) {
+            	$ret .= ', ';
+            }
+            if ($polite && $i == 1) {
+            	$ret .= 'and ';
+            }
         }
         return $ret;
     }
@@ -133,9 +141,13 @@ 
      */
     protected function getClass($obj, $sec_prefix = '') {
         static $five = null;
-        if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
+        if ($five === null) {
+        	$five = version_compare(PHP_VERSION, '5', '>=');
+        }
         $prefix = 'HTMLPurifier_' . $sec_prefix;
-        if (!$five) $prefix = strtolower($prefix);
+        if (!$five) {
+        	$prefix = strtolower($prefix);
+        }
         $class = str_replace($prefix, '', get_class($obj));
         $lclass = strtolower($class);
         $class .= '(';
@@ -164,7 +176,9 @@ 
                 break;
             case 'css_importantdecorator':
                 $class .= $this->getClass($obj->def, $sec_prefix);
-                if ($obj->allow) $class .= ', !important';
+                if ($obj->allow) {
+                	$class .= ', !important';
+                }
                 break;
         }
         $class .= ')';

Spacing +8 added lines, -8 removed lines

@@ -66,8 +66,8 @@ 
      * @param $escape Bool whether or not to escape contents
      */
     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);
     }
 
@@ -91,9 +91,9 @@ 
     protected function row($name, $value) {
         if (is_bool($value)) $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')
         ;
     }
@@ -134,7 +134,7 @@ 
     protected function getClass($obj, $sec_prefix = '') {
         static $five = null;
         if ($five === null) $five = version_compare(PHP_VERSION, '5', '>=');
-        $prefix = 'HTMLPurifier_' . $sec_prefix;
+        $prefix = 'HTMLPurifier_'.$sec_prefix;
         if (!$five) $prefix = strtolower($prefix);
         $class = str_replace($prefix, '', get_class($obj));
         $lclass = strtolower($class);
@@ -155,11 +155,11 @@ 
                 $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':