[css2] Errata

bert-github · bert-github · commit 909c9faef626 · 2013-07-15T13:29:14.000Z
http://www.w3.org/Style/css2-updates/REC-CSS2-20110607-errata.html#s.G.1a --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403290
diff --git a/css2/grammar.src b/css2/grammar.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.73 2013-05-02 11:57:56 bbos Exp $ -->
+<!-- $Id: grammar.src,v 2.74 2013-07-15 13:29:14 bbos Exp $ -->
 <HEAD>
 <TITLE>Grammar of CSS&nbsp;2.1</TITLE>
 <!--script src="http://www.w3c-test.org/css/harness/annotate.js#CSS21_DEV" type="text/javascript" defer></script-->
@@ -74,9 +74,6 @@ combinator
   : '+' S*
   | '>' S*
   ;
-unary_operator
-  : '-' | '+'
-  ;
 property
   : IDENT S*
   ;
@@ -114,8 +111,7 @@ expr
   : term [ operator? term ]*
   ;
 term
-  : unary_operator?
-    [ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
+  : [ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
       TIME S* | FREQ S* ]
   | STRING S* | IDENT S* | URI S* | hexcolor | function
   ;
@@ -166,7 +162,7 @@ baduri3         {U}{R}{L}\({w}{badstring}
 comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/
 ident		-?{nmstart}{nmchar}*
 name		{nmchar}+
-num		[0-9]+|[0-9]*"."[0-9]+
+num		[-+]?[0-9]+|[-+]?[0-9]*"."[0-9]+
 string		{string1}|{string2}
 badstring       {badstring1}|{badstring2}
 badcomment      {badcomment1}|{badcomment2}
