--- factorcss/Tokeniser.x	2004/12/19 22:10:41	61
+++ factorcss/Tokeniser.x	2004/12/27 22:24:45	64
@@ -1,3 +1,10 @@
+--
+-- This file is part of FactorCSS
+-- Licensed under the MIT License,
+--                http://www.opensource.org/licenses/mit-license
+-- Copyright 2004 James Bursa <james@semichrome.net>
+--
+
 -- Tokeniser for CSS 2.1
 -- See CSS 2.1 G.2
 
@@ -14,17 +21,18 @@
 @nmstart	= [_a-z]|$nonascii|@escape
 @nmchar		= [\-_a-zA-Z0-9]|$nonascii|@escape
 @nl		= \n|\r\n|\r|\f
-@string1	= \"([\t\ !#\x24\x25&\x28-\x7e]|\\@nl|\'|$nonascii|@escape|\.)*\"
-@string2	= \'([\t\ !#\x24\x25&\x28-\x7e]|\\@nl|\"|$nonascii|@escape|\.)*\'
+@string1	= \"([\t\ \!\#\x24\x25&\x28-\x7e]|\\@nl|\'|$nonascii|@escape|\.)*\"
+@string2	= \'([\t\ \!\#\x24\x25&\x28-\x7e]|\\@nl|\"|$nonascii|@escape|\.)*\'
 @ident		= @nmstart@nmchar*
 @name		= @nmchar+
 @num		= [\-\053]?[0-9]+|[0-9]*"."[0-9]+
 @string		= @string1|@string2
-@url		= ([!#\x24\x25&\x2a-\x7e]|$nonascii|@escape)*
+@url		= ([\!\#\x24\x25&\x2a-\x7e]|$nonascii|@escape)*
 $s		= [\ \t\r\n\f]
 @w		= $s*
 @range		= \?{1,6}|$h(\?{0,5}|$h(\?{0,4}|$h(\?{0,3}|$h(\?{0,2}|$h(\??|$h)))))
-@comment	= \/\*[^\x2a]*\*+([^\/\x2a][^\x2a]*\*+)*\/
+$all		= \x00-\xff
+@comment	= \/\*$all#\x2a*\*+($all#[\/\x2a]$all#\x2a*\*+)*\/
 
 tokens :-