- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 16 Aug 2009 10:53:48 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/src In directory hutz:/tmp/cvs-serv28279/src Modified Files: datatypes.html documents.html intro-scope.html syntax.html terms.html Removed Files: conformance.html structure.html Log Message: added explanations for all RNC symbols, and turned all instances of RNC symbols in element and attribute definitions into hyperlinks; filled out intros for a number of other sections that were missing them --- structure.html DELETED --- Index: documents.html =================================================================== RCS file: /sources/public/html5/markup/src/documents.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- documents.html 7 Aug 2009 14:50:29 -0000 1.6 +++ documents.html 16 Aug 2009 10:53:46 -0000 1.7 @@ -1,7 +1,10 @@ <section id="documents" xmlns="http://www.w3.org/1999/xhtml"> <h2>Documents</h2> + <p>This section introduces the following:</p> <div class="toc"/> + <section id="language-and-syntax"> + <h2>The HTML language and HTML and XML syntaxes</h2> <p>The term <dfn id="document" title="document">document</dfn> is used in this specification @@ -32,7 +35,8 @@ title="html-syntax" >HTML syntax</dfn> is the syntax described in the - “HTML syntax” section of this specification.</p> + <a href="#syntax">HTML syntax</a> + section of this specification.</p> <p>The <dfn id="xml-syntax" title="xml-syntax" @@ -45,6 +49,7 @@ this specification does not define any additional syntax-level requirements for <a href="#syntax-document-xml">documents in the XML syntax</a>.</p> + </section> <section id="mime-types"> <h2>The HTML namespace and MIME types</h2> <p>The @@ -98,6 +103,10 @@ <a href="#syntax-comments">comments</a> and <a href="#space">space characters</a>.</li> </ol> + <p><a href="#syntax-document-html">Documents in the HTML syntax</a> + must conform to the syntax described in the + <a href="#html-syntax">HTML syntax</a> + section of this specification.</p> <p>A conformant <dfn id="syntax-document-xml" title="syntax-document-xml">document in the XML syntax</dfn> @@ -144,9 +153,9 @@ for <a href="#html-elements">HTML elements</a> may be written with any mix of lowercase and - uppercase letters that are an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the names of the elements given in the + uppercase letters that are a + <a href="#case-insensitive">case-insensitive match</a> + for the names of the elements given in the <a href="#elements">HTML elements</a> section of this document; tag names are case-insensitive.</li> @@ -155,8 +164,8 @@ <a href="#html-elements">HTML elements</a> may be written with any mix of lowercase and uppercase letters that are an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the names of the attributes given in the + <a href="#case-insensitive">case-insensitive match</a> + for the names of the attributes given in the <a href="#elements">HTML elements</a> section of this document; attribute names are case-insensitive.</li> Index: terms.html =================================================================== RCS file: /sources/public/html5/markup/src/terms.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- terms.html 4 Aug 2009 15:46:34 -0000 1.10 +++ terms.html 16 Aug 2009 10:53:46 -0000 1.11 @@ -1,44 +1,60 @@ <section id="terminology" xmlns="http://www.w3.org/1999/xhtml"> - <h2>Terminology</h2> - <p>This section defines terms used in other parts of this - specification.</p> + <h2>Terminology and symbols</h2> + <p>This section defines the following:</p> + <div class="toc"/> + <section id="terms"> + <h2>Terms used in other parts of the specification</h2> + <p>The following is a list of terms that are common to various + other sections in this specification.</p> <dl> - <dt><dfn id="ascii-case-insensitive">ASCII case-insensitive</dfn></dt> - <dd>Comparing two strings in an <a - href="#ascii-case-insensitive">ASCII case-insensitive</a> - manner means comparing them exactly, codepoint for - codepoint, except that the characters in the range U+0041 .. - U+005A (that is, LATIN CAPITAL LETTER A to LATIN CAPITAL - LETTER Z) and the corresponding characters in the range - U+0061 .. U+007A (that is, LATIN SMALL LETTER A to LATIN - SMALL LETTER Z) are considered to also match.</dd> <dt><dfn id="context">browsing context</dfn></dt> <dd>A <a href="#context">browsing context</a> is a collection of one or more documents and one or more <a href="#view">views</a>.</dd> - <dt><dfn id="case-insensitive">case-insensitive</dfn></dt> - <dd>The term <a href="#case-insensitive">case-insensitive</a> - is used throughout this specification to mean case - insensitivity only for characters in the ranges U+0041 .. - U+005A (LATIN CAPITAL LETTER A to LATIN CAPITAL LETTER Z) - and U+0061 .. U+007A (LATIN SMALL LETTER A to LATIN SMALL - LETTER Z). Many strings in the HTML syntax (for example, the - names of elements and their attributes) are <a - href="#case-insensitive">case-insensitive</a>. - </dd> - <dd>For <a href="#syntax-document-xml">documents in the XML - syntax</a>, <a href="#character-data">character data</a> - is as defined in the XML specification <a - href="#refsXML">[XML]</a>.</dd> + <dt><dfn id="case-insensitive">case-insensitive match</dfn></dt> + <dd>For the purposes of this specification, + performing a + <a href="#case-insensitive">case-insensitive match</a> + between two strings means comparing the strings exactly, + codepoint for codepoint, except that the characters in the + range + <code title="U+0041 LATIN CAPITAL LETTER A–U+005A LATIN CAPITAL LETTER Z">A-Z</code> + and the corresponding characters in the range + <code title="U+0061 LATIN SMALL LETTER A–U+007A LATIN SMALL LETTER Z">a-z</code> + are considered to also match.</dd> <dt><dfn id="fallback">fallback content</dfn></dt> <dd>Some embedded content elements can have fallback content: content that is to be used when the embedded content cannot be used (for example, when it is of an unsupported format).</dd> + <dt><dfn + id="group" + title="group" + >group</dfn></dt> + <dd>A + <a href="#group">group</a> + is any combination of names and symbols in definitions in the + <a href="#elements">HTML elements</a>, + <a href="#common-models">Common content models</a>, + <a href="#common-attributes">Common attributes</a>, + or + <a href="#forms-attributes">Forms attributes</a> + that are delimited by a set of matching + "<code>(</code>" and "<code>)</code>" + (parentheses) symbols.</dd> <dt><dfn id="identify">identify</dfn></dt> <dd>To <a href="#identify">identify</a> a particular element means to reference that element by means of its <a href="#common.attrs.id">id</a> attribute.</dd> + <dt><dfn id="html-producer" + title="html-producer">HTML producers</dfn></dt> + <dd>HTML authors (that is, people) and applications + (such as editors and content management systems) + that produce HTML content.</dd> + <dt><dfn id="html-consumer" + title="html-consumer">HTML consumers</dfn></dt> + <dd>HTML user agents; that is, applications (such as + Web browsers) which consume HTML content</dd> <dt><dfn id="newlines">newline</dfn></dt> <dd>A <a href="#newlines">newline</a> may be represented as any of the following: @@ -49,6 +65,20 @@ LINE FEED (LF) character</li> </ul> </dd> + <dt><dfn + id="pattern-name" + title="pattern-name" + >pattern name</dfn></dt> + <dd>A + <a href="#pattern-name">pattern name</a> + is any name used in definitions in the + <a href="#elements">HTML elements</a>, + <a href="#common-models">Common content models</a>, + <a href="#common-attributes">Common attributes</a>, + or + <a href="#forms-attributes">Forms attributes</a> + sections of this specification that is not an element name or + an attribute name.</dd> <dt><dfn id="space">space</dfn></dt> <dd>A <a href="#space">space character</a> is any of the following: @@ -65,4 +95,74 @@ Object Model (DOM) Level 2 Views</cite> <a href="#refsDOM2VIEWS">[DOM2VIEWS]</a>.</dd> </dl> + </section> + <section id="rnc-symbols"> + <h2>Symbols used in content models</h2> + <p>This section provides explanations for the symbols used in + the <i>Content model</i> and <i>Attribute model</i> + subsections of the per-element documentation in the + <a href="#elements">HTML elements</a> + section and in the + <a href="#common-models">Common content models</a>, + <a href="#common-attributes">Common attributes</a>, + and + <a href="#forms-attributes">Forms attributes</a> + sections.</p> + <dl id="rnc-symbol-list"> + <dt id="optional"><span class="rnc-symbol">?</span> (optional)</dt> + <dd>The "<code>?</code>" (question mark) symbol after an + element name, attribute name, + <a href="#pattern-name">pattern name</a>, + or + <a href="#group">group</a> + indicates that it is optional — meaning that it can either + not occur at all, or it can occur exactly once.</dd> + <dt id="zero-or-more"><span class="rnc-symbol">*</span> (zero or more)</dt> + <dd>The "<code>*</code>" (asterisk) symbol after an element + name, + <a href="#pattern-name">pattern name</a>, + or + <a href="#group">group</a> + indicates that it may occur + any number of times, including not occurring at all.</dd> + <dt id="one-or-more"><span class="rnc-symbol">+</span> (one or more)</dt> + <dd>The "<code>+</code>" (plus sign) symbol after an element + name, + <a href="#pattern-name">pattern name</a>, + or + <a href="#group">group</a> + indicates that is must occur + at least once, and can occur more than once.</dd> + <dt id="choice"><span class="rnc-symbol">|</span> (either/or choice)</dt> + <dd>The "<code>|</code>" (vertical line) symbol between + element names, attribute names, + <a href="#pattern-name">pattern names</a>, + and + <a href="#group">groups</a> + indicates an either/or alternative relationship between + the two items it separates; that it, it indicates that + either the item before the "<code>|</code>" symbol can + occur, or the item after the symbol can occur.</dd> + <dt id="in-order"><span class="rnc-symbol">,</span> (in the order shown)</dt> + <dd>The "<code>,</code>" (comma) symbol between element + names, + <a href="#pattern-name">pattern names</a>, + and + <a href="#group">groups</a> + indicates that the two + items it separates can only occur in the order shown.</dd> + <dt id="interleave"><span class="rnc-symbol">&</span> (interleaved in any order)</dt> + <dd>The "<code>&</code>" (ampersand) symbol between + element names, attribute names, + <a href="#pattern-name">pattern names</a>, + and + <a href="#group">groups</a> + indicates that the two items it separates can occur in any + order.</dd> + <dt id="parentheses"><span class="rnc-symbol">(</span> and <span class="rnc-symbol">)</span> (grouping)</dt> + <dd>The "<code>(</code>" and "<code>)</code>" (parentheses) + symbols are used to delimit multiple items such that they + are treated as a group.</dd> + </dl> + </section> </section> Index: datatypes.html =================================================================== RCS file: /sources/public/html5/markup/src/datatypes.html,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- datatypes.html 9 Aug 2009 15:15:20 -0000 1.33 +++ datatypes.html 16 Aug 2009 10:53:46 -0000 1.34 @@ -2,8 +2,10 @@ xmlns="http://www.w3.org/1999/xhtml"> <section id="data-string-def" class="no-toc"> <h2>String</h2> - <p>For any pattern in this document that references the <a - href="#data-string">string</a> datatype, a + <p>For any attribute definition in this document that + references the + <a href="#data-string">string</a> + datatype, a <dfn id="data-string" title="string">string</dfn> is defined as <a href="#normal-character-data">normal character data</a> @@ -24,8 +26,10 @@ </section> <section id="data-token-def" class="no-toc"> <h2>Token</h2> - <p>For any pattern in this document that references the <a - href="#data-token">token</a> datatype, a + <p>For any attribute definition in this document that + references the + <a href="#data-token">token</a> + datatype, a <dfn id="data-token" title="token">token</dfn> is defined as a <a href="#data-string">string</a> that does not contain @@ -70,8 +74,9 @@ <ul> <li>a <a href="#common.data.browsing-context-name">browsing-context-name</a></li> - <li>an <a href="#ascii-case-insensitive">ASCII - case-insensitive</a> match for one of the following literal strings: + <li>any + <a href="#case-insensitive">case-insensitive match</a> + for one of the following literal strings: <ul> <li><code>_blank</code></li> <li><code>_self</code></li> @@ -375,8 +380,8 @@ <a href="#refsIANACHARSET">[IANACHARSET]</a>.</p> <p>For documents in the <a href="#xml-syntax">XML syntax</a>, any - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>UTF-8</code>".</p> </div> </dd> @@ -416,8 +421,8 @@ <li>One or more <a href="#space">space characters</a>.</li> <li>A - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>url=</code>".</li> <li>A <a href="#common.data.uri">URI</a>.</li> @@ -669,8 +674,8 @@ <dd></dd> <dd> <div class="datatype-desc">Any - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the literal string "<code>javascript</code>".</div> + <a href="#case-insensitive">case-insensitive match</a> + for the literal string "<code>javascript</code>".</div> </dd> </dl> <dl><dt>sandbox-allow-list</dt> --- conformance.html DELETED --- Index: syntax.html =================================================================== RCS file: /sources/public/html5/markup/src/syntax.html,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- syntax.html 8 Aug 2009 14:02:59 -0000 1.67 +++ syntax.html 16 Aug 2009 10:53:46 -0000 1.68 @@ -1,6 +1,18 @@ <section id="syntax" xmlns="http://www.w3.org/1999/xhtml"> <h2>HTML syntax</h2> + <p>This section describes the + <a href="#html-syntax">the HTML syntax</a> + in detail. In places, it also notes differences between the + <a href="#html-syntax">the HTML syntax</a> + and + <a href="#xml-syntax">the XML syntax</a>, + but it does not describe the XML syntax in detail (the XML + syntax is instead defined by rules in the XML specification + <a href="#refsXML">[XML]</a> + and in the Namespaces in XML 1.0 specification + <a href="#refsXML">[XMLNS]</a>).</p> + <p>This section is divided into the following parts:</p> <div class="toc"/> <section id="doctype-syntax"> <h2>The doctype</h2> @@ -24,14 +36,14 @@ "<code title="U+0021 EXCLAMATION MARK">!</code>" character.</li> <li>Any - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + <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="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + <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> @@ -51,8 +63,8 @@ <li>One or more <a href="#space">space characters</a>.</li> <li>Any - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>SYSTEM</code>".</li> <li>One or more <a href="#space">space characters</a></li> @@ -94,9 +106,9 @@ <ul> <li>The <a href="#doctype-declaration">document type declaration’s</a> - name part is an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + name part is a + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD HTML 4.0//EN</code>", @@ -105,9 +117,9 @@ "<code>http://www.w3.org/TR/REC-html40/strict.dtd</code>".</li> <li>The <a href="#doctype-declaration">document type declaration’s</a> - name part is an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + name part is a + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD HTML 4.01//EN</code>", @@ -116,9 +128,9 @@ "<code>http://www.w3.org/TR/html4/strict.dtd</code>".</li> <li>The <a href="#doctype-declaration">document type declaration’s</a> - name part is an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + name part is a + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD XHTML 1.0 Strict//EN</code>", @@ -127,9 +139,9 @@ "<code>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</code>".</li> <li>The <a href="#doctype-declaration">document type declaration’s</a> - name part is an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string + name part is a + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>HTML</code>", its public identifier is an exact match for the literal string "<code>-//W3C//DTD XHTML 1.1//EN</code>", @@ -416,9 +428,9 @@ and a <a href="#syntax-attribute-value">value</a>.</p> <p>There must never be two or more attributes on the same - start tag whose names are an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for each other.</p> + start tag whose names are a + <a href="#case-insensitive">case-insensitive match</a> + for each other.</p> <p id="elements-xml-syntax">The following list describes syntax rules for attributes in <a href="#syntax-document-html">documents in the HTML syntax</a>. @@ -447,9 +459,9 @@ the XML specification <a href="#refsXML">[XML]</a> and that contain no "<code title="U+003A COLON">:</code>" - characters, and whose first three characters are not an - <a href="#ascii-case-insensitive">ASCII case-insensitive</a> - match for the string "<code>xml</code>".</li> + characters, and whose first three characters are not a + <a href="#case-insensitive">case-insensitive match</a> + for the string "<code>xml</code>".</li> <li> <dfn id="syntax-attribute-value">Attribute values</dfn>, in general, are @@ -710,10 +722,10 @@ <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li> <li>must not contain any occurrences of the string "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS"></</code>" - followed by characters that - case-insensitively match the tag name of the - element containing the replaceable character data - (for example, + followed by characters that are a + <a href="#case-insensitive">case-insensitive match</a> + for the tag name of the element containing the + replaceable character data (for example, "<code></title</code>" or "<code></textarea</code>"), followed by one of @@ -765,9 +777,10 @@ <li>must not contain <a href="#syntax-charref">character references</a></li> <li>must not contain any occurrences of the string "<code title="U+003C LESS-THAN SIGN, U+002F SOLIDUS"></</code>", - followed by characters that case-insensitively match the - tag name of the element containing the replaceable - character data (for example, + followed by characters that are a + <a href="#case-insensitive">case-insensitive match</a> + for the tag name of the element containing the + replaceable character data (for example, "<code></script</code>" or "<code></style</code>", Index: intro-scope.html =================================================================== RCS file: /sources/public/html5/markup/src/intro-scope.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- intro-scope.html 6 Aug 2009 10:34:35 -0000 1.10 +++ intro-scope.html 16 Aug 2009 10:53:46 -0000 1.11 @@ -1,54 +1,29 @@ <section id="intro" xmlns="http://www.w3.org/1999/xhtml"> - <h2>Introduction and Scope</h2> - <p>This section primarily describes the scope of this - specification. In describing the scope, this section - relies on making a distinction between the following - two major classes:</p> - <dl> - <dt><dfn id="html-producer" - title="html-producer">HTML producers</dfn></dt> - <dd>HTML authors (that is, people) and applications - (such as editors and content management systems) - that produce HTML content.</dd> - <dt><dfn id="html-consumer" - title="html-consumer">HTML consumers</dfn></dt> - <dd>HTML user agents; that is, applications (such as - Web browsers) which consume HTML content</dd> - </dl> - <section id="scope"> - <h2>Scope</h2> - <p>This specification limits its scope to providing - the details necessary for HTML producers to create - <a href="#conformant-documents">conformant documents</a>. - It is designed:</p> - <ul> - <li>to describe the syntax, structure, and - semantics of the HTML language</li> - <li>to be clear and unambiguous</li> - <li>to be as concise and readable as possible</li> - <li>…</li> - </ul> - </section> - <section id="out-of-scope"> - <h2>Out of scope</h2> - <p>This specification, by design:</p> - <ul> - <li>does not provide any conformance - criteria for HTML consumers; in particular, it - does not attempt to define how Web browsers and - other user agents process documents</li> - <li>does not define any APIs related to processing - of HTML content by HTML consumers.</li> - <li>does not attempt to be a tutorial or “how - to” authoring guide</li> - </ul> - </section> - <section id="audience"> - <h2>Intended audience</h2> - <p>This specification is intended for producers of documents - intended to conform to the requirements it describes, and - individuals wishing to establish the correctness of documents - with respect to the requirements it describes.</p> - </section> + <h2>Introduction</h2> + <p>This specification provides the details necessary for + <a href="#html-producer">producers of HTML content</a> + to create + <a href="#conformant-documents">conformant documents</a>, + and for others to check the conformance of existing documents. + It is designed:</p> + <ul> + <li>to describe the syntax, structure, and semantics of the + <a href="#html-language">HTML language</a></li> + <li>to be clear and unambiguous</li> + <li>to be as concise and readable as possible</li> + </ul> + <p>Certain purposes are intentionally out of scope for this + specification; in particular, it:</p> + <ul> + <li>does not provide any conformance criteria for + <a href="#html-consumer">HTML consumers</a>; + in particular, it does not attempt to define how Web browsers + and other user agents process documents</li> + <li>does not define any APIs related to processing of HTML + content by + <a href="#html-consumer">HTML consumers</a>.</li> + <li>does not attempt to be a tutorial or “how to” authoring + guide</li> + </ul> </section>
Received on Sunday, 16 August 2009 10:53:59 UTC