From 11b62a3f2a958e6c4781c1df9b035d24a169b692 Mon Sep 17 00:00:00 2001
From: Kyo Nagashima <kyo@hail2u.net>
Date: Wed, 4 Dec 2013 01:50:05 +0900
Subject: [PATCH] Follow WD-css-shapes-1-20131203

---
 after/syntax/css/css-shapes-1.vim | 5 +++++
 after/syntax/css/css-shapes.vim   | 3 ---
 after/syntax/html.vim             | 2 +-
 test/test.css                     | 8 ++++----
 test/test.html                    | 8 ++++----
 5 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 after/syntax/css/css-shapes-1.vim
 delete mode 100644 after/syntax/css/css-shapes.vim

diff --git a/after/syntax/css/css-shapes-1.vim b/after/syntax/css/css-shapes-1.vim
new file mode 100644
index 0000000..61828de
--- /dev/null
+++ b/after/syntax/css/css-shapes-1.vim
@@ -0,0 +1,5 @@
+if !hlexists('cssShapesProp')
+  syn match cssFontProp contained "\<shape-\(outside\|image-threshold\|margin\)\>"
+  syn match cssFontAttr contained "\<margin-box\>"
+  syn region cssFunction contained matchgroup=cssFunctionName start="\<\(inset\|circle\|ellipse\|polygon\)\s*(" end=")" oneline keepend
+endif
diff --git a/after/syntax/css/css-shapes.vim b/after/syntax/css/css-shapes.vim
deleted file mode 100644
index 35f33a3..0000000
--- a/after/syntax/css/css-shapes.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-" TODO: create cssShapesProp group
-syn match cssFontProp contained "\<shape-\(image-threshold\|inside\|outside\)\>"
-syn region cssFunction contained matchgroup=cssFunctionName start="\<\(\(inset-\)\=rectangle\|circle\|ellipse\|polygon\)\s*(" end=")" oneline keepend
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index bcffcb5..3031cec 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -35,7 +35,7 @@ syn include @htmlCss syntax/css/css3-ui.vim
 syn include @htmlCss syntax/css/css3-values.vim
 syn include @htmlCss syntax/css/css-masking-1.vim
 syn include @htmlCss syntax/css/css-overflow-3.vim
-syn include @htmlCss syntax/css/css-shapes.vim
+syn include @htmlCss syntax/css/css-shapes-1.vim
 syn include @htmlCss syntax/css/css-text-3.vim
 syn include @htmlCss syntax/css/css-text-decor-3.vim
 syn include @htmlCss syntax/css/css-variables.vim
diff --git a/test/test.css b/test/test.css
index 1e9de19..70bb2f3 100644
--- a/test/test.css
+++ b/test/test.css
@@ -363,11 +363,11 @@
 }
 
 .shapes {
-  shape-image-threshold: rectangle(1px 1px 1198px 398px);
-  shape-inside: inset-rectangle(400px 100px 400px 200px);
-  shape-outside: circle(600px 200px 100px);
+  shape-outside: margin-box;
+  shape-image-threshold: inset(50% 50% 50% 50%);
+  shape-margin: circle(100px 50px 100px);
   display: ellipse(0 0 250px 100px);
-  display: polygon(350px,75px  379px,161px 469px,161px 397px,215px 423px,301px 350px,250px 277px,301px 303px,215px 231px,161px 321px,161px);
+  display: polygon(0 0, 100% 100%, 0 100%);
 }
 
 .sizing {
diff --git a/test/test.html b/test/test.html
index ee9d980..c5ab7d3 100644
--- a/test/test.html
+++ b/test/test.html
@@ -373,11 +373,11 @@
       }
 
       .shapes {
-        shape-image-threshold: rectangle(1px 1px 1198px 398px);
-        shape-inside: inset-rectangle(400px 100px 400px 200px);
-        shape-outside: circle(600px 200px 100px);
+        shape-outside: margin-box;
+        shape-image-threshold: inset(50% 50% 50% 50%);
+        shape-margin: circle(100px 50px 100px);
         display: ellipse(0 0 250px 100px);
-        display: polygon(350px,75px  379px,161px 469px,161px 397px,215px 423px,301px 350px,250px 277px,301px 303px,215px 231px,161px 321px,161px);
+        display: polygon(0 0, 100% 100%, 0 100%);
       }
 
       .sizing {