--- factorcss/Parser.y	2005/01/07 21:54:20	69
+++ factorcss/Parser.y	2005/01/08 00:02:19	70
@@ -93,8 +93,8 @@
 		| medium_list_1 s COMMA s medium	{ $5 : $1 }
 
 media		:: { Statement }
-		: MEDIA_SYM s medium_list_1 s LBRACE s ruleset_list s RBRACE
-							{ Media $3 $7 }
+		: MEDIA_SYM s medium_list_1 LBRACE s ruleset_list RBRACE
+							{ Media $3 $6 }
 
 medium		:: { String }
 		: IDENT					{ $1 }
@@ -104,15 +104,15 @@
 		| ruleset_list s ruleset		{ $3 : $1 }
 
 page		:: { Statement }
-		: PAGE_SYM s LBRACE s declaration_list_1 s RBRACE
-							{ Page Nothing $5 }
-		| PAGE_SYM s pseudo_page s LBRACE s declaration_list_1 RBRACE
-							{ Page (Just $3) $7 }
+		: PAGE_SYM LBRACE s declaration_list_1 RBRACE
+							{ Page Nothing $4 }
+		| PAGE_SYM s pseudo_page LBRACE s declaration_list_1 RBRACE
+							{ Page (Just $3) $6 }
 
 declaration_list_1 :: { [Declaration] }
 		:					{ [] }
-		| declaration s				{ [$1] }
-		| declaration_list_1 s SEMI		{ $1 }
+		| declaration				{ [$1] }
+		| declaration_list_1 s SEMI s		{ $1 }
 		| declaration_list_1 s SEMI s declaration
 							{ $5 : $1 }
 
@@ -120,8 +120,8 @@
 		: COLON IDENT				{ $2 }
 
 ruleset		:: { Statement }
-		: selector_list_1 s LBRACE s declaration_list_1 s RBRACE
-							{ Ruleset $1 $5 }
+		: selector_list_1 LBRACE s declaration_list_1 RBRACE
+							{ Ruleset $1 $4 }
 
 selector_list_1	:: { [Selector] }
 		: selector				{ [$1] }
@@ -181,10 +181,10 @@
 
 declaration	:: { Declaration }
 		: property COLON s value_list_1		{ ($1, $4, False) }
-		| property COLON s value_list_1 s prio	{ ($1, $4, True) }
+		| property COLON s value_list_1 prio	{ ($1, $4, True) }
 
 property	:: { String }
-		: IDENT					{ $1 }
+		: IDENT s				{ $1 }
 
 prio		:: { Bool }
 		: IMPORTANT_SYM				{ True }
@@ -194,7 +194,7 @@
 		| value s value_list			{ $1 : $3 }
 
 value_list_1	:: { [Value] }
-		: value					{ [$1] }
+		: value	s				{ [$1] }
 		| value s value_list_1			{ $1 : $3 }
 
 value		:: { Value }
@@ -216,7 +216,7 @@
 
 s		:: {}
 		:					{ }
-		| S					{ }
+		| s S					{ }
 
 {
 happyError :: [TokenPosn] -> a