[css2] Generated. Do not edit!

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403034

Author: bert-github

css2/changes.html

@@ -29,10 +29,11 @@ <H1><a name="q0">Appendix  <del>D. The</del><ins>G.</ins> Grammar of  <del>CSS2<
     <li class="tocline2"><a href="grammar.html#grammar" class="tocxref"> <del>D.1</del><ins>G.1</ins> Grammar</a>
     <li class="tocline2"><a href="grammar.html#scanner" class="tocxref"> <del>D.2</del><ins>G.2</ins> Lexical scanner</a>
     <li class="tocline2"><a href="grammar.html#tokenizer-diffs" class="tocxref"> <del>D.3</del><ins>G.3</ins> Comparison of tokenization in  <del>CSS2</del><ins>CSS&nbsp;2.1</ins> and CSS1</a>
+    <li class="tocline2"><a href="grammar.html#q4" class="tocxref"> <del>This appendix is normative.</del><ins>G.4 Implementation note</ins></a>
   </ul>
 </div>
 
-<P> <del>This appendix is normative.</del>The grammar below defines the syntax of  <del>CSS2.</del><ins>CSS&nbsp;2.1.</ins> It is in some sense,
+<P>The grammar below defines the syntax of  <del>CSS2.</del><ins>CSS&nbsp;2.1.</ins> It is in some sense,
 however, a superset of  <del>CSS2</del><ins>CSS&nbsp;2.1</ins> as this specification imposes additional
 semantic constraints not expressed in this grammar. A conforming UA
 must also adhere to the <a href="./syndata.html#syntax">
@@ -178,15 +179,21 @@ <h2> <del>D.2</del><ins>G.2</ins> <a name="scanner">Lexical scanner</a></h2>
 nmchar		 <del>[a-z0-9-]|{nonascii}|{escape}</del><ins>[_a-z0-9-]|{nonascii}|{escape}</ins>
 string1		 <del>\"([\t !#$%&amp;(-~]|\\{nl}|\'|{nonascii}|{escape})*\"</del><ins>\"([^\n\r\f\\"]|\\{nl}|{escape})*\"</ins>
 string2		 <del>\'([\t !#$%&amp;(-~]|\\{nl}|\"|{nonascii}|{escape})*\'</del><ins>\'([^\n\r\f\\']|\\{nl}|{escape})*\'
-invalid1	\"([^\n\r\f\\"]|\\{nl}|{escape})*
-invalid2	\'([^\n\r\f\\']|\\{nl}|{escape})*
-
+badstring1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\\?
+badstring2      \'([^\n\r\f\\']|\\{nl}|{escape})*\\?
+badcomment1     \/\*[^*]*\*+([^/*][^*]*\*+)*
+badcomment2     \/\*[^*]*(\*+[^/*][^*]*)*
+baduri1         url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
+baduri2         url\({w}{string}{w}
+baduri3         url\({w}{badstring}
 comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/</ins>
 ident		 <del>{nmstart}{nmchar}*</del><ins>-?{nmstart}{nmchar}*</ins>
 name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
-<ins>invalid		{invalid1}|{invalid2}</ins>
+<ins>badstring       {badstring1}|{badstring2}
+badcomment      {badcomment1}|{badcomment2}
+baduri          {baduri1}|{baduri2}|{baduri3}</ins>
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
  <del>w</del><ins>s</ins>		[  <del>\t\r\n\f]*</del><ins>\t\r\n\f]+
 w		{s}?</ins>
@@ -217,14 +224,15 @@ <h2> <del>D.2</del><ins>G.2</ins> <a name="scanner">Lexical scanner</a></h2>
  <del>[ \t\r\n\f]+</del><ins>{s}</ins>			{return S;}
 
  <del>\/\*[^*]*\*+([^/][^*]*\*+)*\/</del><ins>\/\*[^*]*\*+([^/*][^*]*\*+)*\/</ins>		/* ignore comments */
+<ins>{badcomment}                         /* unclosed comment at EOF */</ins>
 
 "&lt;!--"		{return CDO;}
 "-->"			{return CDC;}
 "~="			{return INCLUDES;}
 "|="			{return DASHMATCH;}
 
 {string}		{return STRING;}
-<ins>{invalid}		{return INVALID; /* unclosed string */}</ins>
+<ins>{badstring}             {return BAD_STRING);}</ins>
 
 {ident}			{return IDENT;}
 
@@ -259,6 +267,7 @@ <h2> <del>D.2</del><ins>G.2</ins> <a name="scanner">Lexical scanner</a></h2>
 
  <del>"url("{w}{string}{w}")"</del><ins>{U}{R}{L}"("{w}{string}{w}")"</ins>	{return URI;}
  <del>"url("{w}{url}{w}")"</del><ins>{U}{R}{L}"("{w}{url}{w}")"</ins>	{return URI;}
+<ins>{baduri}                        {return BAD_URI);}</ins>
 
 {ident}"("		{return FUNCTION;}
 
@@ -310,6 +319,36 @@ <h2> <del>D.3</del><ins>G.3</ins> <a name="tokenizer-diffs">Comparison of tokeni
 escaped  <del>(".\55ft")</del><ins>(".\35 5ft")</ins>
 </ul>
 
+<h2><a name="q4"><ins>G.4 Implementation note</ins></a></h2>
+
+<p><ins>This section is non-normative.</ins>
+
+<p><ins>The lexical scanner for the CSS core syntax in</ins> <a
+href="syndata.html#tokenization"><ins>section&nbsp;4.1.1</ins></a> <ins>can be
+implemented as a scanner without back-up. In Lex notation, that
+requires the addition of the following patterns (which do not change
+the returned tokens, only the efficiency of the scanner):</ins>
+
+<pre>
+<ins>{ident}/\\          return IDENT;
+#{name}/\\          return HASH;
+@{ident}/\\         return ATKEYWORD;
+#/\\                return DELIM;
+@/\\                return DELIM;
+@/-                 return DELIM;
+@/-\\               return DELIM;
+-/\\                return DELIM;
+-/-                 return DELIM;
+\</ins></!                return DELIM;
+\</!-               return DELIM;
+{num}{ident}/\\     return DIMENSION;
+{num}/\\            return NUMBER;
+{num}/-             return NUMBER;
+{num}/-\\           return NUMBER;
+[0-9]+/\.           return NUMBER;
+u/\+                return IDENT;
+u\+[0-9a-f?]{1,6}/- return UNICODE_RANGE;
+</pre>
 
 <hr class="navbar">
 

css2/cover.html

@@ -494,13 +494,15 @@ <H3>5.8.2 <a name="default-attrs">Default attribute values in DTDs</a></H3>
 attribute selectors.</ins> Style sheets should be designed so that they work
 even if the default values are not included in the document tree.
 
-<p> <del>Example(s): For example, consider an element EXAMPLE with an attribute "notation" that has</del><ins>More precisely,</ins> a  <del>default value</del><ins>UA is</ins> <em><ins>not</ins></em> <ins>required to read an "external
-subset"</ins> of  <del>"decimal".</del>the DTD  <del>fragment might be &lt;!ATTLIST EXAMPLE notation (decimal,octal) "decimal"> If the style sheet contains the rules EXAMPLE[notation=decimal] {</del><ins>but</ins> <em><ins>is</ins></em> <ins>required to look for default
-attribute values in the document's "internal subset." (See</ins> <a href="refs.html#ref-XML10" rel="biblioentry" class="noxref"><span class="normref"><ins>[XML10]</ins></span></a>
-<ins>for definitions of these subsets.)</ins>
-
-<p><ins>A UA that recognizes an XML namespace</ins> <a href="refs.html#ref-XMLNAMESPACES" rel="biblioentry" class="noxref"><span class="informref"><ins>[XMLNAMESPACES]</ins></span></a> <ins>is not
-required to use its knowledge of that namespace to treat default
+<p> <del>Example(s): For example, consider an element EXAMPLE with</del><ins>More precisely, a UA may, but is</ins> <em><ins>not</ins></em> <ins>required to, read</ins> an <ins>"external
+subset" of the DTD but</ins> <em><ins>is</ins></em> <ins>required to look for default</ins>
+attribute  <del>"notation" that has</del><ins>values in the document's "internal subset." (See</ins> <a href="refs.html#ref-XML10" rel="biblioentry" class="noxref"><span class="normref"><ins>[XML10]</ins></span></a>
+<ins>for definitions of these subsets.)
+Depending on the UA,</ins> a default <ins>attribute</ins> value  <del>of</del><ins>defined in the external
+subset of the DTD might or might not appear in the document tree.</ins>
+
+<p><ins>A UA that recognizes an XML namespace</ins> <a href="refs.html#ref-XMLNAMESPACES" rel="biblioentry" class="noxref"><span class="informref"><ins>[XMLNAMESPACES]</ins></span></a> <ins>may, but is not
+required to, use its knowledge of that namespace to treat default
 attribute values as if they were present in the document. (E.g., an
 XHTML UA is not required to use its built-in knowledge of the XHTML
 DTD.)</ins>
@@ -511,20 +513,20 @@ <H3>5.8.2 <a name="default-attrs">Default attribute values in DTDs</a></H3>
 <div class="example"><P style="display:none"><ins>Example(s):</ins></P>
 <P style="display:none"><ins>Example:</ins></P>
 <P><ins>For example, consider an element EXAMPLE with an attribute "notation"
-that has a default value of "decimal". The DTD fragment might be</ins>
+that has a default value of</ins> "decimal". The DTD fragment might be
 
 <pre class="dtd-example">
-<ins>&lt;!ATTLIST EXAMPLE notation (decimal,octal) "decimal"></ins>
+&lt;!ATTLIST EXAMPLE notation (decimal,octal) "decimal">
 </pre>
 
-<p><ins>If the style sheet contains the rules</ins>
+<p>If the style sheet contains the rules
 
 <pre class="example">
-<ins>EXAMPLE[notation=decimal] {</ins> /*... default property settings ...*/ }
+EXAMPLE[notation=decimal] { /*... default property settings ...*/ }
 EXAMPLE[notation=octal]   { /*... other settings...*/ }
 </pre>
 
-<p> <del>then to catch</del>the  <del>cases where this</del><ins>first rule will not match elements whose "notation"</ins> attribute
+<p> <del>then to catch</del>the  <del>cases where this</del><ins>first rule might not match elements whose "notation"</ins> attribute
 is set by default,  <del>and</del><ins>i.e.,</ins> not  <del>explicitly,</del><ins>set explicitly. To catch all cases,</ins> the
  <del>following rule might</del><ins>attribute selector for the default value must</ins> be  <del>added:</del><ins>dropped:</ins></p>
 
@@ -620,8 +622,8 @@ <h3>5.8.3 <a name="class-html">Class selectors</a></h3>
 not.</em>
 </div>
 
-<div class="note"><p><em><strong> <del>5.9 ID selectors Document languages</del><ins>Note:</ins></strong> <ins>If an element has
-multiple class attributes, their values must be concatenated with
+<div class="note"><p><em><strong> <del>5.9 ID selectors Document languages may contain attributes that are declared to</del><ins>Note:</ins></strong> <ins>If an element has
+multiple class attributes, their values must</ins> be  <del>of type</del><ins>concatenated with
 spaces between the values before searching for the class. As of this
 time the working group is not aware of any manner in which this
 situation can be reached, however, so this behavior is explicitly
@@ -630,8 +632,8 @@ <h3>5.8.3 <a name="class-html">Class selectors</a></h3>
 
 <h2><ins>5.9</ins> <a name="id-selectors"><ins>ID selectors</ins></a></h2>
 
-<P><ins>Document languages</ins> may contain attributes that are declared to be
-of type ID.  What makes attributes of type ID special is that no two
+<P><ins>Document languages may contain attributes that are declared to be
+of type</ins> ID.  What makes attributes of type ID special is that no two
 such attributes can have the same value; whatever the document
 language, an ID attribute can be used to uniquely identify its
 element. In HTML all ID attributes are named "id"; XML