Skip to content

Commit 5b6b44b

Browse files
committed
ok lets try some more bikeshed syntax for property descriptor disambiguation
1 parent f25cac5 commit 5b6b44b

1 file changed

Lines changed: 20 additions & 19 deletions

File tree

css-fonts-4/Overview.bs

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ Shorthand font property: the 'font' property</h3>
933933

934934
<pre class="propdef">
935935
Name: font
936-
Value: [ [ <<'font-style'>> || <<font-variant-css21>> || <<'font-weight'>> || <<font-stretch-css3>> ]? <<'font-size'>> [ / <<'line-height'>> ]? <<'font-family'>> ] | caption | icon | menu | message-box | small-caption | status-bar
936+
Value: [ [ <<'font-style!!property'>> || <<font-variant-css21>> || <<'font-weight!!property'>> || <<font-stretch-css3>> ]? <<'font-size!!property'>> [ / <<'line-height'>> ]? <<'font-family!!property'>> ] | caption | icon | menu | message-box | small-caption | status-bar
937937
Initial: see individual properties
938938
Applies to: all elements
939939
Inherited: yes
@@ -943,7 +943,7 @@ Media: visual
943943
Animatable: see individual properties
944944
</pre>
945945

946-
The 'font' property is,
946+
The 'font!!property' property is,
947947
except as described below,
948948
a shorthand property for setting
949949
'font-style!!property', 'font-variant!!property', 'font-weight!!property', 'font-stretch!!property',
@@ -964,10 +964,10 @@ CSS Fonts level 3, none of the 'font-stretch!!property' values added in this spe
964964
The syntax of this property is based on a traditional typographical
965965
shorthand notation to set multiple properties related to fonts.
966966

967-
All subproperties of the 'font' property are first reset to their initial values,
968-
including those listed above plus 'font-size-adjust', 'font-kerning', all subproperties of 'font-variant', 'font-feature-settings',
969-
'font-language-override', 'font-min-size', 'font-max-size', 'font-optical-sizing', 'font-variation-settings', and 'font-palette'.
970-
Then, those properties that are given explicit values in the 'font'
967+
All subproperties of the 'font!!property' property are first reset to their initial values,
968+
including those listed above plus 'font-size-adjust', 'font-kerning', all subproperties of 'font-variant!!property', 'font-feature-settings!!property',
969+
'font-language-override', 'font-min-size', 'font-max-size', 'font-optical-sizing', 'font-variation-settings!!property', and 'font-palette'.
970+
Then, those properties that are given explicit values in the 'font!!property'
971971
shorthand are set to those values. For a definition of allowed and
972972
initial values, see the previously defined properties. For reasons of
973973
backwards compatibility, it is not possible to set 'font-size-adjust'
@@ -1934,7 +1934,7 @@ body { font-family: DroidSans; }
19341934
</div>
19351935

19361936
<h3 id="font-rend-desc">
1937-
Font features and variations: the 'font-variant', 'font-feature-settings', and 'font-variation-settings' descriptors</h3>
1937+
Font features and variations: the 'font-variant!!descriptor', 'font-feature-settings!!descriptor', and 'font-variation-settings!!descriptor' descriptors</h3>
19381938

19391939
<pre class='descdef'>
19401940
Name: font-variant
@@ -1969,15 +1969,16 @@ For: @font-face
19691969
These descriptors define initial settings that apply when the font defined by
19701970
an <code>@font-face</code> rule is rendered. They do not affect font selection.
19711971
Values are identical to those defined for the corresponding
1972-
'font-variant', 'font-feature-settings', and 'font-variation-settings' properties defined below
1972+
'font-variant!!property', 'font-feature-settings!!property', and
1973+
'font-variation-settings!!property' properties defined below
19731974
except that the value 'inherit' is omitted. When multiple font
19741975
feature descriptors, properties, or variations are used, the cumulative effect on
19751976
text rendering is detailed in the section
19761977
<a href="#font-feature-variation-resolution">Font Feature and Variation Resolution</a> below.
19771978
In cases where specific values define synthesized fallback for certain
1978-
'font-variant' subproperties, the same synthesized fallback
1979+
'font-variant!!property' subproperties, the same synthesized fallback
19791980
applies when used within those values are used with the
1980-
'font-variant' descriptor.
1981+
'font-variant!!descriptor' descriptor.
19811982

19821983
<h4 id="font-face-loading">Font loading guidelines</h4>
19831984

@@ -2662,7 +2663,7 @@ font can provide glyphs for a wide range of ligatures, contextual and
26622663
stylistic alternates, tabular and old-style figures, small capitals,
26632664
automatic fractions, swashes, and alternates specific to a given
26642665
language. To allow authors control over these font capabilities, the
2665-
'font-variant' property has been expanded for CSS3. It now functions as
2666+
'font-variant!!property' property has been expanded for CSS3. It now functions as
26662667
a shorthand for a set of properties that provide control over
26672668
stylistic font features.
26682669

@@ -2697,7 +2698,7 @@ surrounding context, such as kerning and ligature features, and ones
26972698
such as the small-caps, subscript/superscript and alternate features
26982699
that affect shape selection.
26992700

2700-
The subproperties of 'font-variant' listed below are used to control
2701+
The subproperties of 'font-variant!!property' listed below are used to control
27012702
these stylistic font features. They do not control features that are
27022703
required for displaying certain scripts, such as the OpenType features
27032704
used when displaying Arabic or Indic language text. They affect glyph
@@ -2791,7 +2792,7 @@ Issue: Moved to Level 4; port the text for this from Fonts 3 .src to Fonts 4 .bs
27912792
East Asian text rendering: the 'font-variant-east-asian' property</h3>
27922793

27932794
<h3 id="font-variant-prop">
2794-
Overall shorthand for font rendering: the 'font-variant' property</h3>
2795+
Overall shorthand for font rendering: the 'font-variant!!property' property</h3>
27952796

27962797
<h3 id="font-feature-settings-prop">
27972798
Low-level font feature settings control: the 'font-feature-settings' property</h3>
@@ -2803,9 +2804,9 @@ Font Feature and Variation Resolution</h3>
28032804

28042805
As described in the previous section,
28052806
font features and variations can be enabled in a variety of ways,
2806-
either via the use of 'font-variant',
2807-
'font-feature-settings',
2808-
'font''font-variation-settings' in a style rule
2807+
either via the use of 'font-variant!!property',
2808+
'font-feature-settings!!property',
2809+
'font''font-variation-settings!!property' in a style rule
28092810
or within an ''@font-face'' rule.
28102811
The resolution order for the union of these settings is defined below.
28112812
Features defined via CSS properties are applied on top of layout engine default features.
@@ -2825,9 +2826,9 @@ along with localized forms
28252826
and features required for proper display of composed characters and marks
28262827
(OpenType features: <span class="tag">ccmp, mark, mkmk</span>).
28272828
These features must always be enabled,
2828-
even when the value of the 'font-variant' and 'font-feature-settings' properties is 'normal'.
2829+
even when the value of the 'font-variant!!property' and 'font-feature-settings!!property' properties is 'normal'.
28292830
Individual features are only disabled when explicitly overridden by the author,
2830-
as when 'font-variant-ligatures' is set to 'no-common-ligatures'.
2831+
as when 'font-variant-ligatures!!property' is set to 'no-common-ligatures'.
28312832

28322833
For handling complex scripts such as
28332834
<a href="https://www.microsoft.com/typography/otfntdev/arabicot/features.aspx">Arabic</a>,
@@ -2896,7 +2897,7 @@ This ordering allows authors to set up a general set of defaults
28962897
for fonts within their ''@font-face'' rules, then override them with
28972898
property settings for specific elements. General property settings
28982899
override the settings in ''@font-face'' rules and low-level font feature
2899-
settings override 'font-variant' property settings.
2900+
settings override 'font-variant!!property' property settings.
29002901

29012902
For situations where the combined list of font feature settings
29022903
contains more than one value for the same feature, the last value is

0 commit comments

Comments
 (0)