diff options
| author | Matt Farina <[email protected]> | 2013-06-17 17:00:28 -0400 |
|---|---|---|
| committer | Matt Farina <[email protected]> | 2013-06-17 17:00:28 -0400 |
| commit | 918ff2a496a52cd54e17390005e38c37742d8e7a (patch) | |
| tree | 652edec8f6be2b935e926488de98a5452102a0a5 /src/HTML5 | |
| parent | f4708bfbe48a1b4d3635793a08473c54a18eeced (diff) | |
Changed the svg/mathml handling to more closely mirror the parser.
Diffstat (limited to 'src/HTML5')
| -rw-r--r-- | src/HTML5/Serializer/OutputRules.php | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/HTML5/Serializer/OutputRules.php b/src/HTML5/Serializer/OutputRules.php index 79b14b5..91cda5d 100644 --- a/src/HTML5/Serializer/OutputRules.php +++ b/src/HTML5/Serializer/OutputRules.php @@ -12,11 +12,14 @@ use \HTML5\Elements; class OutputRules implements \HTML5\Serializer\RulesInterface { + const IM_IN_HTML = 1; + const IM_IN_SVG = 2; + const IM_IN_MATHML = 3; + protected $traverser; protected $encode = FALSE; protected $out; - protected $inSvg = FALSE; - protected $inMathMl = FALSE; + protected $outputMode; const DOCTYPE = '<!DOCTYPE html>'; @@ -27,6 +30,7 @@ class OutputRules implements \HTML5\Serializer\RulesInterface { $this->encode = $options['encode_entities']; } + $this->outputMode = self::IM_IN_HTML; $this->out = $output; } @@ -51,15 +55,14 @@ class OutputRules implements \HTML5\Serializer\RulesInterface { $name = $ele->localName; } - // If we are in SVG or MathML there is special handling. - switch($name) { - case 'svg': - $this->inSvg = TRUE; + // If we are in SVG or MathML there is special handling. + // Using if/elseif instead of switch because it's faster in PHP. + if ($name == 'svg') { + $this->outputMode = self::IM_IN_SVG; $name = Elements::normalizeSvgElement($name); - break; - case 'math': - $this->inMathMl = TRUE; - break; + } + elseif ($name == 'math') { + $this->outputMode = self::IM_IN_MATHML; } $this->openTag($ele); @@ -70,13 +73,8 @@ class OutputRules implements \HTML5\Serializer\RulesInterface { } // Close out the SVG or MathML special handling. - switch($name) { - case 'svg': - $this->inSvg = FALSE; - break; - case 'math': - $this->inMathMl = FALSE; - break; + if ($name == 'svg' || $name == 'math') { + $this->outputMode = self::IM_IN_HTML; } // If not unary, add a closing tag. @@ -151,10 +149,11 @@ class OutputRules implements \HTML5\Serializer\RulesInterface { $name = $node->name; // Special handling for attributes in SVG and MathML. - if ($this->inSvg) { + // Using if/elseif instead of switch because it's faster in PHP. + if ($this->outputMode == self::IM_IN_SVG) { $name = Elements::normalizeSvgAttribute($name); } - elseif ($this->inMathMl) { + elseif ($this->outputMode == self::IM_IN_MATHML) { $name = Elements::normalizeMathMlAttribute($name); } |