%token <int> NUM
%token <string> TEXT
-%token SPACE NAME TABLE CSS URI EXT SR OC CC OB CB PS OP CP AT EOF
+%token SPACE NAME TABLE CSS URI EXT SR OC CC OB CB PS CF OP CP AT EOF
%start script
%type <(string * string) list * (string * Table.table * Table.css Attr.atoms * Table.uri Attr.atoms * Table.ext Attr.atoms) list> script
;
texts:
- | text { [$1] }
- | text PS texts { $1 :: $3 }
+ | text { [$1] }
+ | text PS texts { $1 :: T.Plain " " :: $3 }
+ | text CF texts { $1 :: $3 }
;
key:
;
table:
- | css uri ext key { T.mk_key $4 $1 $2 $3 }
- | css uri ext OC tables CC { T.mk_line false $5 $1 $2 $3 }
- | css uri ext OB tables CB { T.mk_line true $5 $1 $2 $3 }
+ | css uri ext name key { T.mk_key $5 $1 $2 $3 $4 }
+ | css uri ext OC tables CC { T.mk_line false $5 $1 $2 $3 "" }
+ | css uri ext OB tables CB { T.mk_line true $5 $1 $2 $3 "" }
;
tables: