- From: poot <cvsmail@w3.org>
- Date: Sat, 8 Aug 2009 23:03:42 +0900 (JST)
- To: public-html-diffs@w3.org
- Message-Id: <20090808140343.40F182BCB6@toro.w3.mag.keio.ac.jp>
mike: unwound the <iframe> content-model change; made some other refinements to Syntax section http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.346&r2=1.347&f=h =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.346 retrieving revision 1.347 diff -u -d -r1.346 -r1.347 --- Overview.html 7 Aug 2009 14:50:28 -0000 1.346 +++ Overview.html 8 Aug 2009 14:02:57 -0000 1.347 @@ -9,7 +9,7 @@ <body> <div class="head"> <h1>HTML 5: The Markup Language</h1> -<h2>Editor’s Draft <em>7 August 2009</em> +<h2>Editor’s Draft <em>8 August 2009</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -42,7 +42,7 @@ <p> - This document is the 7 August 2009 Editor’s Draft of + This document is the 8 August 2009 Editor’s Draft of <cite>HTML 5: The Markup Language</cite>. </p> <p> Index: iframe.html =================================================================== RCS file: /sources/public/html5/markup/iframe.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- iframe.html 6 Aug 2009 10:34:35 -0000 1.19 +++ iframe.html 8 Aug 2009 14:02:58 -0000 1.20 @@ -21,7 +21,7 @@ <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content">#</a></h2> <div class="content-models" id="iframe-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span> - <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a> + <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> & <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a> </span></p> </div> Index: syntax.html =================================================================== RCS file: /sources/public/html5/markup/syntax.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- syntax.html 7 Aug 2009 14:50:29 -0000 1.25 +++ syntax.html 8 Aug 2009 14:02:58 -0000 1.26 @@ -125,7 +125,7 @@ "<code>HTML</code>", 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 is an exact + 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>The @@ -136,7 +136,7 @@ "<code>HTML</code>", 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 is an exact + 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>The @@ -147,7 +147,7 @@ "<code>HTML</code>", 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 either missing is an exact + and its system identifier is either missing or is an exact match for the literal string "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li> <li>The @@ -158,12 +158,12 @@ "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD XHTML 1.1//EN</code>", - and its system identifier is either missing is an exact + and its system identifier is either missing or 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 + <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> @@ -173,10 +173,10 @@ </div> <div id="character-encoding" class="section"> <h2>6.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="Overview.html#character-encoding-toc">T</a></h2> - <p>A <dfn id="encoding-declaration">character - encoding declaration</dfn> is a mechanism by which the - character encoding used to store or transmit a document is - specified.</p> + <p>A + <dfn id="encoding-declaration" title="encoding-declaration">character encoding declaration</dfn> + is a mechanism for specifying the character encoding used to store + or transmit a document.</p> <p>The following restrictions apply to character encoding declarations:</p> <ul> @@ -233,18 +233,24 @@ </p> <p>In a <a href="documents.html#syntax-document-xml">document the XML syntax</a>, - the XML declaration should be used to provide - character-encoding information, if necessary.</p> + the + <dfn id="xml-declaration" title="xml-declaration">XML declaration</dfn>, + as defined in the XML specification + <a href="references.html#refsXML">[XML]</a> + should be used to provide character-encoding information, if + necessary.</p> </div> <div id="syntax-elements" class="section"> <h2>6.03. Elements <a class="hash" href="#syntax-elements">#</a> <a class="toc-bak" href="Overview.html#syntax-elements-toc">T</a></h2> - <p>An element’s <dfn id="content-model" title="content-model">content model</dfn> defines the element’s structure: What + <p>An element’s + <dfn id="content-model" title="content-model">content model</dfn> + defines the element’s structure: What <a href="syntax.html#contents">contents</a> (if any) the element can contain, as well as what attributes (if any) the element can have. The <a href="elements.html">HTML elements</a> section of this specification defines the content models for - all of the elements that are part of the + all of elements that are part of the <a href="documents.html#html-language">HTML language</a>. An element must not contain <a href="syntax.html#contents">contents</a> @@ -293,7 +299,7 @@ <a href="references.html#refsXML">[XML]</a>.</p> <ul> <li><dfn id="tags" title="syntax-tags">Tags</dfn> are used to - delimit the start and end of elements in the markup. Elements + delimit the start and end of elements in markup. Elements have a <a href="syntax.html#syntax-start-tags">start tag</a> to indicate where they begin. Non-<a href="syntax.html#void-element">void</a> elements have an @@ -454,7 +460,15 @@ <li> <dfn id="syntax-attribute-value">Attribute values</dfn>, in general, are - <a href="syntax.html#normal-character-data">normal character data</a>.</li> + <a href="syntax.html#normal-character-data">normal character data</a>; + however, the <a href="elements.html">HTML elements</a> section + of this specification defines further restrictions on the + allowed values of all attributes that are part of the + <a href="documents.html#html-language">HTML language</a>. + An attribute must not have a value that is not allowed by + the + <a href="syntax.html#content-model">content model</a> + of the element that contains it.</li> </ul> <p>In the <a href="documents.html#html-syntax">the HTML syntax</a>, attributes can be specified in four different ways:</p> @@ -722,9 +736,8 @@ <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>, the <a href="script.html#script" class="element">script</a>, - <a href="style.html#style" class="element">style</a>, and - <a href="iframe.html#iframe" class="element">iframe</a> + <a href="style.html#style" class="element">style</a> elements can contain non-replaceable character data. Non-replaceable character data can contain the following:</p> @@ -746,9 +759,7 @@ character data (for example, "<code></script</code>" or - "<code></style</code>" - or - "<code></iframe</code>"), + "<code></style</code>", followed by one of U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF), @@ -996,7 +1007,6 @@ <p>The text in <a href="style.html#style">style</a>, <a href="script.html#script">script</a>, - <a href="iframe.html#iframe">iframe</a>, <a href="title.html#title">title</a>, and <a href="textarea.html#textarea">textarea</a> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- spec.html 7 Aug 2009 14:50:29 -0000 1.91 +++ spec.html 8 Aug 2009 14:02:58 -0000 1.92 @@ -9,7 +9,7 @@ <body> <div class="head"> <h1>HTML 5: The Markup Language</h1> -<h2>Editor’s Draft <em>7 August 2009</em> +<h2>Editor’s Draft <em>8 August 2009</em> </h2> <dl> <dt>Latest Editor’s Draft:</dt> @@ -41,7 +41,7 @@ <p> - This document is the 7 August 2009 Editor’s Draft of + This document is the 8 August 2009 Editor’s Draft of <cite>HTML 5: The Markup Language</cite>. </p> <p> @@ -1135,7 +1135,7 @@ "<code>HTML</code>", 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 is an exact + 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>The @@ -1146,7 +1146,7 @@ "<code>HTML</code>", 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 is an exact + 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>The @@ -1157,7 +1157,7 @@ "<code>HTML</code>", 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 either missing is an exact + and its system identifier is either missing or is an exact match for the literal string "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li> <li>The @@ -1168,12 +1168,12 @@ "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD XHTML 1.1//EN</code>", - and its system identifier is either missing is an exact + and its system identifier is either missing or 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 + <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> @@ -1184,10 +1184,10 @@ <div id="character-encoding" class="section"> <h2>6.02. Character encoding declaration <a class="hash" href="#character-encoding">#</a> <a class="toc-bak" href="#character-encoding-toc">T</a> </h2> - <p>A <dfn id="encoding-declaration">character - encoding declaration</dfn> is a mechanism by which the - character encoding used to store or transmit a document is - specified.</p> + <p>A + <dfn id="encoding-declaration" title="encoding-declaration">character encoding declaration</dfn> + is a mechanism for specifying the character encoding used to store + or transmit a document.</p> <p>The following restrictions apply to character encoding declarations:</p> <ul> @@ -1245,19 +1245,25 @@ </p> <p>In a <a href="#syntax-document-xml">document the XML syntax</a>, - the XML declaration should be used to provide - character-encoding information, if necessary.</p> + the + <dfn id="xml-declaration" title="xml-declaration">XML declaration</dfn>, + as defined in the XML specification + <a href="#refsXML">[XML]</a> + should be used to provide character-encoding information, if + necessary.</p> </div> <div id="syntax-elements" class="section"> <h2>6.03. Elements <a class="hash" href="#syntax-elements">#</a> <a class="toc-bak" href="#syntax-elements-toc">T</a> </h2> - <p>An element’s <dfn id="content-model" title="content-model">content model</dfn> defines the element’s structure: What + <p>An element’s + <dfn id="content-model" title="content-model">content model</dfn> + defines the element’s structure: What <a href="#contents">contents</a> (if any) the element can contain, as well as what attributes (if any) the element can have. The <a href="#elements">HTML elements</a> section of this specification defines the content models for - all of the elements that are part of the + all of elements that are part of the <a href="#html-language">HTML language</a>. An element must not contain <a href="#contents">contents</a> @@ -1307,7 +1313,7 @@ <ul> <li> <dfn id="tags" title="syntax-tags">Tags</dfn> are used to - delimit the start and end of elements in the markup. Elements + delimit the start and end of elements in markup. Elements have a <a href="#syntax-start-tags">start tag</a> to indicate where they begin. Non-<a href="#void-element">void</a> elements have an @@ -1474,7 +1480,15 @@ <li> <dfn id="syntax-attribute-value">Attribute values</dfn>, in general, are - <a href="#normal-character-data">normal character data</a>.</li> + <a href="#normal-character-data">normal character data</a>; + however, the <a href="#elements">HTML elements</a> section + of this specification defines further restrictions on the + allowed values of all attributes that are part of the + <a href="#html-language">HTML language</a>. + An attribute must not have a value that is not allowed by + the + <a href="#content-model">content model</a> + of the element that contains it.</li> </ul> <p>In the <a href="#html-syntax">the HTML syntax</a>, attributes can be specified in four different ways:</p> @@ -1762,9 +1776,8 @@ <a href="#syntax-document-html">documents in the HTML syntax</a>, the <a href="#script" class="element">script</a>, - <a href="#style" class="element">style</a>, and - <a href="#iframe" class="element">iframe</a> + <a href="#style" class="element">style</a> elements can contain non-replaceable character data. Non-replaceable character data can contain the following:</p> @@ -1789,9 +1802,7 @@ character data (for example, "<code></script</code>" or - "<code></style</code>" - or - "<code></iframe</code>"), + "<code></style</code>", followed by one of U+0009 CHARACTER TABULATION, U+000A LINE FEED (LF), @@ -2046,7 +2057,6 @@ <p>The text in <a href="#style">style</a>, <a href="#script">script</a>, - <a href="#iframe">iframe</a>, <a href="#title">title</a>, and <a href="#textarea">textarea</a> @@ -7107,7 +7117,7 @@ </h2> <div class="content-models" id="iframe-mdls"> <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="#iframe-mdl" class="element">iframe</a> = </span><span> - <a class="ref" href="#non-replaceable-character-data">non-replaceable-character-data</a> + <a class="ref" href="#normal-character-data">normal-character-data</a> & <a class="ref" href="#iframe.attrs">iframe.attrs</a> </span></p> </div>
Received on Saturday, 8 August 2009 14:04:20 UTC