Skip to content

Commit 885f769

Browse files
committed
[css-fonts-4] allow font-display in @font-feature-values. Fix #2973
1 parent 9acdeb1 commit 885f769

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

css-fonts-4/Overview.bs

+11-3
Original file line numberDiff line numberDiff line change
@@ -4963,7 +4963,7 @@ mapping author-chosen human-friendly names
49634963
to feature indexes for the associated feature.
49644964

49654965
<pre class=prod>
4966-
@font-feature-values <<family-name>># { <<rule-list>> }
4966+
@font-feature-values <<family-name>># { <<declaration-list>> }
49674967
49684968
<<feature-value-block>> = <<font-feature-value-type>> { <<declaration-list>> }
49694969
@@ -4982,8 +4982,15 @@ If syntax errors occur within the <<family-name>> list,
49824982
the entire rule ''@font-feature-values'' rule is invalid
49834983
and must be ignored.
49844984

4985-
The ''@font-feature-values'' block accepts <<feature-value-block>>s as its contents;
4986-
these are [=at-rules=] named by one of the <<font-feature-value-type>> at-keyword tokens.
4985+
The ''@font-feature-values'' block accepts <<declaration-list>> as its contents;
4986+
these list items are either:
4987+
4988+
[=at-rules=] named by one of the <<font-feature-value-type>> at-keyword tokens,
4989+
or
4990+
the '@font-feature-values/font-display' descriptor.
4991+
4992+
<!-- TODO: tab says "The OM needs to make sure it exposes both .style and .childRules or whatever." -->
4993+
49874994
Specifying the same <<font-feature-value-type>> more than once is valid;
49884995
their contents are cascaded together.
49894996
Each <<feature-value-block>> accepts a list of [=declarations=],
@@ -7203,6 +7210,7 @@ Changes
72037210

72047211
<ul>
72057212
<li>Reduced the critical angle for oblique font matching from 20deg to 11deg, per WG resolution</li>
7213+
<li>Allowed font-display in @font-feature-values (the prose allowed it but the grammar did not)</li>
72067214
</ul>
72077215

72087216
<h3 id="changes-2020-11-17">Changes from the <a href="https://www.w3.org/TR/2020/WD-css-fonts-4-20201117/">17 November 2020 Working Draft</a> </h3><!-- See https://github.com/w3c/csswg-drafts/commits/main/css-fonts-4/Overview.bs -->

0 commit comments

Comments
 (0)