[css2] Issues w3c#55-60.

bert-github · bert-github · commit 593755338716 · 2004-07-05T17:08:21.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402255
diff --git a/css2/grammar.src b/css2/grammar.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.37 2004-02-09 21:47:46 bbos Exp $ -->
+<!-- $Id: grammar.src,v 2.38 2004-07-05 17:08:00 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Grammar of CSS&nbsp;2.1</TITLE>
@@ -158,21 +158,21 @@ nmchar		[_a-zA-Z0-9-]|{nonascii}|{escape}
 string1		\"([\t !#$%&amp;(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
 string2		\'([\t !#$%&amp;(-~]|\\{nl}|\"|{nonascii}|{escape})*\'
 
-ident		{nmstart}{nmchar}*
+ident		-?{nmstart}{nmchar}*
 name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
 s		[ \t\r\n\f]
 w		{s}*
 nl		\n|\r\n|\r|\f
-range		\?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
 
 %%
 
 {s}+			{return S;}
 
-\/\*[^*]*\*+([^/*][^*]*\*+)*\/	/* ignore comments */
+\/\*[^*]*\*+([^/*][^*]*\*+)*\/		/* ignore comments */
+{s}+\/\*[^*]*\*+([^/*][^*]*\*+)*\/	{unput(' '); /*replace by space*/}
 
 "&lt;!--"		{return CDO;}
 "-->"			{return CDC;}
@@ -220,6 +220,8 @@ range		\?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
 "url("{w}{url}{w}")"	{return URI;}
 {ident}"("		{return FUNCTION;}
 
+u\+[0-9a-f?]{1,6}(-[0-9a-f]{1,6})?	{return UNICODERANGE;}
+
 .			{return *yytext;}
 </pre>
 
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
         "http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.104 2004-03-25 18:09:51 bbos Exp $ -->
+<!-- $Id: syndata.src,v 2.105 2004-07-05 17:08:21 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Syntax and basic data types</title>
@@ -231,7 +231,8 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
     (including element names, classes, and IDs in <a
     href="selector.html">selectors</a>) can contain only the
     characters [A-Za-z0-9] and ISO 10646 characters <!--161--> U+00A1 and higher,
-    plus the hyphen (-) and the underscore (_); they cannot start with a digit. 
+    plus the hyphen (-) and the underscore (_); they cannot start with
+    a digit or a hyphen followed by a digit.
     Only properties, values, units, pseudo-classes,
     pseudo-elements, and at-rules may <em>start</em> with a hyphen (-); other
     identifiers (e.g. element names, classes, or IDs) may not.
