branch: externals/colorful-mode
commit d9147b83b8401917026a23f213480565d13bbc3f
Author: Elías Gabriel Pérez <eg642...@gmail.com>
Commit: Elías Gabriel Pérez <eg642...@gmail.com>
Fix '@define_color' definition.
* README.org (Features ✨): Add in supported colors that @define_color
is only available in CSS gtk files.
* colorful-mode.el (colorful--hex-to-name): Fallback to
'colorful-html-colors-alist' if hex color name was not found in
'color-name-rgb-alist'.
(colorful--colorize): Add '@define-color' to css color variables.
---
README.org | 2 +-
colorful-mode.el | 22 +++++++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/README.org b/README.org
index 47a8ae6048..9e0477a694 100644
--- a/README.org
+++ b/README.org
@@ -34,7 +34,7 @@ in real time and in a user friendly way based/inspired on
🌈[[https://elpa.gnu
- hsl/hsla
- oklab/oklch
- user-defined colors variables:
- - @define_color
+ - gtk @define-color
- var()
- LaTeX colors (gray, rbg, RGB, HTML)
- Convert current color at point or in region to other formats
diff --git a/colorful-mode.el b/colorful-mode.el
index beca1e66ad..c360cfef26 100644
--- a/colorful-mode.el
+++ b/colorful-mode.el
@@ -386,7 +386,8 @@ H must be a float not divided."
(defun colorful--hex-to-name (hex)
"Return HEX as color name."
- (car (rassoc (color-values-from-color-spec hex) color-name-rgb-alist)))
+ (car (or (rassoc (color-values-from-color-spec hex) color-name-rgb-alist)
+ (rassoc hex colorful-html-colors-alist))))
(defun colorful--name-to-hex (name)
"Return color NAME as hex color format."
@@ -686,20 +687,23 @@ BEG and END are color match positions."
('css-color-variable
(cond
((and (string= match-1 "@")
- (not (string= match-2 "define_color")))
+ (or (not (member match-2 '("define_color" "define-color")))))
(setq color
(colorful--get-css-variable-color
- (rx (seq "@define_color"
- (one-or-more space)
- (literal match-2)
- (one-or-more space)
- (group (opt "#") (one-or-more alphanumeric))))
+ (rx-to-string
+ `(seq (or "@define_color"
+ "@define-color")
+ (one-or-more space)
+ ,match-2
+ (one-or-more space)
+ (group (opt "#") (one-or-more alphanumeric))))
beg)))
((string= match-1 "var")
(setq color
(colorful--get-css-variable-color
- (rx (seq (literal match-2) ":" (zero-or-more space)
- (group (opt "#") (one-or-more alphanumeric))))
+ (rx-to-string
+ `(seq ,match-2 ":" (zero-or-more space)
+ (group (opt "#") (one-or-more alphanumeric))))
beg))))))
;; Ensure that COLOR is a valid color
