1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

Update CSS property list

* textmodes/css-mode.el (css-extract-keyword-list): Remove function in
favor of manual extraction.
(css-extract-parse-val-grammar): Remove function in favor of
manual extraction.
(css-extract-props-and-vals): Remove function in favor of manual
extraction.
(css-at-ids): Update list of CSS at-rule ids.
(css-property-ids): Update list of CSS properties.
This commit is contained in:
Simen Heggestøyl 2015-03-17 23:11:55 +01:00
parent 62fde9ee0f
commit 7ec63a3afa
2 changed files with 105 additions and 113 deletions

View File

@ -13,6 +13,14 @@
(css-completion-at-point): New function providing completion for
`css-mode'.
(css-mode): Add support for completion.
(css-extract-keyword-list): Remove function in favor of manual
extraction.
(css-extract-parse-val-grammar): Remove function in favor of
manual extraction.
(css-extract-props-and-vals): Remove function in favor of manual
extraction.
(css-at-ids): Update list of CSS at-rule ids.
(css-property-ids): Update list of CSS properties.
2015-03-17 Bozhidar Batsov <bozhidar@batsov.com>

View File

@ -38,89 +38,6 @@
"Cascading Style Sheets (CSS) editing mode."
:group 'languages)
(defun css-extract-keyword-list (res)
(with-temp-buffer
(url-insert-file-contents "http://www.w3.org/TR/REC-CSS2/css2.txt")
(goto-char (point-max))
(search-backward "Appendix H. Index")
(forward-line)
(delete-region (point-min) (point))
(let ((result nil)
keys)
(dolist (re res)
(goto-char (point-min))
(setq keys nil)
(while (re-search-forward (cdr re) nil t)
(push (match-string 1) keys))
(push (cons (car re) (sort keys 'string-lessp)) result))
(nreverse result))))
(defun css-extract-parse-val-grammar (string env)
(let ((start 0)
(elems ())
name)
(while (string-match
(concat "\\(?:"
(concat "<a [^>]+><span [^>]+>\\(?:"
"&lt;\\([^&]+\\)&gt;\\|'\\([^']+\\)'"
"\\)</span></a>")
"\\|" "\\(\\[\\)"
"\\|" "\\(]\\)"
"\\|" "\\(||\\)"
"\\|" "\\(|\\)"
"\\|" "\\([*+?]\\)"
"\\|" "\\({[^}]+}\\)"
"\\|" "\\(\\w+\\(?:-\\w+\\)*\\)"
"\\)[ \t\n]*")
string start)
;; (assert (eq start (match-beginning 0)))
(setq start (match-end 0))
(cond
;; Reference to a type of value.
((setq name (match-string-no-properties 1 string))
(push (intern name) elems))
;; Reference to another property's values.
((setq name (match-string-no-properties 2 string))
(setq elems (delete-dups (append (cdr (assoc name env)) elems))))
;; A literal
((setq name (match-string-no-properties 9 string))
(push name elems))
;; We just ignore the rest. I.e. we ignore the structure because
;; it's too difficult to exploit anyway (it would allow us to only
;; complete top/center/bottom after one of left/center/right and
;; vice-versa).
(t nil)))
elems))
(defun css-extract-props-and-vals ()
(with-temp-buffer
(url-insert-file-contents "http://www.w3.org/TR/CSS21/propidx.html")
(goto-char (point-min))
(let ((props ()))
(while (re-search-forward "#propdef-\\([^\"]+\\)\"><span class=\"propinst-\\1 xref\">'\\1'</span></a>" nil t)
(let ((prop (match-string-no-properties 1)))
(save-excursion
(goto-char (match-end 0))
(search-forward "<td>")
(let ((vals-string (buffer-substring (point)
(progn
(re-search-forward "[ \t\n]+|[ \t\n]+<a href=\"cascade.html#value-def-inherit\" class=\"noxref\"><span class=\"value-inst-inherit\">inherit</span></a>")
(match-beginning 0)))))
;;
(push (cons prop (css-extract-parse-val-grammar vals-string props))
props)))))
props)))
;; Extraction was done with:
;; (css-extract-keyword-list
;; '((pseudo . "^ +\\* :\\([^ \n,]+\\)")
;; (at . "^ +\\* @\\([^ \n,]+\\)")
;; (descriptor . "^ +\\* '\\([^ '\n]+\\)' (descriptor)")
;; (media . "^ +\\* '\\([^ '\n]+\\)' media group")
;; (property . "^ +\\* '\\([^ '\n]+\\)',")))
(defconst css-pseudo-class-ids
'("active" "checked" "disabled" "empty" "enabled" "first"
"first-child" "first-of-type" "focus" "hover" "indeterminate" "lang"
@ -134,7 +51,7 @@
"Identifiers for pseudo-elements.")
(defconst css-at-ids
'("charset" "font-face" "import" "media" "page")
'("charset" "font-face" "import" "media" "namespace" "page")
"Identifiers that appear in the form @foo.")
(defconst css-descriptor-ids
@ -150,36 +67,103 @@
"Identifiers for types of media.")
(defconst css-property-ids
'("azimuth" "background" "background-attachment" "background-color"
"background-image" "background-position" "background-repeat" "block"
"border" "border-bottom" "border-bottom-color" "border-bottom-style"
"border-bottom-width" "border-collapse" "border-color" "border-left"
"border-left-color" "border-left-style" "border-left-width" "border-right"
'(;; CSS 2.1 properties (http://www.w3.org/TR/CSS21/propidx.html).
;;
;; Properties duplicated by any of the CSS3 modules below have
;; been removed.
"azimuth" "border-collapse" "border-spacing" "bottom"
"caption-side" "clear" "clip" "content" "counter-increment"
"counter-reset" "cue" "cue-after" "cue-before" "direction" "display"
"elevation" "empty-cells" "float" "height" "left" "line-height"
"list-style" "list-style-image" "list-style-position"
"list-style-type" "margin" "margin-bottom" "margin-left"
"margin-right" "margin-top" "max-height" "max-width" "min-height"
"min-width" "orphans" "overflow" "padding" "padding-bottom"
"padding-left" "padding-right" "padding-top" "page-break-after"
"page-break-before" "page-break-inside" "pause" "pause-after"
"pause-before" "pitch" "pitch-range" "play-during" "position"
"quotes" "richness" "right" "speak" "speak-header" "speak-numeral"
"speak-punctuation" "speech-rate" "stress" "table-layout" "top"
"unicode-bidi" "vertical-align" "visibility" "voice-family" "volume"
"widows" "width" "z-index"
;; CSS Animations
;; (http://www.w3.org/TR/css3-animations/#property-index)
"animation" "animation-delay" "animation-direction"
"animation-duration" "animation-fill-mode"
"animation-iteration-count" "animation-name"
"animation-play-state" "animation-timing-function"
;; CSS Backgrounds and Borders Module Level 3
;; (http://www.w3.org/TR/css3-background/#property-index)
"background" "background-attachment" "background-clip"
"background-color" "background-image" "background-origin"
"background-position" "background-repeat" "background-size"
"border" "border-bottom" "border-bottom-color"
"border-bottom-left-radius" "border-bottom-right-radius"
"border-bottom-style" "border-bottom-width" "border-color"
"border-image" "border-image-outset" "border-image-repeat"
"border-image-slice" "border-image-source" "border-image-width"
"border-left" "border-left-color" "border-left-style"
"border-left-width" "border-radius" "border-right"
"border-right-color" "border-right-style" "border-right-width"
"border-spacing" "border-style" "border-top" "border-top-color"
"border-top-style" "border-top-width" "border-width" "bottom"
"caption-side" "clear" "clip" "color" "compact" "content"
"counter-increment" "counter-reset" "cue" "cue-after" "cue-before"
"cursor" "dashed" "direction" "display" "dotted" "double" "elevation"
"empty-cells" "float" "font" "font-family" "font-size" "font-size-adjust"
"font-stretch" "font-style" "font-variant" "font-weight" "groove" "height"
"hidden" "inline" "inline-table" "inset" "left" "letter-spacing"
"line-height" "list-item" "list-style" "list-style-image"
"list-style-position" "list-style-type" "margin" "margin-bottom"
"margin-left" "margin-right" "margin-top" "marker-offset" "marks"
"max-height" "max-width" "min-height" "min-width" "orphans" "outline"
"outline-color" "outline-style" "outline-width" "outset" "overflow"
"padding" "padding-bottom" "padding-left" "padding-right" "padding-top"
"page" "page-break-after" "page-break-before" "page-break-inside" "pause"
"pause-after" "pause-before" "pitch" "pitch-range" "play-during" "position"
"quotes" "richness" "ridge" "right" "run-in" "size" "solid" "speak"
"speak-header" "speak-numeral" "speak-punctuation" "speech-rate" "stress"
"table" "table-caption" "table-cell" "table-column" "table-column-group"
"table-footer-group" "table-header-group" "table-layout" "table-row"
"table-row-group" "text-align" "text-decoration" "text-indent"
"text-shadow" "text-transform" "top" "unicode-bidi" "vertical-align"
"visibility" "voice-family" "volume" "white-space" "widows" "width"
"word-spacing" "z-index")
"border-style" "border-top" "border-top-color"
"border-top-left-radius" "border-top-right-radius"
"border-top-style" "border-top-width" "border-width" "box-shadow"
;; CSS Basic User Interface Module Level 3 (CSS3 UI)
;; (http://www.w3.org/TR/css3-ui/#property-index)
"box-sizing" "caret-color" "cursor" "nav-down" "nav-left"
"nav-right" "nav-up" "outline" "outline-color" "outline-offset"
"outline-style" "outline-width" "resize" "text-overflow"
;; CSS Color Module Level 3
;; (http://www.w3.org/TR/css3-color/#property)
"color" "opacity"
;; CSS Flexible Box Layout Module Level 1
;; (http://www.w3.org/TR/css-flexbox-1/#property-index)
"align-content" "align-items" "align-self" "flex" "flex-basis"
"flex-direction" "flex-flow" "flex-grow" "flex-shrink" "flex-wrap"
"justify-content" "order"
;; CSS Fonts Module Level 3
;; (http://www.w3.org/TR/css3-fonts/#property-index)
"font" "font-family" "font-feature-settings" "font-kerning"
"font-language-override" "font-size" "font-size-adjust"
"font-stretch" "font-style" "font-synthesis" "font-variant"
"font-variant-alternates" "font-variant-caps"
"font-variant-east-asian" "font-variant-ligatures"
"font-variant-numeric" "font-variant-position" "font-weight"
;; CSS Text Decoration Module Level 3
;; (http://dev.w3.org/csswg/css-text-decor-3/#property-index)
"text-decoration" "text-decoration-color" "text-decoration-line"
"text-decoration-skip" "text-decoration-style" "text-emphasis"
"text-emphasis-color" "text-emphasis-position" "text-emphasis-style"
"text-shadow" "text-underline-position"
;; CSS Text Module Level 3
;; (http://www.w3.org/TR/css3-text/#property-index)
"hanging-punctuation" "hyphens" "letter-spacing" "line-break"
"overflow-wrap" "tab-size" "text-align" "text-align-last"
"text-indent" "text-justify" "text-transform" "white-space"
"word-break" "word-spacing" "word-wrap"
;; CSS Transforms Module Level 1
;; (http://www.w3.org/TR/css3-2d-transforms/#property-index)
"backface-visibility" "perspective" "perspective-origin"
"transform" "transform-origin" "transform-style"
;; CSS Transitions
;; (http://www.w3.org/TR/css3-transitions/#property-index)
"transition" "transition-delay" "transition-duration"
"transition-property" "transition-timing-function"
;; Filter Effects Module Level 1
;; (http://www.w3.org/TR/filter-effects/#property-index)
"color-interpolation-filters" "filter" "flood-color"
"flood-opacity" "lighting-color")
"Identifiers for properties.")
(defcustom css-electric-keys '(?\} ?\;) ;; '()