Version 0.24.5

Follow changes in WD-css-multicol-1-20171005
This module renamed from `css3-multicol` to `css-multicol-1`. See also: http://www.w3.org/TR/2017/WD-css-multicol-1-20171005/
2025-12-07 11:14:25 +08:00 · 2017-10-06 08:46:21 +09:00 · 2017-10-06 08:44:15 +09:00 · 2017-09-07 19:03:38 +09:00 · 2017-09-07 19:00:53 +09:00 · 2017-08-24 22:20:21 +09:00
8 changed files with 24 additions and 23 deletions
--- a/after/syntax/css/css-align-3.vim
+++ b/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\)\>"
--- a/after/syntax/css/css-break-3.vim
+++ b/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\>"
--- a/after/syntax/css/css-grid-1.vim
+++ b/after/syntax/css/css-grid-1.vim
@@ -2,7 +2,6 @@ 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 dense span
 syn match cssFontAttr contained "\<inline-grid\>"
 syn match cssFontAttr contained "\<auto-flow\>"
--- a/after/syntax/css/css-multicol-1.vim
+++ b/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\)\=\>"
--- a/after/syntax/css/css3-multicol.vim
+++ b/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\>"
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -22,6 +22,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-logical-1.vim
 syn include @htmlCss syntax/css/css-masking-1.vim
+syn include @htmlCss syntax/css/css-multicol-1.vim
 syn include @htmlCss syntax/css/css-overflow-3.vim
 syn include @htmlCss syntax/css/css-overflow-4.vim
 syn include @htmlCss syntax/css/css-page-floats-3.vim
@@ -58,7 +59,6 @@ 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
--- a/test/test.css
+++ b/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 {
@@ -71,7 +76,7 @@
 }

 .break-3 {
-  break-after: auto;
+  break-after: avoid-column;
  break-before: auto;
  break-inside: auto;
  box-decoration-break: auto;
@@ -370,9 +375,6 @@
  grid-column: auto;
  grid-row: auto;
  grid-area: auto;
-  grid-column-gap: auto;
-  grid-row-gap: auto;
-  grid-gap: auto;
 }

 .images-3 {
@@ -498,11 +500,10 @@
  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;
--- a/test/test.html
+++ b/test/test.html
@@ -18,7 +18,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;
 }
 </style>
 <style>
@@ -86,7 +91,7 @@
 </style>
 <style>
 .break-3 {
-  break-after: auto;
+  break-after: avoid-column;
  break-before: auto;
  break-inside: auto;
  box-decoration-break: auto;
@@ -404,9 +409,6 @@
  grid-column: auto;
  grid-row: auto;
  grid-area: auto;
-  grid-column-gap: auto;
-  grid-row-gap: auto;
-  grid-gap: auto;
 }
 </style>
 <style>
@@ -541,11 +543,10 @@
 }
 </style>
 <style>
-.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;
Author	SHA1	Message	Date
Kyo Nagashima	5b1d5676eb	Version 0.24.5	2017-10-06 08:46:21 +09:00
Kyo Nagashima	edf5147e1b	Follow changes in WD-css-multicol-1-20171005 This module renamed from `css3-multicol` to `css-multicol-1`. See also: http://www.w3.org/TR/2017/WD-css-multicol-1-20171005/	2017-10-06 08:44:15 +09:00
Kyo Nagashima	a552f6b7b2	Version 0.24.4	2017-09-07 19:03:38 +09:00
Kyo Nagashima	c08702b2de	Follow changes in WD-css-align-3-20170906 This changes generalize gap specific properties for flexbox, grid, and multicol. So, move these. See also: http://www.w3.org/TR/2017/WD-css-align-3-20170906/	2017-09-07 19:00:53 +09:00
Kyo Nagashima	ed97cb7111	Follow changes in CR-css-scroll-snap-1-20170824 No changes, see also: http://www.w3.org/TR/2017/CR-css-scroll-snap-1-20170824/	2017-08-24 22:20:21 +09:00