[e] (0) Reorder the list of DOCTYPEs to have the exact comparisons be…

…fore the prefix comparisons, and remove commented-out values since there's very little chance of us having to change this again now that we have multiple deployed implementations. Affected topics: HTML Syntax and Parsing git-svn-id: http://svn.whatwg.org/webapps@8642 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · May 18, 2014 · 908cc3c · 908cc3c
1 parent 337df10
commit 908cc3c
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 227 deletions.
diff --git a/complete.html b/complete.html
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 17 May 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 18 May 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -91075,89 +91075,75 @@ <h6 id=the-initial-insertion-mode><span class=secno>12.2.5.4.1 </span>The "<dfn
 
     <ul class=brief><li> The <i>force-quirks flag</i> is set to <i>on</i>. </li>
      <li> The name is set to anything other than "<code title="">html</code>" (compared <a href=#case-sensitive title=case-sensitive>case-sensitively</a>). </li>
-     <li> The public identifier starts with: "<code title="">+//Silmaril//dtd html Pro v0r11 19970101//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//AdvaSoft Ltd//DTD HTML 3.0 asWedit + extensions//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//AS//DTD HTML 3.0 asWedit + extensions//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Level 1//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Level 2//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict Level 1//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict Level 2//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.1E//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.0//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML 3.0//EN//</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.2 Final//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.2//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 0//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Level 0//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 1//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Level 1//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 2//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Level 2//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 3//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Level 3//EN//3.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 0//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict Level 0//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 1//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict Level 1//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 2//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict Level 2//EN//2.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 3//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict Level 3//EN//3.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict//EN//2.0</code>" </li>-->
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML Strict//EN//3.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML//EN//2.0</code>" </li>-->
-   <!--<li> The public identifier is set to: "<code title="">-//IETF//DTD HTML//EN//3.0</code>" </li>-->
-     <li> The public identifier starts with: "<code title="">-//Metrius//DTD Metrius Presentational//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 HTML Strict//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 Tables//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 HTML Strict//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 Tables//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Netscape Comm. Corp.//DTD HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Netscape Comm. Corp.//DTD Strict HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML 2.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML Extended 1.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML Extended Relaxed 1.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//SoftQuad Software//DTD HoTMetaL PRO 6.0::19990601::extensions to HTML 4.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//SoftQuad//DTD HoTMetaL PRO 4.0::19971010::extensions to HTML 4.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Spyglass//DTD HTML 2.0 Extended//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//SQ//DTD HTML 2.0 HoTMetaL + extensions//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Sun Microsystems Corp.//DTD HotJava HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//Sun Microsystems Corp.//DTD HotJava Strict HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3 1995-03-24//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2 Draft//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2 Final//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2S Draft//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 4.0 Frameset//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 4.0 Transitional//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML Experimental 19960712//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML Experimental 970421//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD W3 HTML//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3O//DTD W3 HTML 3.0//<!--EN--></code>" </li>
-   <!--<li> The public identifier is set to: "<code title="">-//W3O//DTD W3 HTML 3.0//EN//</code>" </li>-->
      <li> The public identifier is set to: "<code title="">-//W3O//DTD W3 HTML Strict 3.0//EN//</code>" </li>
-     <li> The public identifier starts with: "<code title="">-//WebTechs//DTD Mozilla HTML 2.0//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//WebTechs//DTD Mozilla HTML//<!--EN--></code>" </li>
      <li> The public identifier is set to: "<code title="">-/W3C/DTD HTML 4.0 Transitional/EN</code>" </li>
      <li> The public identifier is set to: "<code title="">HTML</code>" </li>
      <li> The system identifier is set to: "<code title="">http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd</code>" </li>
-     <li> The system identifier is missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Frameset//<!--EN--></code>" </li>
-     <li> The system identifier is missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Transitional//<!--EN--></code>" </li>
+     <li> The public identifier starts with: "<code title="">+//Silmaril//dtd html Pro v0r11 19970101//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//AS//DTD HTML 3.0 asWedit + extensions//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//AdvaSoft Ltd//DTD HTML 3.0 asWedit + extensions//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Level 1//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Level 2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict Level 1//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict Level 2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0 Strict//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 2.1E//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.2 Final//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3.2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML 3//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 1//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Level 3//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 1//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict Level 3//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML Strict//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//IETF//DTD HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Metrius//DTD Metrius Presentational//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 HTML Strict//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 2.0 Tables//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 HTML Strict//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Microsoft//DTD Internet Explorer 3.0 Tables//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Netscape Comm. Corp.//DTD HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Netscape Comm. Corp.//DTD Strict HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML 2.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML Extended 1.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//O'Reilly and Associates//DTD HTML Extended Relaxed 1.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//SQ//DTD HTML 2.0 HoTMetaL + extensions//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//SoftQuad Software//DTD HoTMetaL PRO 6.0::19990601::extensions to HTML 4.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//SoftQuad//DTD HoTMetaL PRO 4.0::19971010::extensions to HTML 4.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Spyglass//DTD HTML 2.0 Extended//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Sun Microsystems Corp.//DTD HotJava HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//Sun Microsystems Corp.//DTD HotJava Strict HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3 1995-03-24//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2 Draft//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2 Final//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 3.2S Draft//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 4.0 Frameset//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML 4.0 Transitional//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML Experimental 19960712//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD HTML Experimental 970421//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD W3 HTML//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3O//DTD W3 HTML 3.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//WebTechs//DTD Mozilla HTML 2.0//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//WebTechs//DTD Mozilla HTML//</code>" </li>
+     <li> The system identifier is missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Frameset//</code>" </li>
+     <li> The system identifier is missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Transitional//</code>" </li>
     </ul><p>Otherwise, if the document is <em>not</em> <a href=#an-iframe-srcdoc-document>an <code>iframe</code> <code title=attr-iframe-srcdoc>srcdoc</code> document</a>, and the DOCTYPE token matches one of
     the conditions in the following list, then set the <code><a href=#document>Document</a></code> to <a href=#limited-quirks-mode>limited-quirks
     mode</a>:</p>
 
-    <ul class=brief><li> The public identifier starts with: "<code title="">-//W3C//DTD XHTML 1.0 Frameset//<!--EN--></code>" </li>
-     <li> The public identifier starts with: "<code title="">-//W3C//DTD XHTML 1.0 Transitional//<!--EN--></code>" </li>
-     <li> The system identifier is not missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Frameset//<!--EN--></code>" </li>
-     <li> The system identifier is not missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Transitional//<!--EN--></code>" </li>
+    <ul class=brief><li> The public identifier starts with: "<code title="">-//W3C//DTD XHTML 1.0 Frameset//</code>" </li>
+     <li> The public identifier starts with: "<code title="">-//W3C//DTD XHTML 1.0 Transitional//</code>" </li>
+     <li> The system identifier is not missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Frameset//</code>" </li>
+     <li> The system identifier is not missing and the public identifier starts with: "<code title="">-//W3C//DTD HTML 4.01 Transitional//</code>" </li>
     </ul><p>The system identifier and public identifier strings must be compared to the values given in
     the lists above in an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> manner. A system identifier whose
     value is the empty string is not considered missing for the purposes of the conditions