Up-to-date CSS 3 grammar

Hello,

In the process of upgrading a CSS parser to make it "understand" CSS
3, I'm looking for a grammar.

Unfortunately, the one available in the last css3-syntax WD [1] is
*not* up-to-date -- hasn't been modified to match the css3-selectors
WD [2] for example.

I've tried to "recombine" them on my own but I'm not sure of the
result and I'd prefer a more official reference to base my work on.

Cheers,

[1] <http://www.w3.org/TR/2003/WD-css3-syntax-20030813/#detailed-grammar>
[2] <http://www.w3.org/TR/css3-selectors/#grammar>

-- 
Damiano ALBANI