Skip to content

Commit 6a6133b

Browse files
committed
[css-fonts-4] Merge font-variant shorthand from CSS Fonts 3 w3c#1653
1 parent cabb525 commit 6a6133b

File tree

1 file changed

+32
-5
lines changed

1 file changed

+32
-5
lines changed

css-fonts-4/Overview.bs

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ Ignored Terms: font-palette, <named-palette-color>
2121
<pre class="link-defaults">
2222
spec:css-color-4; type:property; text:color
2323
spec:css22; type:value; for:/; text:block
24-
spec:css-fonts-3;
25-
type:descriptor; for:@font-face;
26-
text:unicode-range
27-
type:property; for:/;
28-
text:font-kerning
2924
</pre>
3025

3126

@@ -4691,6 +4686,36 @@ Animation type: discrete
46914686
<h3 id="font-variant-prop">
46924687
Overall shorthand for font rendering: the 'font-variant!!property' property</h3>
46934688

4689+
<pre class="propdef">
4690+
Name: font-variant
4691+
4692+
Value: normal | none | [ <<common-lig-values>> || <<discretionary-lig-values>> || <<historical-lig-values>> || <<contextual-alt-values>> || [ small-caps | all-small-caps | petite-caps | all-petite-caps | unicase | titling-caps ] || [ 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>>) ] || <<numeric-figure-values>> || <<numeric-spacing-values>> || <<numeric-fraction-values>> || ordinal || slashed-zero || <<east-asian-variant-values>> || <<east-asian-width-values>> || ruby || [ sub | super ] ]
4693+
Initial: normal
4694+
Applies to: all elements
4695+
Inherited: yes
4696+
Percentages: n/a
4697+
Computed value: as specified
4698+
Animation type: discrete
4699+
</pre>
4700+
4701+
<p>The <span title="font-variant!!property">'font-variant'</span> property
4702+
is a shorthand for all font-variant subproperties.
4703+
The value <dfn id="font-variant-normal-value" title="normal!!font-variant">'normal'</dfn>
4704+
resets all subproperties of <span title="font-variant!!property">'font-variant'</span>
4705+
to their inital value.
4706+
The <dfn id="font-variant-none-value" title="none!!font-variant">'none'</dfn> value
4707+
sets 'font-variant-ligatures' to 'none'
4708+
and resets all other font feature properties to their initial value.
4709+
Like other shorthands,
4710+
using <span title="font-variant!!property">'font-variant'</span>
4711+
resets unspecified <span title="font-variant!!property">'font-variant'</span> subproperties
4712+
to their initial values.</p>
4713+
4714+
<p>It does not reset the values of
4715+
'font-language-override',
4716+
<span title="font-feature-settings!!property">'font-feature-settings!!property'</span>
4717+
or <span title="font-variation-settings!!property">'font-variation-settings!!property'</span>.</p>
4718+
46944719
<h3 id="font-feature-settings-prop">
46954720
Low-level font feature settings control: the 'font-feature-settings' property</h3>
46964721

@@ -5854,6 +5879,8 @@ Changes
58545879
<!-- new ones at the top -->
58555880

58565881
<ul>
5882+
<li>Port font-variant shorthand property from CSS Fonts 3</li>
5883+
<li>Port font-variant-east-asian property from CSS Fonts 3</li>
58575884
<li>Port font-variant-numeric property from CSS Fonts 3</li>
58585885
<li>Port font-variant-caps property from CSS Fonts 3</li>
58595886
<li>Port font-variant-position property from CSS Fonts 3</li>

0 commit comments

Comments
 (0)