From 02220c174eee5a98de756b899a93381021c1c858 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Simen=20Heggest=C3=B8yl?= <simenheg@gmail.com>
Date: Thu, 13 Apr 2017 18:54:19 +0200
Subject: [PATCH] Add grid layout module to CSS property list

* lisp/textmodes/css-mode.el (css-property-alist)
(css-value-class-alist): Add new properties and value classes from CSS
Grid Layout Module.
---
 lisp/textmodes/css-mode.el | 47 +++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index b1feca7ca6b..2088ea0a1e6 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -123,7 +123,10 @@
      "table-column" "table-cell" "table-caption" "none"
      ;; CSS Flexible Box Layout Module Level 1
      ;; (https://www.w3.org/TR/css3-flexbox/#valdef-display-flex)
-     "flex" "inline-flex")
+     "flex" "inline-flex"
+     ;; CSS Grid Layout Module Level 1
+     ;; (https://www.w3.org/TR/css-grid-1/#grid-containers)
+     "grid" "inline-grid" "subgrid")
     ("elevation" angle "below" "level" "above" "higher" "lower")
     ("empty-cells" "show" "hide")
     ("float" "left" "right" "none")
@@ -272,6 +275,29 @@
     ("color" color)
     ("opacity" alphavalue)
 
+    ;; CSS Grid Layout Module Level 1
+    ;; (https://www.w3.org/TR/css-grid-1/#property-index)
+    ("grid" grid-template grid-template-rows "auto-flow" "dense"
+     grid-auto-columns grid-auto-rows grid-template-columns)
+    ("grid-area" grid-line)
+    ("grid-auto-columns" track-size)
+    ("grid-auto-flow" "row" "column" "dense")
+    ("grid-auto-rows" track-size)
+    ("grid-column" grid-line)
+    ("grid-column-end" grid-line)
+    ("grid-column-gap" length-percentage)
+    ("grid-column-start" grid-line)
+    ("grid-gap" grid-row-gap grid-column-gap)
+    ("grid-row" grid-line)
+    ("grid-row-end" grid-line)
+    ("grid-row-gap" length-percentage)
+    ("grid-row-start" grid-line)
+    ("grid-template" "none" grid-template-rows grid-template-columns
+     line-names string track-size line-names explicit-track-list)
+    ("grid-template-areas" "none" string)
+    ("grid-template-columns" "none" track-list auto-track-list)
+    ("grid-template-rows" "none" track-list auto-track-list)
+
     ;; CSS Flexible Box Layout Module Level 1
     ;; (http://www.w3.org/TR/css-flexbox-1/#property-index)
     ("align-content" "flex-start" "flex-end" "center" "space-between"
@@ -469,6 +495,8 @@ further value candidates, since that list would be infinite.")
     (angle "calc()")
     (animateable-feature "scroll-position" "contents" custom-ident)
     (attachment "scroll" "fixed" "local")
+    (auto-repeat "repeat()")
+    (auto-track-list line-names fixed-size fixed-repeat auto-repeat)
     (bg-image image "none")
     (bg-layer bg-image position repeat-style attachment box)
     (bg-size length percentage "auto" "cover" "contain")
@@ -484,6 +512,7 @@ further value candidates, since that list would be infinite.")
     (east-asian-variant-values
      "jis78" "jis83" "jis90" "jis04" "simplified" "traditional")
     (east-asian-width-values "full-width" "proportional-width")
+    (explicit-track-list line-names track-size)
     (family-name "Courier" "Helvetica" "Times")
     (feature-tag-value string integer "on" "off")
     (filter-function
@@ -493,6 +522,9 @@ further value candidates, since that list would be infinite.")
     (filter-function-list filter-function uri)
     (final-bg-layer
      bg-image position repeat-style attachment box color)
+    (fixed-breadth length-percentage)
+    (fixed-repeat "repeat()")
+    (fixed-size fixed-breadth "minmax()")
     (font-variant-css21 "normal" "small-caps")
     (frequency "calc()")
     (generic-family
@@ -501,13 +533,17 @@ further value candidates, since that list would be infinite.")
     (gradient
      linear-gradient radial-gradient repeating-linear-gradient
      repeating-radial-gradient)
+    (grid-line "auto" custom-ident integer "span")
     (historical-lig-values
      "historical-ligatures" "no-historical-ligatures")
     (image uri image-list element-reference gradient)
     (image-list "image()")
+    (inflexible-breadth length-percentage "min-content" "max-content"
+                        "auto")
     (integer "calc()")
     (length "calc()" number)
     (line-height "normal" number length percentage)
+    (line-names custom-ident)
     (line-style
      "none" "hidden" "dotted" "dashed" "solid" "double" "groove"
      "ridge" "inset" "outset")
@@ -576,6 +612,11 @@ further value candidates, since that list would be infinite.")
     (specific-voice identifier)
     (target-name string)
     (time "calc()")
+    (track-breadth length-percentage flex "min-content" "max-content"
+                   "auto")
+    (track-list line-names track-size track-repeat)
+    (track-repeat "repeat()")
+    (track-size track-breadth "minmax()" "fit-content()")
     (transform-list
      "matrix()" "translate()" "translateX()" "translateY()" "scale()"
      "scaleX()" "scaleY()" "rotate()" "skew()" "skewX()" "skewY()"
@@ -594,8 +635,8 @@ other entries in this list, not to properties.
 
 The following classes have been left out above because they
 cannot be completed sensibly: `custom-ident',
-`element-reference', `id', `identifier', `percentage', and
-`string'.")
+`element-reference', `flex', `id', `identifier',
+`length-percentage', `percentage', and `string'.")
 
 (defcustom css-electric-keys '(?\} ?\;) ;; '()
   "Self inserting keys which should trigger re-indentation."
-- 
2.39.2