- From: poot <cvsmail@w3.org>
- Date: Fri, 5 Mar 2010 01:47:02 +0900 (JST)
- To: public-html-diffs@w3.org
mike: last minute fixes to get ready for publication http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.189&r2=1.190&f=h =================================================================== RCS file: /sources/public/html5/markup/syntax.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- syntax.html 2 Mar 2010 11:32:11 -0000 1.39 +++ syntax.html 4 Mar 2010 16:46:18 -0000 1.40 @@ -49,15 +49,21 @@ <div id="doctype-syntax" class="section"> <h2>4.01. The doctype <a class="hash" href="#doctype-syntax">#</a> <a class="toc-bak" href="Overview.html#doctype-syntax-toc">T</a></h2> <p>A - <dfn id="doctype" title="doctype">doctype</dfn> + <dfn id="doctype">doctype</dfn> (sometimes capitalized as “DOCTYPE”) is an special instruction which, for legacy reasons that have to do with processing modes in browsers, is a required part of any <a href="documents.html#syntax-document-html">document in the HTML syntax</a>; - it must either be a - <a href="syntax.html#deprecated-doctype">deprecated doctype</a>, - or must consist of the following parts, in exactly the - following order:</p> + it must conform to one of the following three formats:</p> + <ul> + <li><a href="syntax.html#normal-doctype">normal doctype</a></li> + <li><a href="syntax.html#deprecated-doctype">deprecated doctype</a></li> + <li><a href="syntax.html#legacy-tool-compatible-doctype">legacy-tool-compatible doctype</a></li> + </ul> + <p>A + <dfn id="normal-doctype">normal doctype</dfn> + consists of the following parts, in exactly the following + order:</p> <ol> <li>A "<code title="U+003C LESS-THAN SIGN"><</code>" @@ -75,19 +81,124 @@ <a href="terminology.html#case-insensitive">case-insensitive match</a> for the string "<code>HTML</code>".</li> - <li>Optionally, a - <a href="syntax.html#doctype-legacy-string">doctype legacy string</a>.</li> <li>Optionally, one or more <a href="terminology.html#space">space characters</a>.</li> <li>A "<code title="U+003E GREATER-THAN SIGN">></code>" character.</li> </ol> + <div class="example"> + <p>The following is an example of a conformant + <a href="syntax.html#normal-doctype">normal doctype</a>.</p> + <pre><!DOCTYPE html></pre> + </div> <p>A - <dfn id="doctype-legacy-string" title="doctype-legacy-string">doctype legacy string</dfn> - consists of the following parts, in exactly the following - order.</p> + <dfn id="deprecated-doctype">deprecated doctype</dfn> + consists of the following parts, in exactly the following order:</p> + <ol> + <li>A + "<code title="U+003C LESS-THAN SIGN"><</code>" + character.</li> + <li>A + "<code title="U+0021 EXCLAMATION MARK">!</code>" + character.</li> + <li>Any + <a href="terminology.html#case-insensitive">case-insensitive match</a> + for the string + "<code>DOCTYPE</code>".</li> + <li>One or more + <a href="terminology.html#space">space characters</a>.</li> + <li>Any + <a href="terminology.html#case-insensitive">case-insensitive match</a> + for the string + "<code>HTML</code>".</li> + <li>One or more + <a href="terminology.html#space">space characters</a>.</li> + <li>Any + <a href="terminology.html#case-insensitive">case-insensitive match</a> + for the string + "<code>PUBLIC</code>".</li> + <li>One or more + <a href="terminology.html#space">space characters</a>.</li> + <li>A <i>quote mark (public ID)</i>, consisting of either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character.</li> + <li>A + <a href="syntax.html#permitted-public-ID">permitted public ID</a></li> + <li>A matching <i>quote mark (public ID)</i>, identical to the + <i>quote mark (public ID)</i> used earlier (either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character).</li> + <li>Conditionally, depending on whether it is part of a + <a href="syntax.html#permitted-public-ID-system-ID-combination">permitted-public-ID-system-ID-combination</a>, + the following parts, in exactly the following order: + <ol> + <li>One or more + <a href="terminology.html#space">space characters</a>.</li> + <li>A <i>quote mark (system ID)</i>, consisting of either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character.</li> + <li>A + <a href="syntax.html#permitted-system-ID">permitted system ID</a></li> + <li>A matching <i>quote mark (system ID)</i>, identical to the + <i>quote mark (system ID)</i> used earlier (either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character).</li> + </ol> + </li> + <li>Optionally, one or more + <a href="terminology.html#space">space characters</a>.</li> + <li>A + "<code title="U+003E GREATER-THAN SIGN">></code>" + character.</li> + </ol> + <p>A + <dfn id="permitted-public-ID-system-ID-combination">permitted-public-ID-system-ID-combination</dfn> + is any combination of a + <dfn id="permitted-public-ID">public ID</dfn> + and zero or one + <dfn id="permitted-system-ID">system ID</dfn> + such that the combination corresponds to one of the seven + <a href="syntax.html#deprecated-doctype">deprecated doctypes</a> + in the following + <a id="list-of-deprecated-doctypes" href="syntax.html#list-of-deprecated-doctypes">list of deprecated doctypes</a>:</p> + <div class="example"> + <pre><!DOCTYPE html> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"></pre> + </div> + <p>A + <dfn id="legacy-tool-compatible-doctype">legacy-tool-compatible doctype</dfn> + consists of the following parts, in exactly the following order:</p> <ol> + <li>A + "<code title="U+003C LESS-THAN SIGN"><</code>" + character.</li> + <li>A + "<code title="U+0021 EXCLAMATION MARK">!</code>" + character.</li> + <li>Any + <a href="terminology.html#case-insensitive">case-insensitive match</a> + for the string + "<code>DOCTYPE</code>".</li> + <li>One or more + <a href="terminology.html#space">space characters</a>.</li> + <li>Any + <a href="terminology.html#case-insensitive">case-insensitive match</a> + for the string + "<code>HTML</code>".</li> <li>One or more <a href="terminology.html#space">space characters</a>.</li> <li>Any @@ -110,54 +221,17 @@ character or a "<code title="U+0027 APOSTROPHE">'</code>" character).</li> + <li>Optionally, one or more + <a href="terminology.html#space">space characters</a>.</li> + <li>A + "<code title="U+003E GREATER-THAN SIGN">></code>" + character.</li> </ol> <div class="example"> - <p>The following are examples of some conformant - <a href="syntax.html#doctype">doctypes</a>.</p> - <pre><!DOCTYPE html></pre> + <p>The following is examples of a conformant + <a href="syntax.html#legacy-tool-compatible-doctype">legacy-tool-compatible doctype</a>.</p> <pre><!doctype HTML system "about:legacy-compat"></pre> </div> - <p>A - <dfn id="deprecated-doctype" title="deprecated-doctype">deprecated doctype</dfn> - is a - <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>, - as defined in the XML specification - <a href="references.html#refsXML">[XML]</a>, - whose - <a href="syntax.html#doctype-declaration">document type declaration’s</a> - name part is a - <a href="terminology.html#case-insensitive">case-insensitive match</a> - for the string - "<code>HTML</code>", - and that must one of the following sets of constraints:</p> - <ul> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD HTML 4.0//EN</code>", - and its system identifier is either missing or is an exact - match for the literal string - "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD HTML 4.01//EN</code>", - and its system identifier is either missing or is an exact - match for the literal string - "<code>http://www.w3.org/TR/html4/strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>", - and its system identifier is an exact match for the literal string - "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD XHTML 1.1//EN</code>", - and its system identifier is an exact match for the literal string - "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>"</li> - </ul> - <div class="example"> - <p>The following are examples of some - <a href="syntax.html#deprecated-doctype">deprecated doctypes</a>.</p> - <pre><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></pre> - <pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"></pre> - </div> </div> <div id="character-encoding" class="section"> <h2>4.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="Overview.html#character-encoding-toc">T</a></h2> Index: documents.html =================================================================== RCS file: /sources/public/html5/markup/documents.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- documents.html 2 Mar 2010 05:12:40 -0000 1.15 +++ documents.html 4 Mar 2010 16:46:18 -0000 1.16 @@ -128,25 +128,14 @@ section of this specification.</p> <p>A conformant <dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn> - must consist of the following parts, in the following order:</p> - <ol> - <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM) - character.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="references.html#refsXML">[XML]</a>.</li> - <li>Optionally, a doctype declaration, as defined - in the XML specification <a href="references.html#refsXML">[XML]</a>.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="references.html#refsXML">[XML]</a>.</li> - <li>An - <a href="html.html#html" class="element">html</a> element, - with its - <a href="syntax.html#attribute">attributes</a> - and - <a href="syntax.html#contents">contents</a>.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="references.html#refsXML">[XML]</a>.</li> - </ol> + must be a + <dfn id="well-formed-xml-document">well-formed XML document</dfn>, + as defined in the XML specification <a href="references.html#refsXML">[XML]</a>, + and its + <dfn id="root-element">root element</dfn>, + as defined in the XML specification <a href="references.html#refsXML">[XML]</a>, + must be an + <a href="html.html#html" class="element">html</a> element.</p> <p>Documents in the XML syntax must conform to XML constraints as defined in the XML specification <a href="references.html#refsXML">[XML]</a> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.189 retrieving revision 1.190 diff -u -d -r1.189 -r1.190 --- spec.html 4 Mar 2010 03:17:03 -0000 1.189 +++ spec.html 4 Mar 2010 16:46:18 -0000 1.190 @@ -950,26 +950,15 @@ section of this specification.</p> <p>A conformant <dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn> - must consist of the following parts, in the following order:</p> - <ol> -<li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM) - character.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="#refsXML">[XML]</a>.</li> - <li>Optionally, a doctype declaration, as defined - in the XML specification <a href="#refsXML">[XML]</a>.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="#refsXML">[XML]</a>.</li> - <li>An - <a href="#html" class="element">html</a> element, - with its - <a href="#attribute">attributes</a> - and - <a href="#contents">contents</a>.</li> - <li>Any number of comments and space characters, as defined - in the XML specification <a href="#refsXML">[XML]</a>.</li> - </ol> -<p>Documents in the XML syntax must conform to XML constraints + must be a + <dfn id="well-formed-xml-document">well-formed XML document</dfn>, + as defined in the XML specification <a href="#refsXML">[XML]</a>, + and its + <dfn id="root-element">root element</dfn>, + as defined in the XML specification <a href="#refsXML">[XML]</a>, + must be an + <a href="#html" class="element">html</a> element.</p> + <p>Documents in the XML syntax must conform to XML constraints as defined in the XML specification <a href="#refsXML">[XML]</a> and in the Namespaces in XML 1.0 specification @@ -1085,15 +1074,21 @@ <h2>4.01. The doctype <a class="hash" href="#doctype-syntax">#</a> <a class="toc-bak" href="#doctype-syntax-toc">T</a> </h2> <p>A - <dfn id="doctype" title="doctype">doctype</dfn> + <dfn id="doctype">doctype</dfn> (sometimes capitalized as “DOCTYPE”) is an special instruction which, for legacy reasons that have to do with processing modes in browsers, is a required part of any <a href="#syntax-document-html">document in the HTML syntax</a>; - it must either be a - <a href="#deprecated-doctype">deprecated doctype</a>, - or must consist of the following parts, in exactly the - following order:</p> + it must conform to one of the following three formats:</p> + <ul> +<li><a href="#normal-doctype">normal doctype</a></li> + <li><a href="#deprecated-doctype">deprecated doctype</a></li> + <li><a href="#legacy-tool-compatible-doctype">legacy-tool-compatible doctype</a></li> + </ul> +<p>A + <dfn id="normal-doctype">normal doctype</dfn> + consists of the following parts, in exactly the following + order:</p> <ol> <li>A "<code title="U+003C LESS-THAN SIGN"><</code>" @@ -1111,20 +1106,127 @@ <a href="#case-insensitive">case-insensitive match</a> for the string "<code>HTML</code>".</li> - <li>Optionally, a - <a href="#doctype-legacy-string">doctype legacy string</a>.</li> <li>Optionally, one or more <a href="#space">space characters</a>.</li> <li>A "<code title="U+003E GREATER-THAN SIGN">></code>" character.</li> </ol> -<p>A - <dfn id="doctype-legacy-string" title="doctype-legacy-string">doctype legacy string</dfn> - consists of the following parts, in exactly the following - order.</p> +<div class="example"> + <p>The following is an example of a conformant + <a href="#normal-doctype">normal doctype</a>.</p> + <pre><!DOCTYPE html></pre> + </div> + <p>A + <dfn id="deprecated-doctype">deprecated doctype</dfn> + consists of the following parts, in exactly the following order:</p> <ol> +<li>A + "<code title="U+003C LESS-THAN SIGN"><</code>" + character.</li> + <li>A + "<code title="U+0021 EXCLAMATION MARK">!</code>" + character.</li> + <li>Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>DOCTYPE</code>".</li> + <li>One or more + <a href="#space">space characters</a>.</li> + <li>Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>HTML</code>".</li> + <li>One or more + <a href="#space">space characters</a>.</li> + <li>Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>PUBLIC</code>".</li> + <li>One or more + <a href="#space">space characters</a>.</li> + <li>A <i>quote mark (public ID)</i>, consisting of either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character.</li> + <li>A + <a href="#permitted-public-ID">permitted public ID</a> +</li> + <li>A matching <i>quote mark (public ID)</i>, identical to the + <i>quote mark (public ID)</i> used earlier (either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character).</li> + <li>Conditionally, depending on whether it is part of a + <a href="#permitted-public-ID-system-ID-combination">permitted-public-ID-system-ID-combination</a>, + the following parts, in exactly the following order: + <ol> <li>One or more + <a href="#space">space characters</a>.</li> + <li>A <i>quote mark (system ID)</i>, consisting of either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character.</li> + <li>A + <a href="#permitted-system-ID">permitted system ID</a> +</li> + <li>A matching <i>quote mark (system ID)</i>, identical to the + <i>quote mark (system ID)</i> used earlier (either a + "<code title="U+0022 QUOTATION MARK">"</code>" + character or a + "<code title="U+0027 APOSTROPHE">'</code>" + character).</li> + </ol> +</li> + <li>Optionally, one or more + <a href="#space">space characters</a>.</li> + <li>A + "<code title="U+003E GREATER-THAN SIGN">></code>" + character.</li> + </ol> +<p>A + <dfn id="permitted-public-ID-system-ID-combination">permitted-public-ID-system-ID-combination</dfn> + is any combination of a + <dfn id="permitted-public-ID">public ID</dfn> + and zero or one + <dfn id="permitted-system-ID">system ID</dfn> + such that the combination corresponds to one of the seven + <a href="#deprecated-doctype">deprecated doctypes</a> + in the following + <a id="list-of-deprecated-doctypes" href="#list-of-deprecated-doctypes">list of deprecated doctypes</a>:</p> + <div class="example"> + <pre><!DOCTYPE html> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"></pre> + </div> + <p>A + <dfn id="legacy-tool-compatible-doctype">legacy-tool-compatible doctype</dfn> + consists of the following parts, in exactly the following order:</p> + <ol> +<li>A + "<code title="U+003C LESS-THAN SIGN"><</code>" + character.</li> + <li>A + "<code title="U+0021 EXCLAMATION MARK">!</code>" + character.</li> + <li>Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>DOCTYPE</code>".</li> + <li>One or more + <a href="#space">space characters</a>.</li> + <li>Any + <a href="#case-insensitive">case-insensitive match</a> + for the string + "<code>HTML</code>".</li> + <li>One or more <a href="#space">space characters</a>.</li> <li>Any <a href="#case-insensitive">case-insensitive match</a> @@ -1147,54 +1249,17 @@ character or a "<code title="U+0027 APOSTROPHE">'</code>" character).</li> + <li>Optionally, one or more + <a href="#space">space characters</a>.</li> + <li>A + "<code title="U+003E GREATER-THAN SIGN">></code>" + character.</li> </ol> <div class="example"> - <p>The following are examples of some conformant - <a href="#doctype">doctypes</a>.</p> - <pre><!DOCTYPE html></pre> + <p>The following is examples of a conformant + <a href="#legacy-tool-compatible-doctype">legacy-tool-compatible doctype</a>.</p> <pre><!doctype HTML system "about:legacy-compat"></pre> </div> - <p>A - <dfn id="deprecated-doctype" title="deprecated-doctype">deprecated doctype</dfn> - is a - <dfn id="doctype-declaration" title="doctype-declaration">document type declaration</dfn>, - as defined in the XML specification - <a href="#refsXML">[XML]</a>, - whose - <a href="#doctype-declaration">document type declaration’s</a> - name part is a - <a href="#case-insensitive">case-insensitive match</a> - for the string - "<code>HTML</code>", - and that must one of the following sets of constraints:</p> - <ul> -<li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD HTML 4.0//EN</code>", - and its system identifier is either missing or is an exact - match for the literal string - "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD HTML 4.01//EN</code>", - and its system identifier is either missing or is an exact - match for the literal string - "<code>http://www.w3.org/TR/html4/strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>", - and its system identifier is an exact match for the literal string - "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>"</li> - <li>its public identifier is an exact match for the literal string - "<code>-//W3C//DTD XHTML 1.1//EN</code>", - and its system identifier is an exact match for the literal string - "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>"</li> - </ul> -<div class="example"> - <p>The following are examples of some - <a href="#deprecated-doctype">deprecated doctypes</a>.</p> - <pre><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></pre> - <pre><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd"></pre> - </div> </div> <div id="character-encoding" class="section"> <h2>4.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="#character-encoding-toc">T</a>
Received on Thursday, 4 March 2010 16:47:32 UTC