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/
This commit is contained in:
Kyo Nagashima
2018-08-16 09:05:05 +09:00
parent 4e6ef67e51
commit e09eb1d37a
3 changed files with 15 additions and 15 deletions

View File

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

View File

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

View File

@@ -303,18 +303,12 @@
.fonts-3 { .fonts-3 {
display: common-ligatures; display: common-ligatures;
display: no-common-ligatures; display: no-common-ligatures;
display: discretionary-ligatures;
display: no-discretionary-ligatures; display: no-discretionary-ligatures;
display: historical-ligatures; display: historical-ligatures;
display: no-historical-ligatures; display: no-historical-ligatures;
display: contextual; display: contextual;
display: no-contextual; display: no-contextual;
display: stylistic(feature-value-name);
display: historical-forms;
display: styleset(feature-value-name #);
display: character-variant(feature-vlue-name #);
display: swash(feature-value-name);
display: ornaments(feature-value-name);
display: annotation(feature-value-name);
display: all-small-caps; display: all-small-caps;
display: petite-caps; display: petite-caps;
display: all-petite-caps; display: all-petite-caps;
@@ -326,8 +320,6 @@
display: tabular-nums; display: tabular-nums;
display: diagonal-fractions; display: diagonal-fractions;
display: stacked-fractions; display: stacked-fractions;
display: ordinal;
display: slashed-zero;
display: jis78; display: jis78;
display: jis83; display: jis83;
display: jis90; display: jis90;
@@ -335,7 +327,8 @@
display: simplified; display: simplified;
display: traditional; display: traditional;
display: proportional-width; display: proportional-width;
display: discretionary-ligatures; display: ordinal;
display: slashed-zero;
} }
.fonts-4 { .fonts-4 {
@@ -347,11 +340,18 @@
font-palette: auto; font-palette: auto;
font-presentation: auto; font-presentation: auto;
font-variant-emoji: auto; font-variant-emoji: auto;
display: system-ui;
display: emoji; display: emoji;
display: math; display: math;
display: fangsong; display: fangsong;
display: system-ui;
display: infinity; display: infinity;
display: stylistic(feature-value-name);
display: historical-forms;
display: styleset(feature-value-name #);
display: character-variant(feature-vlue-name #);
display: swash(feature-value-name);
display: ornaments(feature-value-name);
display: annotation(feature-value-name);
display: swap; display: swap;
display: fallback; display: fallback;
display: optional; display: optional;