Skip to content

Commit e09eb1d

Browse files
committed
Follow changes in PR-css-fonts-3-20180814
This commit removes some functions taht differred to fonts-4. See also: https://www.w3.org/TR/2018/PR-css-fonts-3-20180814/
1 parent 4e6ef67 commit e09eb1d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

after/syntax/css/fonts-3.vim

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
syn keyword cssFontAttr contained unicase ordinal jis78 jis83 jis90 jis04 simplified traditional
1+
syn keyword cssFontAttr contained unicase jis78 jis83 jis90 jis04 simplified traditional ordinal
22
syn match cssFontAttr contained "\<\(no-\)\=\(common\|discretionary\|historical\)-ligatures\>"
33
syn match cssFontAttr contained "\<\(no-\)\=contextual\>"
4-
syn match cssFontAttr contained "\<historical-forms\>"
54
syn match cssFontAttr contained "\<all-small-caps\>"
65
syn match cssFontAttr contained "\<\(all-\)\=petite-caps\>"
76
syn match cssFontAttr contained "\<titling-caps\>"
87
syn match cssFontAttr contained "\<\(lining\|oldstyle\|proportional\|tabular\)-nums\>"
98
syn match cssFontAttr contained "\<\(diagonal\|stacked\)-fractions\>"
10-
syn match cssFontAttr contained "\<slashed-zero\>"
119
syn match cssFontAttr contained "\<proportional-width\>"
12-
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(stylistic\|styleset\|character-variant\|swash\|ornaments\|annotation\)\s*(" end=")" oneline keepend
10+
syn match cssFontAttr contained "\<slashed-zero\>"

after/syntax/css/fonts-4.vim

+2
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ syn match cssFontProp contained "\<base-palette\>"
88
syn match cssFontProp contained "\<font-variant-emoji\>"
99
syn keyword cssFontAttr contained emoji math fangsong infinity swap fallback optional light dark
1010
syn match cssFontAttr contained "\<system-ui\>"
11+
syn match cssFontAttr contained "\<historical-forms\>"
12+
syn region cssFunction contained matchgroup=cssFunctionName start="\<\(stylistic\|styleset\|character-variant\|swash\|ornaments\|annotation\)\s*(" end=")" oneline keepend
1113
syn match cssFontDescriptor "@font-palette-values\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl

test/test.css

+11-11
Original file line numberDiff line numberDiff line change
@@ -303,18 +303,12 @@
303303
.fonts-3 {
304304
display: common-ligatures;
305305
display: no-common-ligatures;
306+
display: discretionary-ligatures;
306307
display: no-discretionary-ligatures;
307308
display: historical-ligatures;
308309
display: no-historical-ligatures;
309310
display: contextual;
310311
display: no-contextual;
311-
display: stylistic(feature-value-name);
312-
display: historical-forms;
313-
display: styleset(feature-value-name #);
314-
display: character-variant(feature-vlue-name #);
315-
display: swash(feature-value-name);
316-
display: ornaments(feature-value-name);
317-
display: annotation(feature-value-name);
318312
display: all-small-caps;
319313
display: petite-caps;
320314
display: all-petite-caps;
@@ -326,16 +320,15 @@
326320
display: tabular-nums;
327321
display: diagonal-fractions;
328322
display: stacked-fractions;
329-
display: ordinal;
330-
display: slashed-zero;
331323
display: jis78;
332324
display: jis83;
333325
display: jis90;
334326
display: jis04;
335327
display: simplified;
336328
display: traditional;
337329
display: proportional-width;
338-
display: discretionary-ligatures;
330+
display: ordinal;
331+
display: slashed-zero;
339332
}
340333

341334
.fonts-4 {
@@ -347,11 +340,18 @@
347340
font-palette: auto;
348341
font-presentation: auto;
349342
font-variant-emoji: auto;
343+
display: system-ui;
350344
display: emoji;
351345
display: math;
352346
display: fangsong;
353-
display: system-ui;
354347
display: infinity;
348+
display: stylistic(feature-value-name);
349+
display: historical-forms;
350+
display: styleset(feature-value-name #);
351+
display: character-variant(feature-vlue-name #);
352+
display: swash(feature-value-name);
353+
display: ornaments(feature-value-name);
354+
display: annotation(feature-value-name);
355355
display: swap;
356356
display: fallback;
357357
display: optional;

0 commit comments

Comments
 (0)