[css2] Allowed \r, \r\n after \ in string.

bert-github · bert-github · commit 4af3e288a878 · 1998-04-27T11:58:33.000Z
Removed redundant S* after CHARSET.

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401538
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.13 1998-04-19 23:57:33 ijacobs Exp $ -->
+<!-- $Id: grammar.src,v 2.14 1998-04-27 11:58:33 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Appendix D: The grammar of CSS2</TITLE>
@@ -48,7 +48,7 @@ used:</P>
 
 <pre>
 stylesheet
-  : [ CHARSET_SYM S* STRING S* ';' S* ]?
+  : [ CHARSET_SYM S* STRING S* ';' ]?
     [S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
     [ [ ruleset | media | page | font_face ] [S|CDO|CDC]* ]*
   ;
@@ -63,7 +63,7 @@ medium
   : IDENT S*
   ;
 page
-  : PAGE_SYM S* pseudo_page?
+  : PAGE_SYM S* IDENT? pseudo_page?
     '{' S* declaration [ ';' S* declaration ]* '}' S*
   ;
 pseudo_page
@@ -166,16 +166,16 @@ unicode		\\{h}{1,6}[ \t\r\n\f]?
 escape		{unicode}|\\[ -~\200-\377]
 nmstart		[a-z]|{nonascii}|{escape}
 nmchar		[a-z0-9-]|{nonascii}|{escape}
-string1		\"([\t !#$%&amp;(-~]|\\\n|\'|{nonascii}|{escape})*\"
-string2		\'([\t !#$%&amp;(-~]|\\\n|\"|{nonascii}|{escape})*\'
+string1		\"([\t !#$%&amp;(-~]|\\{nl}|\'|{nonascii}|{escape})*\"
+string2		\'([\t !#$%&amp;(-~]|\\{nl}|\"|{nonascii}|{escape})*\'
 
 ident		{nmstart}{nmchar}*
 name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
 w		[ \t\r\n\f]*
-
+nl		\n|\r\n|\r|\f
 range		\?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
 
 %%
