Fix @font-face src format() rule for CSS::Font::Resources

Author: dwarring

lib/CSS/Module/CSS3/Fonts/AtFontFace/Gen/Actions.rakumod

@@ -5,6 +5,9 @@ method family-name ($/) {
 method font-src-expr ($/) {
     make $.build.rule($/)
 }
+method font-format ($/) {
+    make $.build.rule($/)
+}
 method font-face-name ($/) {
     make $.build.rule($/)
 }

lib/CSS/Module/CSS3/Fonts/AtFontFace/Gen/Grammar.rakumod

@@ -62,14 +62,16 @@ rule css-val-font-weight { :i [normal | bold ]& <keyw>  || [100 | 200 | 300 | 40
 #| src: <font-src-expr>#
 rule decl:sym<src> { :i (src) ":" <val(/<css-val-src> +% <op(",")> /, &?ROUTINE.WHY)>}
 rule css-val-src { :i <font-src-expr> }
-#| <font-src-expr> = [<uri>|local(<font-face-name>)] [format(<string>#)]? | <font-face-name>
+#| <font-src-expr> = [<uri>|local(<font-face-name>)] [format(<font-format>#)]? | <font-face-name>
 rule font-src-expr { :i [<uri> || <local> ] <format> ?  || <font-face-name>  }
+#| <font-format> = [<string> | collection | embedded-opentype | opentype | svg | truetype | woff | woff2 ]
+rule font-format { :i [<string> || [collection | "embedded-opentype" | opentype | svg | truetype | woff | woff2 ]& <keyw>  ] }
 #| <font-face-name> = <identifiers> | <string>
 rule font-face-name { :i <identifiers> || <string>  }
 #| local(<font-face-name>)
 rule local { :i "local(" [<font-face-name> || <usage(&?ROUTINE.WHY)> ] ")" }
-#| format(<string>#)
-rule format { :i "format(" [<string> +% "," || <usage(&?ROUTINE.WHY)> ] ")" }
+#| format(<font-format>#)
+rule format { :i "format(" [<font-format> +% "," || <usage(&?ROUTINE.WHY)> ] ")" }
 #| unicode-range: <urange>#
 rule decl:sym<unicode-range> { :i ("unicode-range") ":" <val(/<css-val-unicode-range> +% <op(",")> /, &?ROUTINE.WHY)>}
 rule css-val-unicode-range { :i <urange> }

src/css3x-font-@fontface-properties.txt

@@ -7,8 +7,9 @@ font-style	normal | italic | oblique	normal
 font-variant	normal | [ <common-lig-values> || <discretionary-lig-values> || <historical-lig-values> || <contextual-alt-values> || stylistic(<feature-value-name>) || historical-forms || styleset(<feature-value-name>#) || character-variant(<feature-value-name>#) || swash(<feature-value-name>) || ornaments(<feature-value-name>) || annotation(<feature-value-name>) || [ small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps ] || <numeric-figure-values> || <numeric-spacing-values> || <numeric-fraction-values> || ordinal || slashed-zero || <east-asian-variant-values> || <east-asian-width-values> || ruby ]	normal
 font-weight	normal | bold | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900	normal
 src	<font-src-expr>#	N/A
-    <font-src-expr> = [<uri>|local(<font-face-name>)] [format(<string>#)]? | <font-face-name>
+    <font-src-expr> = [<uri>|local(<font-face-name>)] [format(<font-format>#)]? | <font-face-name>
+    <font-format>= [<string> | collection | embedded-opentype | opentype | svg | truetype | woff | woff2 ]
     <font-face-name> = <identifiers> | <string>
     <local()>  = local(<font-face-name>)
-    <format()> = format(<string>#)
+    <format()> = format(<font-format>#)
 unicode-range	<urange>#	U+0-10FFFF