Merge pull request #29 from adelarsq/patch-1

spelling correction

README.md

@@ -68,13 +68,13 @@ cyan and bold (on gVim).
 ### CSS Preprocessors: [Sass][2], [LESS][3], and [Stylus][4]
 
 `vim-css3-syntax` supports Sass's SCSS syntax only. If you want to use this
-plugin with LESS, install [VIM-LESS][5]. Sass's indent synatx and Stylus are not
+plugin with LESS, install [VIM-LESS][5]. Sass's indent syntax and Stylus are not
 supported.
 
 
 ### Media Queries
 
-I drop Media Queries Level 3 support in v0.12.0. There is no easy way to supprt
+I drop Media Queries Level 3 support in v0.12.0. There is no easy way to support
 Media Queries properly with `after` syntax plugin like this one, sorry. If you
 want to highlight Media Queries correctly, you must update Vim to 7.4+ or
 install [JulesWang/css.vim][6].

after/syntax/css/css-counter-styles-3.vim

@@ -1,7 +1,10 @@
-" TODO: create cssCounterStyleDescriptor for `@counter-style` descriptor
-syn keyword cssGeneratedContentProp contained negative prefix suffix range pad fallback
+" TODO: create cssCounterStyleDescriptor for `@counter-style` descriptors
+syn region cssInclude start=/@counter-style\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock
+syn keyword cssGeneratedContentProp contained system negative prefix suffix range pad fallback
 syn match cssGeneratedContentProp contained "\<\(additive-\)\=symbols\>"
 syn match cssGeneratedContentProp contained "\<speak-as\>"
+syn keyword cssGeneratedContentAttr contained cyclic symbolic additive extends bullets numbers words
+syn match cssGeneratedContentAttr contained "\<cjk-decimal\>"
 syn match cssGeneratedContentAttr contained "\<disclosure-\(open\|closed\)\>"
 syn match cssGeneratedContentAttr contained "\<simp-chinese-\(in\)\=formal\>"
 syn match cssGeneratedContentAttr contained "\<trad-chinese-\(in\)\=formal\>"

after/syntax/css/css-display-3.vim

@@ -1,5 +1,5 @@
 " TODO: create cssDisplayProp group and cssDisplayAttr group
-syn match cssFontProp contained "\<display-\(inside\|outside\|extras\|box\)\>"
-syn keyword cssFontAttr contained contents
+syn match cssFontProp contained "\<display-\(inside\|outside\|list\|suppress\)\>"
+syn keyword cssFontAttr contained contents show
 syn match cssFontAttr contained "\<\(block\|inline\)-level\>"
 syn match cssFontAttr contained "\<inline-list-item\>"

after/syntax/css/css-flexbox-1.vim

@@ -4,3 +4,4 @@ syn match cssFontProp contained "\<flex\(-\(basis\|direction\|flow\|grow\|shrink
 syn keyword cssFontAttr contained flex row wrap
 syn match cssFontAttr contained "\<inline-flex\>"
 syn match cssFontAttr contained "\<\(row\|column\|wrap\)-reverse\>"
+syn match cssFontAttr contained "\<main-size\>"

after/syntax/css/css-line-grid-1.vim

@@ -1,7 +1,6 @@
 " TODO: create cssLineGridProp and cssLineGridAttr
-syn match cssFontProp contained "\<line-\(grid\|snap\|slack\)"
+syn match cssFontProp contained "\<line-\(grid\|snap\)"
 syn match cssFontProp contained "\<box-snap\>"
-syn match cssFontAttr contained "\<half-border\>"
 syn keyword cssFontAttr contained create
-syn match cssValueNumber contained "\d\+gd"
-syn region cssFunction contained matchgroup=cssFunctionName start="\<round\(down\|up\)\s*(" end=")" oneline keepend
+syn match cssFontAttr contained "\<block-\(start\|end\)\>"
+syn match cssFontAttr contained "\<\(first\|last\)-baseline\>"

after/syntax/css/css3-hyperlinks.vim

@@ -1,3 +0,0 @@
-" TODO: create cssHyperlinksProp group and cssHyperlinksAttr group
-syn match cssFontProp contained "\<target\(-\(name\|new\|position\)\)\=\>"
-syn keyword cssFontAttr contained current new modal window tab front back

after/syntax/css/css3-marquee.vim

@@ -1,4 +0,0 @@
-" TODO: create cssMarqueeProp group and cssMarqueeAttr group
-syn match cssFontProp contained "\<marquee-\(direction\|play-count\|speed\|style\)\>"
-syn keyword cssFontAttr contained forward reverse infinite slide alternate
-syn match cssFontAttr contained "\<marquee-\(line\|block\)\>"

after/syntax/html.vim

@@ -11,16 +11,13 @@ syn include @htmlCss syntax/css/css3-conditional.vim
 syn include @htmlCss syntax/css/css3-content.vim
 syn include @htmlCss syntax/css/css3-exclusions.vim
 syn include @htmlCss syntax/css/css3-fonts.vim
-syn include @htmlCss syntax/css/css3-hyperlinks.vim
 syn include @htmlCss syntax/css/css3-images.vim
 syn include @htmlCss syntax/css/css3-layout.vim
 syn include @htmlCss syntax/css/css3-linebox.vim
-syn include @htmlCss syntax/css/css3-marquee.vim
 syn include @htmlCss syntax/css/css3-multicol.vim
 syn include @htmlCss syntax/css/css3-page.vim
 syn include @htmlCss syntax/css/css3-preslev.vim
 syn include @htmlCss syntax/css/css3-regions.vim
-syn include @htmlCss syntax/css/css3-ruby.vim
 syn include @htmlCss syntax/css/css3-selectors.vim
 syn include @htmlCss syntax/css/css3-sizing.vim
 syn include @htmlCss syntax/css/css3-speech.vim
@@ -37,6 +34,7 @@ syn include @htmlCss syntax/css/css-line-grid-1.vim
 syn include @htmlCss syntax/css/css-lists-3.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-ruby-1.vim
 syn include @htmlCss syntax/css/css-scoping-1.vim
 syn include @htmlCss syntax/css/css-shapes-1.vim
 syn include @htmlCss syntax/css/css-text-3.vim

after/syntax/scss.vim

@@ -1,3 +1 @@
 runtime! syntax/css/*.vim
-syn clear cssMediaBlock
-syn region cssMediaBlock contained transparent matchgroup=cssBraces start='{' end='}' contains=TOP

test/test.css

@@ -104,23 +104,31 @@
   display: last;
 }
 
-.counter-styles {
-  negative: disclosure-open;
-  prefix: disclosure-closed;
-  suffix: simp-chinese-informal;
-  range: simp-chinese-formal;
-  pad: trad-chinese-informal;
-  fallback: trad-chinese-formal;
-  symbols: ethiopic-numeric;
-  additive-symbols: symbols("*" "\2020" "\2021" "\A7");
-  speak-as: auto;
+@counter-style counter-style {
+  system: cyclic;
+  negative: symbolic;
+  prefix: numbers;
+  suffix: additive;
+  range: extends;
+  pad: cjk-decimal;
+  fallback: disclosure-open;
+  symbols: disclosure-closed;
+  additive-symbols: simp-chinese-informal;
+  speak-as: simp-chinese-formal;
+  display: trad-chinese-informal;
+  display: trad-chinese-formal;
+  display: ethiopic-numeric;
+  display: symbols("*" "\2020" "\2021" "\A7");
+  display: bullets;
+  display: words;
 }
 
 .display {
   display-inside: block-level;
   display-outside: inline-level;
-  display-extras: inline-list-item;
-  display-box: contents;
+  display-list: contents;
+  display-suppress: inline-list-item;
+  display: show;
 }
 
 .exclusions {
@@ -136,7 +144,7 @@
   flex: column-reverse;
   flex-grow: wrap;
   flex-shrink: wrap-reverse;
-  flex-basis: auto;
+  flex-basis: main-size;
 }
 
 .fonts {
@@ -211,16 +219,6 @@
   grid-area: auto;
 }
 
-.hyperlinks {
-  target: current;
-  target-name: new;
-  target-new: modal;
-  target-position: window;
-  display: tab;
-  display: front;
-  display: back;
-}
-
 .images {
   object-fit: contain;
   object-position: cover;
@@ -240,10 +238,10 @@
 
 .line-grid {
   line-grid: create;
-  line-snap: half-border;
-  line-slack: rounddown(1em);
-  box-snap: roundup(1em);
-  display: 10gd;
+  line-snap: block-start;
+  box-snap: block-end;
+  display: first-baseline;
+  display: last-baseline;
 }
 
 .linebox {
@@ -274,16 +272,6 @@
   display: counters(list-item, '.');
 }
 
-.marquee {
-  marquee-direction: forward;
-  marquee-play-count: reverse;
-  marquee-speed: infinite;
-  marquee-style: slide;
-  display: alternate;
-  display: marquee-line;
-  display: marquee-block;
-}
-
 .masking {
   clip-path: fill-box;
   clip-rule: stroke-box;
@@ -347,9 +335,9 @@
 }
 
 .ruby {
+  ruby-position: ruby-base-container;
   ruby-merge: ruby-text-container;
   ruby-align: inter-character;
-  ruby-position: ruby-base-container;
 }
 
 @scope .scoping {

test/test.html

@@ -114,23 +114,31 @@
         display: last;
       }
 
-      .counter-styles {
-        negative: disclosure-open;
-        prefix: disclosure-closed;
-        suffix: simp-chinese-informal;
-        range: simp-chinese-formal;
-        pad: trad-chinese-informal;
-        fallback: trad-chinese-formal;
-        symbols: ethiopic-numeric;
-        additive-symbols: symbols("*" "\2020" "\2021" "\A7");
-        speak-as: auto;
+      @counter-style counter-style {
+        system: cyclic;
+        negative: symbolic;
+        prefix: numbers;
+        suffix: additive;
+        range: extends;
+        pad: cjk-decimal;
+        fallback: disclosure-open;
+        symbols: disclosure-closed;
+        additive-symbols: simp-chinese-informal;
+        speak-as: simp-chinese-formal;
+        display: trad-chinese-informal;
+        display: trad-chinese-formal;
+        display: ethiopic-numeric;
+        display: symbols("*" "\2020" "\2021" "\A7");
+        display: bullets;
+        display: words;
       }
 
       .display {
         display-inside: block-level;
         display-outside: inline-level;
-        display-extras: inline-list-item;
-        display-box: contents;
+        display-list: contents;
+        display-suppress: inline-list-item;
+        display: show;
       }
 
       .exclusions {
@@ -146,7 +154,7 @@
         flex: column-reverse;
         flex-grow: wrap;
         flex-shrink: wrap-reverse;
-        flex-basis: auto;
+        flex-basis: main-size;
       }
 
       .fonts {
@@ -222,16 +230,6 @@
         grid-area: auto;
       }
 
-      .hyperlinks {
-        target: current;
-        target-name: new;
-        target-new: modal;
-        target-position: window;
-        display: tab;
-        display: front;
-        display: back;
-      }
-
       .images {
         object-fit: contain;
         object-position: cover;
@@ -251,10 +249,10 @@
 
       .line-grid {
         line-grid: create;
-        line-snap: half-border;
-        line-slack: rounddown(1em);
-        box-snap: roundup(1em);
-        display: 10gd;
+        line-snap: block-start;
+        box-snap: block-end;
+        display: first-baseline;
+        display: last-baseline;
       }
 
       .linebox {
@@ -283,16 +281,6 @@
         display: auto;
       }
 
-      .marquee {
-        marquee-direction: forward;
-        marquee-play-count: reverse;
-        marquee-speed: infinite;
-        marquee-style: slide;
-        display: alternate;
-        display: marquee-line;
-        display: marquee-block;
-      }
-
       .masking {
         clip-path: fill-box;
         clip-rule: stroke-box;
@@ -356,9 +344,9 @@
       }
 
       .ruby {
+        ruby-position: ruby-base-container;
         ruby-merge: ruby-text-container;
         ruby-align: inter-character;
-        ruby-position: ruby-base-container;
       }
 
       @scope .scoping {