From ab5722664a12667077083e80aabbc014ad771e10 Mon Sep 17 00:00:00 2001
From: Kyo Nagashima <hail2u@gmail.com>
Date: Thu, 19 Nov 2020 16:21:47 +0900
Subject: [PATCH] Update fonts-4.vim

https://www.w3.org/TR/2020/WD-css-fonts-4-20201117/
---
 after/syntax/css/fonts-4.vim | 11 ++++++----
 test/test.css                | 41 ++++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/after/syntax/css/fonts-4.vim b/after/syntax/css/fonts-4.vim
index 39628fc..21f9e02 100644
--- a/after/syntax/css/fonts-4.vim
+++ b/after/syntax/css/fonts-4.vim
@@ -1,16 +1,19 @@
+syn match cssFontProp contained "\<font-synthesis\(-\(weight\|style\|small-caps\|settings\)\)\=\>"
+syn match cssFontProp contained "\<font-named-instance\>"
 syn match cssFontProp contained "\<font-display\>"
+syn match cssFontProp contained "\<\(ascent\|descent\|line-gap\)-override\>"
 syn match cssFontProp contained "\<font-optical-sizing\>"
 syn match cssFontProp contained "\<font-variation-settings\>"
 syn match cssFontProp contained "\<font-palette\>"
+syn match cssFontProp contained "\<font-variant-emoji\>"
 syn match cssFontProp contained "\<font-presentation\>"
 syn match cssFontProp contained "\<base-palette\>"
 syn match cssFontProp contained "\<override-color\>"
-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 swap fallback light dark
 syn match cssFontAttr contained "\<system-ui\>"
 syn match cssFontAttr contained "\<ui-\(\(sans-\)\=serif\|monospace\|rounded\)\>"
-syn match cssFontAttr contained "\<historical-forms\>"
 syn match cssFontAttr contained "\<xxx-large\>"
+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-feature-values\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl
+syn match cssFontDescriptor "@font-feature-values\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl
 syn match cssFontDescriptor "@font-palette-values\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl
diff --git a/test/test.css b/test/test.css
index 4669ad9..c24197b 100644
--- a/test/test.css
+++ b/test/test.css
@@ -354,34 +354,47 @@
 }
 
 .fonts-4 {
+	font-synthesis-weight: auto;
+	font-synthesis-style: auto;
+	font-synthesis-small-caps: auto;
+	font-variation-settings: auto;
+	font-named-instance: auto;
 	font-display: auto;
+	ascent-override: auto;
+	descent-override: auto;
+	line-gap-override: auto;
 	font-optical-sizing: auto;
 	font-variation-settings: auto;
 	font-palette: auto;
-	font-presentation: auto;
 	font-variant-emoji: auto;
+	font-presentation: auto;
 	display: system-ui;
 	display: emoji;
 	display: math;
 	display: fangsong;
-	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: fallback;
-	display: optional;
-	display: light;
-	display: dark;
 	display: ui-serif;
 	display: ui-sans-serif;
 	display: ui-monospace;
 	display: ui-rounded;
 	display: xxx-large;
+	display: swap;
+	display: fallback;
+	display: historical-forms;
+	display: stylistic(feature-value-name);
+	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: light;
+	display: dark;
+}
+
+@font-feature-values Test {
+	@swash {
+		swishy: 1;
+		flowing: 2;
+	}
 }
 
 @font-palette-values Test {