From 324bec05c55aefd6752f0c4d81d4059116c10022 Mon Sep 17 00:00:00 2001
From: Kyo Nagashima <kyo@hail2u.net>
Date: Fri, 23 May 2014 10:17:04 +0900
Subject: [PATCH] Follow WD-css-masking-1-20140522

See also: http://www.w3.org/TR/2014/WD-css-masking-1-20140522/
---
 after/syntax/css/css-masking-1.vim |  9 ++++----
 test/test.css                      | 34 ++++++++++++++++--------------
 test/test.html                     | 34 ++++++++++++++++--------------
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/after/syntax/css/css-masking-1.vim b/after/syntax/css/css-masking-1.vim
index 8f4a4fa..2136111 100644
--- a/after/syntax/css/css-masking-1.vim
+++ b/after/syntax/css/css-masking-1.vim
@@ -1,9 +1,10 @@
 " TODO: create cssMaskingProp group and cssMaskingValue group
-syn match cssFontProp contained "\<mask\(-\(image\|source-type\|repeat\|position\|clip\|origin\|size\|type\)\)\=\>"
-syn match cssFontProp contained "\<mask-box-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>"
 syn match cssFontProp contained "\<clip-\(path\|rule\)\>"
-syn keyword cssFontAttr contained alpha luminance nonzero evenodd
+syn match cssFontProp contained "\<mask\(-\(image\|mode\|repeat\|position\|clip\|origin\|size\|composite\|type\)\)\=\>"
+syn match cssFontProp contained "\<mask-border\(-\(source\|mode\|slice\|width\|outset\|repeat\)\)\=\>"
+syn keyword cssFontAttr contained nonzero evenodd alpha luminance add subtract intersect exclude
+syn match cssFontAttr contained "\<\(fill\|stroke\|view\)-box\>"
 syn match cssFontAttr contained "\<no-clip\>"
 
 " http://www.w3.org/TR/css-masking/#MaskElement
-" syn keyword cssTagName mask
+syn keyword cssTagName mask
diff --git a/test/test.css b/test/test.css
index 2805e01..02609b7 100644
--- a/test/test.css
+++ b/test/test.css
@@ -277,23 +277,25 @@
 }
 
 .masking {
-  mask-image: alpha;
-  mask-source-type: luminance;
-  mask-repeat: no-clip;
-  mask-position: nonzero;
-  mask-clip: evenodd;
-  mask-origin: auto;
-  mask-size: auto;
-  mask: auto;
+  clip-path: fill-box;
+  clip-rule: stroke-box;
+  mask-image: view-box;
+  mask-mode: nonzero;
+  mask-repeat: evenodd;
+  mask-position: alpha;
+  mask-clip: luminance;
+  mask-origin: no-clip;
+  mask-size: add;
+  mask-composite: subtract;
+  mask: intersect;
+  mask-border-source: exclude;
+  mask-border-mode: auto;
+  mask-border-slice: auto;
+  mask-border-width: auto;
+  mask-border-outset: auto;
+  mask-border-repeat: auto;
+  mask-border: auto;
   mask-type: auto;
-  mask-box-image-source: auto;
-  mask-box-image-slice: auto;
-  mask-box-image-width: auto;
-  mask-box-image-outset: auto;
-  mask-box-image-repeat: auto;
-  mask-box-image: auto;
-  clip-path: auto;
-  clip-rule: auto;
 }
 
 @media screen and (min-width: 999px) {
diff --git a/test/test.html b/test/test.html
index cdb3326..a28ee7e 100644
--- a/test/test.html
+++ b/test/test.html
@@ -286,23 +286,25 @@
       }
 
       .masking {
-        mask-image: alpha;
-        mask-source-type: luminance;
-        mask-repeat: no-clip;
-        mask-position: nonzero;
-        mask-clip: evenodd;
-        mask-origin: auto;
-        mask-size: auto;
-        mask: auto;
+        clip-path: fill-box;
+        clip-rule: stroke-box;
+        mask-image: view-box;
+        mask-mode: nonzero;
+        mask-repeat: evenodd;
+        mask-position: alpha;
+        mask-clip: luminance;
+        mask-origin: no-clip;
+        mask-size: add;
+        mask-composite: subtract;
+        mask: intersect;
+        mask-border-source: exclude;
+        mask-border-mode: auto;
+        mask-border-slice: auto;
+        mask-border-width: auto;
+        mask-border-outset: auto;
+        mask-border-repeat: auto;
+        mask-border: auto;
         mask-type: auto;
-        mask-box-image-source: auto;
-        mask-box-image-slice: auto;
-        mask-box-image-width: auto;
-        mask-box-image-outset: auto;
-        mask-box-image-repeat: auto;
-        mask-box-image: auto;
-        clip-path: auto;
-        clip-rule: auto;
       }
 
       @media screen and (min-width: 999px) {