0.25.0

Drop support HTML and SCSS

README.md

@@ -37,8 +37,8 @@ NOTES
 ### Highlighting problems on: `vertical-align`, `box-shadow`, and others
 
 Some properties do not highlight correctly by default. This is a limitation of
-Vim’s highlight priority mechanism. To fix this problems, put following lines in
-your `~/.vim/after/css.vim`:
+Vim’s highlight priority mechanism. To fix this problems, put following lines
+in your `~/.vim/after/css.vim`:
 
     setlocal iskeyword+=-
 
@@ -62,9 +62,9 @@ such as `-webkit-` or `-moz-`, etc. These are hard to maintain because they are:
   * Changed unexpectedly
   * Removed silently
 
-These must be supported by separate syntax plugins (Vim 7.4’s default CSS syntax
-file supports this). If you want to highlight prefixed properties or functions
-manually, `:highlight` and `:match` would help:
+These must be supported by separate syntax plugins (Vim 7.4’s default CSS
+syntax file supports this). If you want to highlight prefixed properties or
+functions manually, `:highlight` and `:match` would help:
 
     :highlight VendorPrefix guifg=#00ffff gui=bold
     :match VendorPrefix /-\(moz\|webkit\|o\|ms\)-[a-zA-Z-]\+/
@@ -73,19 +73,12 @@ These commands highlight vendor prefixed properties and functions instantly with
 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 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 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].
+install [JulesWang/css.vim][2].
 
 
 AUTHOR
@@ -101,8 +94,4 @@ MIT: http://hail2u.mit-license.org/2011
 
 
 [1]: http://www.vim.org/
-[2]: http://sass-lang.com/
-[3]: http://lesscss.org/
-[4]: http://learnboost.github.io/stylus/
-[5]: https://github.com/groenewege/vim-less
-[6]: https://github.com/JulesWang/css.vim
+[2]: https://github.com/JulesWang/css.vim

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

@@ -1,4 +1,5 @@
 syn match cssFontProp contained "\<\(justify\|align\|place\)-\(self\|content\|items\)\>"
+syn match cssFontProp contained "\<\(grid-\)\=\(\(row\|column\)-\)\=gap\>"
 syn keyword cssFontAttr contained safe unsafe legacy
 syn match cssFontAttr contained "\<\(self\|flex\)-\(start\|end\)\>"
 syn match cssFontAttr contained "\<space-\(between\|around\|evenly\)\>"

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

@@ -1,4 +1,3 @@
-" TODO: create cssBackgroundProp group and cssBackgroundAttr group
 syn match cssFontProp contained "\<background-\(clip\|origin\|size\)\>"
 syn match cssFontProp contained "\<border-image\(-\(source\|slice\|width\|outset\|repeat\)\)\=\>"
 syn match cssFontProp contained "\<border-\(\(top-right\|bottom-right\|bottom-left\|top-left\)-\)\=radius\>"

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

@@ -1,2 +1,3 @@
 syn match cssFontProp contained "\<break-\(after\|before\|inside\)\>"
 syn match cssFontProp contained "\<box-decoration-break\>"
+syn match cssFontAttr contained "\<\(avoid-\)\=column\>"

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

@@ -1,4 +1,2 @@
-" TODO: create cssDisplayProp group and cssDisplayAttr group
 syn keyword cssFontAttr contained contents discard
 syn match cssFontAttr contained "\<flow\(-root\)\=\>"
-syn match cssFontAttr contained "\<inline-list-item\>"

after/syntax/css/css-fonts-4.vim

@@ -1,4 +1,10 @@
+syn match cssFontProp contained "\<font-\(min\|max\)-size\>"
+syn match cssFontProp contained "\<font-display\>"
 syn match cssFontProp contained "\<font-optical-sizing\>"
 syn match cssFontProp contained "\<font-variation-settings\>"
-syn keyword cssFontAttr contained emoji math fangsong
+syn match cssFontProp contained "\<font-palette\>"
+syn match cssFontProp contained "\<font-presentation\>"
+syn match cssFontProp contained "\<base-palette\>"
+syn keyword cssFontAttr contained emoji math fangsong infinity swap fallback optional light dark
 syn match cssFontAttr contained "\<system-ui\>"
+syn region cssInclude start=/@font-palette-values\>/ end=/\ze{/ skipwhite skipnl contains=css.*Prop,css.*Attr,cssValueInteger,cssValueLength,cssMediaKeyword,cssVendor,cssIncludeKeyword,cssComment nextgroup=cssMediaBlock

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

@@ -2,8 +2,7 @@ syn match cssFontProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\
 syn match cssFontProp contained "\<grid-auto-\(columns\|rows\|flow\)\>"
 syn match cssFontProp contained "\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>"
 syn match cssFontProp contained "\<grid-area\>"
-syn match cssFontProp contained "\<grid\(-\(column\|row\)\)\=-gap\>"
-syn keyword cssFontAttr contained grid subgrid dense span
+syn keyword cssFontAttr contained grid dense span
 syn match cssFontAttr contained "\<inline-grid\>"
 syn match cssFontAttr contained "\<auto-flow\>"
 syn match cssValueNumber contained "[01]\(.\d\+\)\=fr"

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

@@ -0,0 +1,5 @@
+syn match cssFontProp contained "\<\(\(min\|max\)-\)\=\(block\|inline\)-size\>"
+syn match cssFontProp contained "\<\(margin\|inset\|padding\)\(-\(block\|inline\)\(-\(start\|end\)\)\=\)\=\>"
+syn match cssFontProp contained "\<border-\(block\|inline\)\(\(-\(start\|end\)\)\=\(-\(width\|style\|color\)\)\=\)\=\>"
+syn match cssFontProp contained "\<\(background\|border\)-image-transform\>"
+syn keyword cssFontAttr contained logical physical rotate

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

@@ -0,0 +1,3 @@
+syn keyword cssFontProp contained columns
+syn match cssFontProp contained "\<column-\(count\|fill\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
+syn match cssFontAttr contained "\<balance\(-all\)\=\>"

after/syntax/css/css-overflow-4.vim

@@ -0,0 +1,4 @@
+syn keyword cssFontProp contained continue
+syn match cssFontProp contained "\<scrollbar-gutter\>"
+syn keyword cssFontAttr contained stable force overflow paginate fragments
+syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":\(nth-fragment\)(" end=")" oneline

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

@@ -2,7 +2,8 @@ syn keyword cssTextProp contained hyphens
 syn match cssTextProp contained "\<line-break\>"
 syn match cssTextProp contained "\<overflow-wrap\>"
 syn match cssTextProp contained "\<tab-size\>"
-syn keyword cssTextAttr contained manual loose strict hanging
+syn match cssTextProp contained "\<text-align-all\>"
+syn keyword cssTextAttr contained manual loose strict hanging anywhere
 syn match cssTextAttr contained "\<match-parent\>"
 syn match cssTextAttr contained "\<each-line\>"
 syn match cssTextAttr contained "\<full-width\>"

after/syntax/css/css3-multicol.vim

@@ -1,5 +0,0 @@
-" TODO: create cssMulticolProp group and cssMulticolAttr group
-syn keyword cssFontProp contained columns
-syn match cssFontProp contained "\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
-syn keyword cssFontAttr contained balance
-syn match cssFontAttr contained "\<\(avoid-\)\=column\>"

after/syntax/css/html5.vim

@@ -1 +1 @@
-syn keyword cssTagName picture rb rtc template
+syn keyword cssTagName picture rb rtc slot template

after/syntax/css/motion-1.vim

@@ -1,2 +1,2 @@
-syn match cssFontProp contained "\<motion\(-\(path\|offset\|rotation\)\)\=\>"
-syn region cssFunction contained matchgroup=cssFunctionName start="\<path\s*(" end=")" oneline keepend
+syn match cssFontProp contained "\<offset\(-\(path\|distance\|anchor\|rotate\)\)\=\>"
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(ray\|path\)\s*(" end=")" oneline keepend

after/syntax/css/webvtt1.vim

@@ -0,0 +1,2 @@
+syn match cssPseudoClassId contained "::\<cue\(-region\)\=\>"
+syn region cssPseudoClassLang matchgroup=cssPseudoClassId start="::cue\(-region\)\=(" end=")" oneline

after/syntax/html.vim

@@ -1,77 +0,0 @@
-syn include @htmlCss syntax/css/compositing-1.vim
-syn include @htmlCss syntax/css/css-align-3.vim
-syn include @htmlCss syntax/css/css-backgrounds-4.vim
-syn include @htmlCss syntax/css/css-break-3.vim
-syn include @htmlCss syntax/css/css-cascade-3.vim
-syn include @htmlCss syntax/css/css-cascade-4.vim
-syn include @htmlCss syntax/css/css-color-4.vim
-syn include @htmlCss syntax/css/css-contain-1.vim
-syn include @htmlCss syntax/css/css-content-3.vim
-syn include @htmlCss syntax/css/css-counter-styles-3.vim
-syn include @htmlCss syntax/css/css-device-adapt-1.vim
-syn include @htmlCss syntax/css/css-display-3.vim
-syn include @htmlCss syntax/css/css-flexbox-1.vim
-syn include @htmlCss syntax/css/css-font-loading-3.vim
-syn include @htmlCss syntax/css/css-fonts-3.vim
-syn include @htmlCss syntax/css/css-fonts-4.vim
-syn include @htmlCss syntax/css/css-gcpm-3.vim
-syn include @htmlCss syntax/css/css-grid-1.vim
-syn include @htmlCss syntax/css/css-images-4.vim
-syn include @htmlCss syntax/css/css-inline-3.vim
-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-page-floats-3.vim
-syn include @htmlCss syntax/css/css-paint-api-1.vim
-syn include @htmlCss syntax/css/css-position-3.vim
-syn include @htmlCss syntax/css/css-properties-values-api-1.vim
-syn include @htmlCss syntax/css/css-pseudo-4.vim
-syn include @htmlCss syntax/css/css-regions-1.vim
-syn include @htmlCss syntax/css/css-rhythm-1.vim
-syn include @htmlCss syntax/css/css-round-display-1.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-scroll-snap-1.vim
-syn include @htmlCss syntax/css/css-shapes-1.vim
-syn include @htmlCss syntax/css/css-sizing-3.vim
-syn include @htmlCss syntax/css/css-style-attr.vim
-syn include @htmlCss syntax/css/css-syntax-3.vim
-syn include @htmlCss syntax/css/css-text-3.vim
-syn include @htmlCss syntax/css/css-text-4.vim
-syn include @htmlCss syntax/css/css-text-decor-3.vim
-syn include @htmlCss syntax/css/css-timing-1.vim
-syn include @htmlCss syntax/css/css-transforms-1.vim
-syn include @htmlCss syntax/css/css-typed-om-1.vim
-syn include @htmlCss syntax/css/css-ui-3.vim
-syn include @htmlCss syntax/css/css-ui-4.vim
-syn include @htmlCss syntax/css/css-values-3.vim
-syn include @htmlCss syntax/css/css-variables-1.vim
-syn include @htmlCss syntax/css/css-will-change-1.vim
-syn include @htmlCss syntax/css/css-writing-modes-3.vim
-syn include @htmlCss syntax/css/css3-animations.vim
-syn include @htmlCss syntax/css/css3-background.vim
-syn include @htmlCss syntax/css/css3-box.vim
-syn include @htmlCss syntax/css/css3-color.vim
-syn include @htmlCss syntax/css/css3-conditional.vim
-syn include @htmlCss syntax/css/css3-exclusions.vim
-syn include @htmlCss syntax/css/css3-images.vim
-syn include @htmlCss syntax/css/css3-multicol.vim
-syn include @htmlCss syntax/css/css3-namespace.vim
-syn include @htmlCss syntax/css/css3-page.vim
-syn include @htmlCss syntax/css/css3-speech.vim
-syn include @htmlCss syntax/css/css3-transitions.vim
-syn include @htmlCss syntax/css/cssom-1.vim
-syn include @htmlCss syntax/css/cssom-view-1.vim
-syn include @htmlCss syntax/css/fill-stroke-3.vim
-syn include @htmlCss syntax/css/filter-effects-1.vim
-syn include @htmlCss syntax/css/geometry-1.vim
-syn include @htmlCss syntax/css/html5.vim
-syn include @htmlCss syntax/css/motion-1.vim
-syn include @htmlCss syntax/css/pointerevents.vim
-syn include @htmlCss syntax/css/selectors-nonelement-1.vim
-syn include @htmlCss syntax/css/selectors.vim
-syn include @htmlCss syntax/css/selectors4.vim
-syn include @htmlCss syntax/css/svg2.vim
-syn include @htmlCss syntax/css/web-animations-1.vim
-syn include @htmlCss syntax/css/worklets-1.vim

after/syntax/scss.vim

@@ -1 +0,0 @@
-runtime! syntax/css/*.vim

test/test.css

@@ -8,7 +8,12 @@
   place-self: space-around;
   place-content: space-between;
   place-items: space-evenly;
-  display: legacy;
+  row-gap: legacy;
+  column-gap: auto;
+  gap: auto;
+  grid-column-gap: auto;
+  grid-row-gap: auto;
+  grid-gap: auto;
 }
 
 .animations {
@@ -23,7 +28,7 @@
   animation-timing-function: auto;
 }
 
-.background {
+.backgrounds-3 {
   background-clip: space;
   background-origin: round;
   background-size: local;
@@ -71,7 +76,7 @@
 }
 
 .break-3 {
-  break-after: auto;
+  break-after: avoid-column;
   break-before: auto;
   break-inside: auto;
   box-decoration-break: auto;
@@ -214,7 +219,6 @@
   display: flow;
   display: flow-root;
   display: contents;
-  display: inline-list-item;
   display: discard;
 }
 
@@ -285,6 +289,9 @@
   display: auto;
 }
 
+.fonts-4 {
+}
+
 .fonts-3 {
   font-feature-settings: common-ligatures;
   font-kerning: no-common-ligatures;
@@ -324,10 +331,20 @@
 }
 
 .fonts-4 {
-  font-optical-sizing: emoji;
-  font-variation-settings: math;
-  display: fangsong;
-  display: system-ui;
+  font-min-size: emoji;
+  font-max-size: math;
+  font-display: fangsong;
+  font-optical-sizing: system-ui;
+  font-variation-settings: infinity;
+  font-palette: swap;
+  font-presentation: fallback;
+  display: optional;
+  display: light;
+  display: dark;
+}
+
+@font-palette-values Test {
+  base-palette: 1;
 }
 
 .gcpm-3::footnote-call,
@@ -351,16 +368,13 @@
   grid-auto-columns: 0.2fr;
   grid-auto-flow: dense;
   grid: auto-flow;
-  grid-row-start: subgrid;
-  grid-column-start: span;
+  grid-row-start: span;
+  grid-column-start: auto;
   grid-row-end: auto;
   grid-column-end: auto;
   grid-column: auto;
   grid-row: auto;
   grid-area: auto;
-  grid-column-gap: auto;
-  grid-row-gap: auto;
-  grid-gap: auto;
 }
 
 .images-3 {
@@ -402,6 +416,60 @@
   display: auto;
 }
 
+.logical-1 {
+  block-size: logical;
+  inline-size: physical;
+  min-block-size: rotate;
+  min-inline-size: auto;
+  max-block-size: auto;
+  max-inline-size: auto;
+  margin-block-start: auto;
+  margin-block-end: auto;
+  margin-inline-start: auto;
+  margin-inline-end: auto;
+  margin-block: auto;
+  margin-inline: auto;
+  inset-block-start: auto;
+  inset-block-end: auto;
+  inset-inline-start: auto;
+  inset-inline-end: auto;
+  inset-block: auto;
+  inset-inline: auto;
+  inset: auto;
+  padding-block-start: auto;
+  padding-block-end: auto;
+  padding-inline-start: auto;
+  padding-inline-end: auto;
+  padding-block: auto;
+  padding-inline: auto;
+  border-block-start-width: auto;
+  border-block-end-width: auto;
+  border-inline-start-width: auto;
+  border-inline-end-width: auto;
+  border-block-width: auto;
+  border-inline-width: auto;
+  border-block-start-style: auto;
+  border-block-end-style: auto;
+  border-inline-start-style: auto;
+  border-inline-end-style: auto;
+  border-block-style: auto;
+  border-inline-style: auto;
+  border-block-start-color: auto;
+  border-block-end-color: auto;
+  border-inline-start-color: auto;
+  border-inline-end-color: auto;
+  border-block-color: auto;
+  border-inline-color: auto;
+  border-block-start: auto;
+  border-block-end: auto;
+  border-inline-start: auto;
+  border-inline-end: auto;
+  border-block: auto;
+  border-inline: auto;
+  background-image-transform: auto;
+  border-image-transform: auto;
+}
+
 .masking-1 {
   clip-path: fill-box;
   clip-rule: stroke-box;
@@ -425,17 +493,17 @@
 }
 
 .motion-1 {
-  motion-path: path(M 100 100 L 300 100 L 200 300 z);
-  motion-offset: auto;
-  motion-rotation: auto;
-  motion: auto;
+  offset-path: ray(45deg closest-side);
+  offset-distance: path(M 100 100 L 300 100 L 200 300 z);
+  offset-anchor: auto;
+  offset-rotate: auto;
+  offset: auto;
 }
 
-.multicol {
+.multicol-1 {
   columns: column;
   column-count: balance;
-  column-fill: avoid-column;
-  column-gap: auto;
+  column-fill: balance-all;
   column-rule: auto;
   column-rule-color: auto;
   column-rule-style: auto;
@@ -450,6 +518,14 @@
   max-lines: auto;
 }
 
+.overflow-4::nth-fragment(1) {
+  scrollbar-gutter: stable;
+  continue: force;
+  display: overflow;
+  display: paginate;
+  display: fragments;
+}
+
 .page {
   display: avoid-page;
   display: page;
@@ -671,9 +747,10 @@
   line-break: loose;
   overflow-wrap: strict;
   tab-size: match-parent;
-  display: hanging;
+  text-align-all: hanging;
   display: each-line;
   display: full-width;
+  display: anywhere;
 }
 
 .text-4 {
@@ -794,6 +871,13 @@
   display: auto;
 }
 
+.webvtt1::cue,
+.webvtt1::cue-region,
+.webvtt1::cue(#cue1),
+.webvtt1::cue-region(#scroll), {
+  display: auto;
+}
+
 .will-change-1 {
   will-change: scroll-position;
 }
@@ -818,6 +902,7 @@
 picture,
 rb,
 rtc,
+slot,
 template {
   display: auto;
 }