- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 30 Jul 2009 11:08:56 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup In directory hutz:/tmp/cvs-serv27211 Modified Files: Overview.html common-attributes.html patch-schema spec.html Log Message: streamlined documentation for common attributes Index: Overview.html =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.332 retrieving revision 1.333 diff -u -d -r1.332 -r1.333 --- Overview.html 30 Jul 2009 07:44:13 -0000 1.332 +++ Overview.html 30 Jul 2009 11:08:53 -0000 1.333 @@ -640,20 +640,17 @@ <li id="common-attributes-toc"> <a href="common-attributes.html#common-attributes">9. Common attributes</a> <ul> -<li id="basic-attrs-toc"> -<a href="common-attributes.html#basic-attrs">9.1. Basic attributes</a> -</li> -<li id="i18n-attrs-toc"> -<a href="common-attributes.html#i18n-attrs">9.2. Internationalization attributes</a> +<li id="core-attrs-toc"> +<a href="common-attributes.html#core-attrs">9.1. Core attributes</a> </li> -<li id="present-attrs-toc"> -<a href="common-attributes.html#present-attrs">9.3. Present attributes</a> +<li id="interaction-attrs-toc"> +<a href="common-attributes.html#interaction-attrs">9.2. Interaction attributes</a> </li> -<li id="common.attrs.scripting-attrs-toc"> -<a href="common-attributes.html#common.attrs.scripting-attrs">9.4. Scripting attributes</a> +<li id="scripting-attrs-toc"> +<a href="common-attributes.html#scripting-attrs">9.3. Scripting attributes</a> </li> -<li id="common.attrs.interact-attrs-toc"> -<a href="common-attributes.html#common.attrs.interact-attrs">9.5. Interaction attributes</a> +<li id="xml-attrs-toc"> +<a href="common-attributes.html#xml-attrs">9.4. XML attributes</a> </li> </ul> </li> Index: common-attributes.html =================================================================== RCS file: /sources/public/html5/markup/common-attributes.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- common-attributes.html 30 Jul 2009 07:44:13 -0000 1.12 +++ common-attributes.html 30 Jul 2009 11:08:54 -0000 1.13 @@ -15,31 +15,33 @@ <h2>9. Common attributes <a class="hash" href="#common-attributes">#</a> <a class="toc-bak" href="Overview.html#common-attributes-toc">T</a></h2> <div id="common.attrs-mdl"> <dl class="content-models"> - <dt class="content-model"><span class="common-pattern-name"><a href="common-attributes.html#common.attrs" id="common.attrs">common.attrs</a></span> = </dt><dd><a class="ref" href="common-attributes.html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - & <a class="ref" href="common-attributes.html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - & <a class="ref" href="common-attributes.html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> + <dt class="content-model"><span class="common-pattern-name"><a href="common-attributes.html#common.attrs" id="common.attrs">common.attrs</a></span> = </dt><dd><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + & <a class="ref" href="common-attributes.html#common.attrs.interaction" title="common.attrs.interaction">common.attrs.interaction</a> & <a class="ref" href="common-attributes.html#common.attrs.scripting" title="common.attrs.scripting">common.attrs.scripting</a> - & <a class="ref" href="common-attributes.html#common.attrs.interact" title="common.attrs.interact">common.attrs.interact</a> + & <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> </dd> </dl> </div> - <div id="basic-attrs" class="section"> - <h2 class="common-subhead">9.1. Basic attributes <a class="hash" href="#basic-attrs">#</a> <a class="toc-bak" href="Overview.html#basic-attrs-toc">T</a></h2><div id="common.attrs.basic-mdl"> + <div id="core-attrs" class="section"> + <h2 class="common-subhead">9.1. Core attributes <a class="hash" href="#core-attrs">#</a> <a class="toc-bak" href="Overview.html#core-attrs-toc">T</a></h2><div id="common.attrs.core-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.basic" id="common.attrs.basic">common.attrs.basic</a></span> = <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a> + <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.core" id="common.attrs.core">common.attrs.core</a></span> = <a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a>? & <a class="ref" href="common-attributes.html#common.attrs.class" title="common.attrs.class">class</a>? - & <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a>? - & <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a>? - & <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a>?</p> + & <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a>? + & <a class="ref" href="common-attributes.html#common.attrs.id" title="common.attrs.id">id</a>? + & <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a>? + & <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a>? + & <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a>? + & <a class="ref" href="common-attributes.html#common.attrs.title" title="common.attrs.title">title</a>?</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> - <dt><a class="attribute-name" id="common.attrs.id" title="common.attrs.id" href="common-attributes.html#common.attrs.id">id</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.id" title="common.data.id">id</a> + <dt><a class="attribute-name" id="common.attrs.accesskey" title="common.attrs.accesskey" href="common-attributes.html#common.attrs.accesskey">accesskey</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.keylabellist" title="common.data.keylabellist">keylabellist</a> </span> </dt> - <dd>A unique identifier for the element.</dd> + <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt><a class="attribute-name" id="common.attrs.class" title="common.attrs.class" href="common-attributes.html#common.attrs.class">class</a><span class="attr-values"> = <a class="ref" href="datatypes.html#common.data.tokens" title="common.data.tokens">tokens</a> @@ -47,78 +49,68 @@ <dd>A list of one or more classifications to which the element belongs.</dd> - <dt><a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="common-attributes.html#common.attrs.title">title</a><span class="attr-values"> = - <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> - </span> </dt> - <dd>Advisory information associated with the element.</dd> + <dt><a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="common-attributes.html#common.attrs.dir">dir</a><span class="attr-values"> = "ltr" | "rtl" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.xmlbase" title="common.attrs.xmlbase" href="common-attributes.html#common.attrs.xmlbase">xml:base</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a> + <dt><a class="attribute-name" id="common.attrs.id" title="common.attrs.id" href="common-attributes.html#common.attrs.id">id</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.id" title="common.data.id">id</a> </span> </dt> - <dd>As defined in the XML Base specification - <a href="references.html#refsXMLBase">[XMLBase]</a>.</dd><dd>This attribute should only be used with - <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>. - It must not be used in - <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.</dd> + <dd>A unique identifier for the element.</dd> - <dt><a class="attribute-name" id="common.attrs.xmlspace" title="common.attrs.xmlspace" href="common-attributes.html#common.attrs.xmlspace">xml:space</a><span class="attr-values"> = "preserve" </span> </dt> - <dd>As defined in the XML specification - <a href="references.html#refsXML">[XML]</a>.</dd><dd>This attribute should only be used with - <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>. - It must not be used in - <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.</dd> + <dt><a class="attribute-name" id="common.attrs.lang" title="common.attrs.lang" href="common-attributes.html#common.attrs.lang">lang</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.langcode" title="common.data.langcode">langcode</a> + </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> - </dl></div></div><div id="i18n-attrs" class="section"> - <h2 class="common-subhead">9.2. Internationalization attributes <a class="hash" href="#i18n-attrs">#</a> <a class="toc-bak" href="Overview.html#i18n-attrs-toc">T</a></h2><div id="common.attrs.i18n-mdl"> - - <div class="content-models"> - <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.i18n" id="common.attrs.i18n">common.attrs.i18n</a></span> = <a class="ref" href="common-attributes.html#common.attrs.dir" title="common.attrs.dir">dir</a>? - & (<a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a>? - & <a class="ref" href="common-attributes.html#common.attrs.lang" title="common.attrs.lang">lang</a>?)?</p> - </div> - </div> - <div class="no-number no-toc"> - <dl class="attr-defs"> - <dt><a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="common-attributes.html#common.attrs.dir">dir</a><span class="attr-values"> = "ltr" | "rtl" </span> </dt> + <dt><a class="attribute-name" id="common.attrs.style" title="common.attrs.style" href="common-attributes.html#common.attrs.style">style</a><span class="attr-values"> = <a href="datatypes.html#data-string">string</a></span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.xmllang" title="common.attrs.xmllang" href="common-attributes.html#common.attrs.xmllang">xml:lang</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.langcode" title="common.data.langcode">langcode</a> + <dt><a class="attribute-name" id="common.attrs.tabindex" title="common.attrs.tabindex" href="common-attributes.html#common.attrs.tabindex">tabindex</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.integer" title="common.data.integer">integer</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.lang" title="common.attrs.lang" href="common-attributes.html#common.attrs.lang">lang</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.langcode" title="common.data.langcode">langcode</a> + <dt><a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="common-attributes.html#common.attrs.title">title</a><span class="attr-values"> = + <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a> </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> + <dd>Advisory information associated with the element.</dd> - </dl></div></div><div id="present-attrs" class="section"> - <h2 class="common-subhead">9.3. Present attributes <a class="hash" href="#present-attrs">#</a> <a class="toc-bak" href="Overview.html#present-attrs-toc">T</a></h2><div id="common.attrs.present-mdl"> + </dl></div></div><div id="interaction-attrs" class="section"> + <h2 class="common-subhead">9.2. Interaction attributes <a class="hash" href="#interaction-attrs">#</a> <a class="toc-bak" href="Overview.html#interaction-attrs-toc">T</a></h2><div id="common.attrs.interaction-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.present" id="common.attrs.present">common.attrs.present</a></span> = <a class="ref" href="common-attributes.html#common.attrs.style" title="common.attrs.style">style</a>? - & <a class="ref" href="common-attributes.html#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a>? - & <a class="ref" href="common-attributes.html#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a>?</p> + <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.interaction" id="common.attrs.interaction">common.attrs.interaction</a></span> = (<a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a>? + & <a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>? + & <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a>? + & <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a>? + & <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a>?)</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> - <dt><a class="attribute-name" id="common.attrs.style" title="common.attrs.style" href="common-attributes.html#common.attrs.style">style</a><span class="attr-values"> = <a href="datatypes.html#data-string">string</a></span> </dt> + <dt><a class="attribute-name" id="common.attrs.contenteditable" title="common.attrs.contenteditable" href="common-attributes.html#common.attrs.contenteditable">contenteditable</a><span class="attr-values"> = + "true" | "false" | "" + </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.tabindex" title="common.attrs.tabindex" href="common-attributes.html#common.attrs.tabindex">tabindex</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.integer" title="common.data.integer">integer</a> + <dt><a class="attribute-name" id="common.attrs.contextmenu" title="common.attrs.contextmenu" href="common-attributes.html#common.attrs.contextmenu">contextmenu</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.idref" title="common.data.idref">idref</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.accesskey" title="common.attrs.accesskey" href="common-attributes.html#common.attrs.accesskey">accesskey</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.keylabellist" title="common.data.keylabellist">keylabellist</a> + <dt><a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="common-attributes.html#common.attrs.draggable">draggable</a><span class="attr-values"> = "true" | "false" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> + + <dt><a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="common-attributes.html#common.attrs.hidden">hidden</a><span class="attr-values"> = "hidden" | "" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> + + <dt><a class="attribute-name" id="common.attrs.spellcheck" title="common.attrs.spellcheck" href="common-attributes.html#common.attrs.spellcheck">spellcheck</a><span class="attr-values"> = + "true" | "false" | "" </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - </dl></div></div> - <div id="common.attrs.scripting-attrs" class="section"> - <h2 class="common-subhead">9.4. Scripting attributes <a class="hash" href="#common.attrs.scripting-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.scripting-attrs-toc">T</a></h2><div id="common.attrs.scripting-mdl"> + </dl></div></div><div id="scripting-attrs" class="section"> + <h2 class="common-subhead">9.3. Scripting attributes <a class="hash" href="#scripting-attrs">#</a> <a class="toc-bak" href="Overview.html#scripting-attrs-toc">T</a></h2><div id="common.attrs.scripting-mdl"> <div class="content-models"> <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.scripting" id="common.attrs.scripting">common.attrs.scripting</a></span> = (<a class="ref" href="common-attributes.html#scripting.attr.onabort" title="scripting.attr.onabort">onabort</a>? @@ -152,8 +144,7 @@ & <a class="ref" href="common-attributes.html#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a>? & <a class="ref" href="common-attributes.html#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a>? & <a class="ref" href="common-attributes.html#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a>? - & <a class="ref" href="common-attributes.html#scripting.attr.onunload" title="scripting.attr.onunload">onunload</a>?) - </p> + & <a class="ref" href="common-attributes.html#scripting.attr.onunload" title="scripting.attr.onunload">onunload</a>?)</p> </div> </div> <div class="no-number no-toc"> @@ -254,47 +245,39 @@ <dt><a class="attribute-name" id="scripting.attr.onunload" title="scripting.attr.onunload" href="common-attributes.html#scripting.attr.onunload">onunload</a><span class="attr-values"> = <a href="datatypes.html#data-string">string</a></span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - </dl> - </div> - </div> - <div id="common.attrs.interact-attrs" class="section"> - <h2 class="common-subhead">9.5. Interaction attributes <a class="hash" href="#common.attrs.interact-attrs">#</a> <a class="toc-bak" href="Overview.html#common.attrs.interact-attrs-toc">T</a></h2><div id="common.attrs.interact-mdl"> + </dl></div></div><div id="xml-attrs" class="section"> + <h2 class="common-subhead">9.4. XML attributes <a class="hash" href="#xml-attrs">#</a> <a class="toc-bak" href="Overview.html#xml-attrs-toc">T</a></h2><div id="common.attrs.xml-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.interact" id="common.attrs.interact">common.attrs.interact</a></span> = (<a class="ref" href="common-attributes.html#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>? - & <a class="ref" href="common-attributes.html#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a>? - & <a class="ref" href="common-attributes.html#common.attrs.draggable" title="common.attrs.draggable">draggable</a>? - & <a class="ref" href="common-attributes.html#common.attrs.hidden" title="common.attrs.hidden">hidden</a>? - & <a class="ref" href="common-attributes.html#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a>?) - </p> + <p><span class="common-pattern-name"><a href="common-attributes.html#common.attrs.xml" id="common.attrs.xml">common.attrs.xml</a></span> = <a class="ref" href="common-attributes.html#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a>? + & <a class="ref" href="common-attributes.html#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a>? + & <a class="ref" href="common-attributes.html#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a>?</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> - <dt><a class="attribute-name" id="common.attrs.contextmenu" title="common.attrs.contextmenu" href="common-attributes.html#common.attrs.contextmenu">contextmenu</a><span class="attr-values"> = - <a class="ref" href="datatypes.html#common.data.idref" title="common.data.idref">idref</a> + <dt><a class="attribute-name" id="common.attrs.xmlbase" title="common.attrs.xmlbase" href="common-attributes.html#common.attrs.xmlbase">xml:base</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a> </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> + <dd>As defined in the XML Base specification + <a href="references.html#refsXMLBase">[XMLBase]</a>.</dd><dd>This attribute should only be used with + <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>. + It must not be used in + <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.</dd> - <dt><a class="attribute-name" id="common.attrs.contenteditable" title="common.attrs.contenteditable" href="common-attributes.html#common.attrs.contenteditable">contenteditable</a><span class="attr-values"> = - "true" | "false" | "" + <dt><a class="attribute-name" id="common.attrs.xmllang" title="common.attrs.xmllang" href="common-attributes.html#common.attrs.xmllang">xml:lang</a><span class="attr-values"> = + <a class="ref" href="datatypes.html#common.data.langcode" title="common.data.langcode">langcode</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> - <dt><a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="common-attributes.html#common.attrs.draggable">draggable</a><span class="attr-values"> = "true" | "false" </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> - - <dt><a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="common-attributes.html#common.attrs.hidden">hidden</a><span class="attr-values"> = "hidden" | "" </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> - - <dt><a class="attribute-name" id="common.attrs.spellcheck" title="common.attrs.spellcheck" href="common-attributes.html#common.attrs.spellcheck">spellcheck</a><span class="attr-values"> = - "true" | "false" | "" - </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> + <dt><a class="attribute-name" id="common.attrs.xmlspace" title="common.attrs.xmlspace" href="common-attributes.html#common.attrs.xmlspace">xml:space</a><span class="attr-values"> = "preserve" </span> </dt> + <dd>As defined in the XML specification + <a href="references.html#refsXML">[XML]</a>.</dd><dd>This attribute should only be used with + <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>. + It must not be used in + <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>.</dd> - </dl> - </div> - </div></div> + </dl></div></div></div> <hr class="footerbreak"></hr> <div class="nav"> <span class="nav-prev"><a href="common-models.html">« common-models</a></span> Index: patch-schema =================================================================== RCS file: /sources/public/html5/markup/patch-schema,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- patch-schema 30 Jul 2009 07:44:13 -0000 1.68 +++ patch-schema 30 Jul 2009 11:08:54 -0000 1.69 @@ -563,7 +563,26 @@ =================================================================== --- schema/applications.rnc (revision 453) +++ schema/applications.rnc (working copy) -@@ -111,12 +111,26 @@ +@@ -6,15 +6,14 @@ + + ## Additions to Common Attributes + +- common.attrs.interact &= +- ( common.attrs.contextmenu? +- & common.attrs.contenteditable? ++ common.attrs.interaction &= ++ ( common.attrs.contenteditable? ++ & common.attrs.contextmenu? + & common.attrs.draggable? + & common.attrs.hidden? + & common.attrs.spellcheck? + ) + +- common.attrs.other &= common.attrs.interact + + ## Context Menu: contextmenu + +@@ -111,12 +110,26 @@ command.command.attrs = ( common.attrs & command.command.attrs.type? @@ -591,7 +610,7 @@ command.elem = command.command.elem ## Selection of one item from a list of items: <command type='radio'> -@@ -129,7 +143,9 @@ +@@ -129,7 +142,9 @@ & command.radio.attrs.radiogroup #REVISIT taking liberties here & command.radio.attrs.checked? ) @@ -602,7 +621,7 @@ ) command.radio.attrs.type = attribute type { -@@ -143,6 +159,18 @@ +@@ -143,6 +158,18 @@ attribute checked { w:string "checked" | w:string "" } @@ -621,7 +640,7 @@ command.elem |= command.radio.elem ## State or option that can be toggled: <command type='checkbox'> -@@ -154,7 +182,9 @@ +@@ -154,7 +181,9 @@ & ( command.checkbox.attrs.type & command.checkbox.attrs.checked? ) @@ -632,7 +651,7 @@ ) command.checkbox.attrs.type = attribute type { -@@ -164,25 +194,20 @@ +@@ -164,25 +193,20 @@ attribute checked { w:string "checked" | w:string "" } @@ -683,6 +702,14 @@ script.inner.imported = ( empty ) +@@ -130,7 +133,6 @@ + & scripting.attr.onunload? + ) + +- common.attrs.other &= common.attrs.scripting + + scripting.attr.onabort = + attribute onabort { string } Index: schema/common.rnc =================================================================== --- schema/common.rnc (revision 453) @@ -713,18 +740,37 @@ ) # ##################################################################### -@@ -103,9 +103,7 @@ +@@ -96,29 +96,26 @@ + # When updating, check <bdo> definition too + + common.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.interaction ++ & common.attrs.scripting ++ & common.attrs.xml ) - common.attrs.basic = +-common.attrs.basic = - ( ( common.attrs.id - | common.attrs.xml-id - )? # REVISIT assuming only either one is allowed -+ ( common.attrs.id ++common.attrs.core = ++ ( common.attrs.accesskey? & common.attrs.class? ++ & common.attrs.dir? ++ & common.attrs.id? ++ & common.attrs.lang? ++ & common.attrs.style? ++ & common.attrs.tabindex? & common.attrs.title? - & common.attrs.base? -@@ -115,10 +113,6 @@ +- & common.attrs.base? +- & common.attrs.space? + ) + common.attrs.id = attribute id { common.data.id } @@ -735,7 +781,44 @@ common.attrs.class = attribute class { common.data.tokens -@@ -359,16 +353,8 @@ +@@ -141,10 +138,6 @@ + string "preserve" # REVISIT this is not allowed per spec + } & XMLonly + +-common.attrs.i18n = +- ( common.attrs.dir? +- & common.attrs.language? +- ) + common.attrs.dir = + attribute dir { + w:string "ltr" | w:string "rtl" +@@ -177,11 +170,6 @@ + # common.data.langcode + # } & XMLonly + +-common.attrs.present = +- ( common.attrs.style? +- & common.attrs.tabindex? +- & common.attrs.accesskey? +- ) + common.attrs.style = + attribute style { + string +@@ -199,6 +187,13 @@ + common.attrs.other = + empty + ++common.attrs.xml = ++ ( common.attrs.xmlbase? ++ & common.attrs.xmllang? ++ & common.attrs.xmlspace? ++ ) ++ ++ + # ##################################################################### + ## Common Datatypes # + # ##################################################################### +@@ -359,16 +354,8 @@ common.data.zero = w:zero Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- spec.html 30 Jul 2009 07:44:13 -0000 1.71 +++ spec.html 30 Jul 2009 11:08:54 -0000 1.72 @@ -639,20 +639,17 @@ <li id="common-attributes-toc"> <a href="#common-attributes">9. Common attributes</a> <ul> -<li id="basic-attrs-toc"> -<a href="#basic-attrs">9.1. Basic attributes</a> -</li> -<li id="i18n-attrs-toc"> -<a href="#i18n-attrs">9.2. Internationalization attributes</a> +<li id="core-attrs-toc"> +<a href="#core-attrs">9.1. Core attributes</a> </li> -<li id="present-attrs-toc"> -<a href="#present-attrs">9.3. Present attributes</a> +<li id="interaction-attrs-toc"> +<a href="#interaction-attrs">9.2. Interaction attributes</a> </li> -<li id="common.attrs.scripting-attrs-toc"> -<a href="#common.attrs.scripting-attrs">9.4. Scripting attributes</a> +<li id="scripting-attrs-toc"> +<a href="#scripting-attrs">9.3. Scripting attributes</a> </li> -<li id="common.attrs.interact-attrs-toc"> -<a href="#common.attrs.interact-attrs">9.5. Interaction attributes</a> +<li id="xml-attrs-toc"> +<a href="#xml-attrs">9.4. XML attributes</a> </li> </ul> </li> @@ -14347,34 +14344,36 @@ <dt class="content-model"> <span class="common-pattern-name"><a href="#common.attrs" id="common.attrs">common.attrs</a></span> = </dt> <dd> -<a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - & <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - & <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> +<a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + & <a class="ref" href="#common.attrs.interaction" title="common.attrs.interaction">common.attrs.interaction</a> & <a class="ref" href="#common.attrs.scripting" title="common.attrs.scripting">common.attrs.scripting</a> - & <a class="ref" href="#common.attrs.interact" title="common.attrs.interact">common.attrs.interact</a> + & <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> </dd> </dl> </div> - <div id="basic-attrs" class="section"> - <h2 class="common-subhead">9.1. Basic attributes <a class="hash" href="#basic-attrs">#</a> <a class="toc-bak" href="#basic-attrs-toc">T</a> + <div id="core-attrs" class="section"> + <h2 class="common-subhead">9.1. Core attributes <a class="hash" href="#core-attrs">#</a> <a class="toc-bak" href="#core-attrs-toc">T</a> </h2> -<div id="common.attrs.basic-mdl"> +<div id="common.attrs.core-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="#common.attrs.basic" id="common.attrs.basic">common.attrs.basic</a></span> = <a class="ref" href="#common.attrs.id" title="common.attrs.id">id</a> + <p><span class="common-pattern-name"><a href="#common.attrs.core" id="common.attrs.core">common.attrs.core</a></span> = <a class="ref" href="#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a>? & <a class="ref" href="#common.attrs.class" title="common.attrs.class">class</a>? - & <a class="ref" href="#common.attrs.title" title="common.attrs.title">title</a>? - & <a class="ref" href="#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a>? - & <a class="ref" href="#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a>?</p> + & <a class="ref" href="#common.attrs.dir" title="common.attrs.dir">dir</a>? + & <a class="ref" href="#common.attrs.id" title="common.attrs.id">id</a>? + & <a class="ref" href="#common.attrs.lang" title="common.attrs.lang">lang</a>? + & <a class="ref" href="#common.attrs.style" title="common.attrs.style">style</a>? + & <a class="ref" href="#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a>? + & <a class="ref" href="#common.attrs.title" title="common.attrs.title">title</a>?</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> <dt> -<a class="attribute-name" id="common.attrs.id" title="common.attrs.id" href="#common.attrs.id">id</a><span class="attr-values"> = - <a class="ref" href="#common.data.id" title="common.data.id">id</a> +<a class="attribute-name" id="common.attrs.accesskey" title="common.attrs.accesskey" href="#common.attrs.accesskey">accesskey</a><span class="attr-values"> = + <a class="ref" href="#common.data.keylabellist" title="common.data.keylabellist">keylabellist</a> </span> </dt> - <dd>A unique identifier for the element.</dd> + <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> <a class="attribute-name" id="common.attrs.class" title="common.attrs.class" href="#common.attrs.class">class</a><span class="attr-values"> = @@ -14384,100 +14383,86 @@ element belongs.</dd> <dt> -<a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="#common.attrs.title">title</a><span class="attr-values"> = - <a class="ref" href="#normal-character-data">normal-character-data</a> - </span> </dt> - <dd>Advisory information associated with the element.</dd> +<a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="#common.attrs.dir">dir</a><span class="attr-values"> = "ltr" | "rtl" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.xmlbase" title="common.attrs.xmlbase" href="#common.attrs.xmlbase">xml:base</a><span class="attr-values"> = - <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a> +<a class="attribute-name" id="common.attrs.id" title="common.attrs.id" href="#common.attrs.id">id</a><span class="attr-values"> = + <a class="ref" href="#common.data.id" title="common.data.id">id</a> </span> </dt> - <dd>As defined in the XML Base specification - <a href="#refsXMLBase">[XMLBase]</a>.</dd> -<dd>This attribute should only be used with - <a href="#syntax-document-xml">documents in the XML syntax</a>. - It must not be used in - <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd> + <dd>A unique identifier for the element.</dd> <dt> -<a class="attribute-name" id="common.attrs.xmlspace" title="common.attrs.xmlspace" href="#common.attrs.xmlspace">xml:space</a><span class="attr-values"> = "preserve" </span> </dt> - <dd>As defined in the XML specification - <a href="#refsXML">[XML]</a>.</dd> -<dd>This attribute should only be used with - <a href="#syntax-document-xml">documents in the XML syntax</a>. - It must not be used in - <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd> +<a class="attribute-name" id="common.attrs.lang" title="common.attrs.lang" href="#common.attrs.lang">lang</a><span class="attr-values"> = + <a class="ref" href="#common.data.langcode" title="common.data.langcode">langcode</a> + </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> - </dl> -</div> -</div> -<div id="i18n-attrs" class="section"> - <h2 class="common-subhead">9.2. Internationalization attributes <a class="hash" href="#i18n-attrs">#</a> <a class="toc-bak" href="#i18n-attrs-toc">T</a> -</h2> -<div id="common.attrs.i18n-mdl"> - - <div class="content-models"> - <p><span class="common-pattern-name"><a href="#common.attrs.i18n" id="common.attrs.i18n">common.attrs.i18n</a></span> = <a class="ref" href="#common.attrs.dir" title="common.attrs.dir">dir</a>? - & (<a class="ref" href="#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a>? - & <a class="ref" href="#common.attrs.lang" title="common.attrs.lang">lang</a>?)?</p> - </div> - </div> - <div class="no-number no-toc"> - <dl class="attr-defs"> -<dt> -<a class="attribute-name" id="common.attrs.dir" title="common.attrs.dir" href="#common.attrs.dir">dir</a><span class="attr-values"> = "ltr" | "rtl" </span> </dt> + <dt> +<a class="attribute-name" id="common.attrs.style" title="common.attrs.style" href="#common.attrs.style">style</a><span class="attr-values"> = <a href="#data-string">string</a></span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.xmllang" title="common.attrs.xmllang" href="#common.attrs.xmllang">xml:lang</a><span class="attr-values"> = - <a class="ref" href="#common.data.langcode" title="common.data.langcode">langcode</a> +<a class="attribute-name" id="common.attrs.tabindex" title="common.attrs.tabindex" href="#common.attrs.tabindex">tabindex</a><span class="attr-values"> = + <a class="ref" href="#common.data.integer" title="common.data.integer">integer</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.lang" title="common.attrs.lang" href="#common.attrs.lang">lang</a><span class="attr-values"> = - <a class="ref" href="#common.data.langcode" title="common.data.langcode">langcode</a> +<a class="attribute-name" id="common.attrs.title" title="common.attrs.title" href="#common.attrs.title">title</a><span class="attr-values"> = + <a class="ref" href="#normal-character-data">normal-character-data</a> </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> + <dd>Advisory information associated with the element.</dd> </dl> </div> </div> -<div id="present-attrs" class="section"> - <h2 class="common-subhead">9.3. Present attributes <a class="hash" href="#present-attrs">#</a> <a class="toc-bak" href="#present-attrs-toc">T</a> +<div id="interaction-attrs" class="section"> + <h2 class="common-subhead">9.2. Interaction attributes <a class="hash" href="#interaction-attrs">#</a> <a class="toc-bak" href="#interaction-attrs-toc">T</a> </h2> -<div id="common.attrs.present-mdl"> +<div id="common.attrs.interaction-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="#common.attrs.present" id="common.attrs.present">common.attrs.present</a></span> = <a class="ref" href="#common.attrs.style" title="common.attrs.style">style</a>? - & <a class="ref" href="#common.attrs.tabindex" title="common.attrs.tabindex">tabindex</a>? - & <a class="ref" href="#common.attrs.accesskey" title="common.attrs.accesskey">accesskey</a>?</p> + <p><span class="common-pattern-name"><a href="#common.attrs.interaction" id="common.attrs.interaction">common.attrs.interaction</a></span> = (<a class="ref" href="#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a>? + & <a class="ref" href="#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>? + & <a class="ref" href="#common.attrs.draggable" title="common.attrs.draggable">draggable</a>? + & <a class="ref" href="#common.attrs.hidden" title="common.attrs.hidden">hidden</a>? + & <a class="ref" href="#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a>?)</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> <dt> -<a class="attribute-name" id="common.attrs.style" title="common.attrs.style" href="#common.attrs.style">style</a><span class="attr-values"> = <a href="#data-string">string</a></span> </dt> +<a class="attribute-name" id="common.attrs.contenteditable" title="common.attrs.contenteditable" href="#common.attrs.contenteditable">contenteditable</a><span class="attr-values"> = + "true" | "false" | "" + </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.tabindex" title="common.attrs.tabindex" href="#common.attrs.tabindex">tabindex</a><span class="attr-values"> = - <a class="ref" href="#common.data.integer" title="common.data.integer">integer</a> +<a class="attribute-name" id="common.attrs.contextmenu" title="common.attrs.contextmenu" href="#common.attrs.contextmenu">contextmenu</a><span class="attr-values"> = + <a class="ref" href="#common.data.idref" title="common.data.idref">idref</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.accesskey" title="common.attrs.accesskey" href="#common.attrs.accesskey">accesskey</a><span class="attr-values"> = - <a class="ref" href="#common.data.keylabellist" title="common.data.keylabellist">keylabellist</a> +<a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="#common.attrs.draggable">draggable</a><span class="attr-values"> = "true" | "false" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> + + <dt> +<a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="#common.attrs.hidden">hidden</a><span class="attr-values"> = "hidden" | "" </span> </dt> + <dd><i class="TK">(detailed attribute description to come)</i></dd> + + <dt> +<a class="attribute-name" id="common.attrs.spellcheck" title="common.attrs.spellcheck" href="#common.attrs.spellcheck">spellcheck</a><span class="attr-values"> = + "true" | "false" | "" </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> </dl> </div> </div> - <div id="common.attrs.scripting-attrs" class="section"> - <h2 class="common-subhead">9.4. Scripting attributes <a class="hash" href="#common.attrs.scripting-attrs">#</a> <a class="toc-bak" href="#common.attrs.scripting-attrs-toc">T</a> +<div id="scripting-attrs" class="section"> + <h2 class="common-subhead">9.3. Scripting attributes <a class="hash" href="#scripting-attrs">#</a> <a class="toc-bak" href="#scripting-attrs-toc">T</a> </h2> <div id="common.attrs.scripting-mdl"> @@ -14513,8 +14498,7 @@ & <a class="ref" href="#scripting.attr.onscroll" title="scripting.attr.onscroll">onscroll</a>? & <a class="ref" href="#scripting.attr.onselect" title="scripting.attr.onselect">onselect</a>? & <a class="ref" href="#scripting.attr.onsubmit" title="scripting.attr.onsubmit">onsubmit</a>? - & <a class="ref" href="#scripting.attr.onunload" title="scripting.attr.onunload">onunload</a>?) - </p> + & <a class="ref" href="#scripting.attr.onunload" title="scripting.attr.onunload">onunload</a>?)</p> </div> </div> <div class="no-number no-toc"> @@ -14649,52 +14633,49 @@ </dl> </div> - </div> - <div id="common.attrs.interact-attrs" class="section"> - <h2 class="common-subhead">9.5. Interaction attributes <a class="hash" href="#common.attrs.interact-attrs">#</a> <a class="toc-bak" href="#common.attrs.interact-attrs-toc">T</a> +</div> +<div id="xml-attrs" class="section"> + <h2 class="common-subhead">9.4. XML attributes <a class="hash" href="#xml-attrs">#</a> <a class="toc-bak" href="#xml-attrs-toc">T</a> </h2> -<div id="common.attrs.interact-mdl"> +<div id="common.attrs.xml-mdl"> <div class="content-models"> - <p><span class="common-pattern-name"><a href="#common.attrs.interact" id="common.attrs.interact">common.attrs.interact</a></span> = (<a class="ref" href="#common.attrs.contextmenu" title="common.attrs.contextmenu">contextmenu</a>? - & <a class="ref" href="#common.attrs.contenteditable" title="common.attrs.contenteditable">contenteditable</a>? - & <a class="ref" href="#common.attrs.draggable" title="common.attrs.draggable">draggable</a>? - & <a class="ref" href="#common.attrs.hidden" title="common.attrs.hidden">hidden</a>? - & <a class="ref" href="#common.attrs.spellcheck" title="common.attrs.spellcheck">spellcheck</a>?) - </p> + <p><span class="common-pattern-name"><a href="#common.attrs.xml" id="common.attrs.xml">common.attrs.xml</a></span> = <a class="ref" href="#common.attrs.xmlbase" title="common.attrs.xmlbase">xml:base</a>? + & <a class="ref" href="#common.attrs.xmllang" title="common.attrs.xmllang">xml:lang</a>? + & <a class="ref" href="#common.attrs.xmlspace" title="common.attrs.xmlspace">xml:space</a>?</p> </div> </div> <div class="no-number no-toc"> <dl class="attr-defs"> <dt> -<a class="attribute-name" id="common.attrs.contextmenu" title="common.attrs.contextmenu" href="#common.attrs.contextmenu">contextmenu</a><span class="attr-values"> = - <a class="ref" href="#common.data.idref" title="common.data.idref">idref</a> +<a class="attribute-name" id="common.attrs.xmlbase" title="common.attrs.xmlbase" href="#common.attrs.xmlbase">xml:base</a><span class="attr-values"> = + <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a> </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> + <dd>As defined in the XML Base specification + <a href="#refsXMLBase">[XMLBase]</a>.</dd> +<dd>This attribute should only be used with + <a href="#syntax-document-xml">documents in the XML syntax</a>. + It must not be used in + <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd> <dt> -<a class="attribute-name" id="common.attrs.contenteditable" title="common.attrs.contenteditable" href="#common.attrs.contenteditable">contenteditable</a><span class="attr-values"> = - "true" | "false" | "" +<a class="attribute-name" id="common.attrs.xmllang" title="common.attrs.xmllang" href="#common.attrs.xmllang">xml:lang</a><span class="attr-values"> = + <a class="ref" href="#common.data.langcode" title="common.data.langcode">langcode</a> </span> </dt> <dd><i class="TK">(detailed attribute description to come)</i></dd> <dt> -<a class="attribute-name" id="common.attrs.draggable" title="common.attrs.draggable" href="#common.attrs.draggable">draggable</a><span class="attr-values"> = "true" | "false" </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> - - <dt> -<a class="attribute-name" id="common.attrs.hidden" title="common.attrs.hidden" href="#common.attrs.hidden">hidden</a><span class="attr-values"> = "hidden" | "" </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> - - <dt> -<a class="attribute-name" id="common.attrs.spellcheck" title="common.attrs.spellcheck" href="#common.attrs.spellcheck">spellcheck</a><span class="attr-values"> = - "true" | "false" | "" - </span> </dt> - <dd><i class="TK">(detailed attribute description to come)</i></dd> +<a class="attribute-name" id="common.attrs.xmlspace" title="common.attrs.xmlspace" href="#common.attrs.xmlspace">xml:space</a><span class="attr-values"> = "preserve" </span> </dt> + <dd>As defined in the XML specification + <a href="#refsXML">[XML]</a>.</dd> +<dd>This attribute should only be used with + <a href="#syntax-document-xml">documents in the XML syntax</a>. + It must not be used in + <a href="#syntax-document-html">documents in the HTML syntax</a>.</dd> </dl> </div> - </div> +</div> </div> <div id="shared-attributes" class="section"> <h2>10. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="#shared-attributes-toc">T</a>
Received on Thursday, 30 July 2009 11:09:06 UTC