Fix test-suite bug, fix real bug with head pointer pop, move another test to 99.

Edward Z. Yang ext:(%22) · Edward Z. Yang ext:(%22) · commit 73a05b90c55f · 2009-05-31T04:18:17.000-04:00
diff --git a/library/HTML5/TreeConstructer.php b/library/HTML5/TreeConstructer.php
@@ -674,7 +674,7 @@ public function emitToken($token, $mode = null) {
              * stack of open elements. */
             $this->stack[] = $this->head_pointer;
             $this->processWithRulesFor($token, self::IN_HEAD);
-            array_pop($this->stack);
+            array_splice($this->stack, array_search($this->head_pointer, $this->stack, true), 1);
 
         // inversion of specification
         } elseif(
diff --git a/tests/HTML5/TestData.php b/tests/HTML5/TestData.php
@@ -91,10 +91,8 @@ public static function strDom($node, $prefix = '| ') {
                     if ($next->doctype) {
                         $subnode = '<!DOCTYPE ';
                         $subnode .= $next->doctype->name;
-                        if ($next->doctype->publicId) {
+                        if ($next->doctype->publicId || $next->doctype->systemId) {
                             $subnode .= ' "' . $next->doctype->publicId . '"';
-                        }
-                        if ($next->doctype->systemId) {
                             $subnode .= ' "' . $next->doctype->systemId . '"';
                         }
                         $subnode .= '>';
