- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 16 Feb 2010 10:28:29 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/schema In directory hutz:/tmp/cvs-serv2441/schema Modified Files: assertions.sch Log Message: various updates Index: assertions.sch =================================================================== RCS file: /sources/public/html5/markup/schema/assertions.sch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- assertions.sch 3 Feb 2010 10:27:05 -0000 1.5 +++ assertions.sch 16 Feb 2010 10:28:27 -0000 1.6 @@ -42,11 +42,11 @@ | descendant::h:select | descendant::h:keygen | descendant::h:textarea) > 1'> - The “label” element may contain at most one - “input”, - “button”, - “select”, - or “textarea” descendant. + The “label” element may contain at most one descendant + “input” element, + “button” element, + “select” element, + or “textarea” element. </report> <report test='@for and not(//h:input[not(translate(@type, "HIDEN", "hiden")="hidden")][@id = current()/@for] or @@ -159,8 +159,8 @@ appear as a descendant of the “button” element. </report> <report test='ancestor::h:label[@for] and not(ancestor::h:label[@for = current()/@id])'> - Any “<name/>” descendant of a “label” - element with a “for” attribute must have an + Any “<name/>” element descendant of a “label” element + with a “for” attribute must have an ID value that matches that “for” attribute. </report> </rule> @@ -181,12 +181,12 @@ <rule context='h:menu[translate(@type, "TOLBAR", "tolbar")="toolbar"]'> <report test='ancestor::h:a'> The element “menu” - with the attribute “type=toolbar” must not + with the attribute “type” whose value is “toolbar” must not appear as a descendant of the “a” element. </report> <report test='ancestor::h:button'> The element “menu” - with the attribute “type=toolbar” must not + with the attribute “type” whose value is “toolbar” must not appear as a descendant of the “button” element. </report> </rule> @@ -225,17 +225,16 @@ <pattern name="miscellaneous requirements"> <rule context='h:area'> <assert test='ancestor::h:map'> - The “area” element must have a - “map” ancestor. + The “area” element must have an ancestor + “map” element. </assert> </rule> <rule context='h:img[@ismap]'> <assert test='ancestor::h:a[@href]'> The “img” element with the - “ismap” attribute set must have an - “a” ancestor with the “href” - attribute. + “ismap” attribute set must have an ancestor + “a” element with the “href” attribute. </assert> </rule> @@ -257,15 +256,15 @@ <rule context='h:select[not(@multiple)]'> <report test='count(descendant::h:option[@selected]) > 1'> The “select” element cannot have more than one - selected “option” descendant unless the + selected “option” element descendant unless the “multiple” attribute is specified. </report> </rule> <rule context='h:script[translate(@language, "JAVSCRIPT", "javscript")="javascript"]'> <assert test='not(@type) or translate(@type, "EXJAVSCRIPT", "exjavscript")="text/javascript"'> - A “script” element with the - “language="JavaScript"” attribute set must not have a + A “script” element with a + “language” attribute whose value is “JavaScript” must not have a “type” attribute whose value is not “text/javascript”. </assert> @@ -273,8 +272,8 @@ <rule context='h:time'> <report test='ancestor::h:time'> - The element “meter” must not - appear as a descendant of the “meter” element. + The element “time” must not + appear as a descendant of the “time” element. </report> </rule> @@ -284,7 +283,7 @@ appear as a descendant of the “progress” element. </report> <assert test='@max and @value and number(@value) <= number(@max)'> - The value of the “value” attribute must be less than or equal to + The value of the “value” attribute must be less than or equal to the value of the “max” attribute. </assert> <assert test='not(@max) and @value and number(@value) <= 1'> @@ -428,11 +427,11 @@ <rule context='h:a|h:link'> <report test='@coords and self::h:a'> The “coords” attribute on the “<name/>” element is obsolete. - Use “area” instead of “a” for image maps. + For image maps, use the “area” element instead of the “a” element. </report> <report test='@shape and self::h:a'> The “shape” attribute on the “<name/>” element is obsolete. - Use “area” instead of “a” for image maps. + For image maps, use the “area” element instead of the “a” element. </report> <report test='@urn and self::h:a'> The “urn” attribute on the “<name/>” element is obsolete. @@ -473,7 +472,7 @@ <rule context='h:head'> <report test='@profile'> The “profile” attribute on the “<name/>” element is obsolete. - To declare which “meta” terms are used in the document, instead register the + To declare which “meta” element terms are used in the document, instead register the names as meta extensions. <http://wiki.whatwg.org/wiki/MetaExtensions> To trigger specific UA behaviors, use a “link” element instead. </report> @@ -528,27 +527,27 @@ <rule context='h:object'> <report test='@archive'> The “archive” attribute on the “<name/>” element is obsolete. - Use the “data” and “type” attributes to invoke plugins. + Use the “data” attribute and “type” attribute to invoke plugins. To set a parameter with the name “archive”, use the “param” element. </report> <report test='@classid'> The “classid” attribute on the “<name/>” element is obsolete. - Use the “data” and “type” attributes to invoke plugins. + Use the “data” attribute and “type” attribute to invoke plugins. To set a parameter with the name “classid”, use the “param” element. </report> <report test='@code'> The “code” attribute on the “<name/>” element is obsolete. - Use the “data” and “type” attributes to invoke plugins. + Use the “data” attribute and “type” attribute to invoke plugins. To set a parameter with the name “code”, use the “param” element. </report> <report test='@codebase'> The “codebase” attribute on the “<name/>” element is obsolete. - Use the “data” and “type” attributes to invoke plugins. + Use the “data” attribute and “type” attribute to invoke plugins. To set a parameter with the name “codebase”, use the “param” element. </report> <report test='@codetype'> The “codetype” attribute on the “<name/>” element is obsolete. - Use the “data” and “type” attributes to invoke plugins. + Use the “data” attribute and “type” attribute to invoke plugins. To set a parameter with the name “codetype”, use the “param” element. </report> <report test='@declare'> @@ -557,18 +556,18 @@ </report> <report test='@standby'> The “standby” attribute on the “<name/>” element is obsolete. - Optimise the linked resource so that it loads quickly or, at least, incrementally. + Optimize the linked resource so that it loads quickly or, at least, incrementally. </report> </rule> <rule context='h:param'> <report test='@type'> The “type” attribute on the “<name/>” element is obsolete. - Use the “name” and “value” attributes without declaring value types. + Use the “name” attribute and “value” attribute without declaring value types. </report> <report test='@valuetype'> The “valuetype” attribute on the “<name/>” element is obsolete. - Use the “name” and “value” attributes without declaring value types. + Use the “name” attribute and “value” attribute without declaring value types. </report> </rule> @@ -590,7 +589,7 @@ </report> <report test='@axis'> The “axis” attribute on the “<name/>” element is obsolete. - Use the “scope” attribute. + Use the “scope” attribute instead. </report> </rule> </pattern> @@ -774,9 +773,8 @@ <pattern name='lang and xml:lang in XHTML'> <rule context='h:*[@lang and @xml:lang]'> <assert test='translate(@lang, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz") = translate(@xml:lang, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'> - When the attribute “lang” in no namespace and the attribute - “lang” in the XML namespace are both present, they must have the - same value. + When the attribute “lang” in no namespace and the attribute “lang” + in the XML namespace are both present, they must have the same value. </assert> </rule> </pattern>
Received on Tuesday, 16 February 2010 10:28:32 UTC