branch: externals/colorful-mode
commit 3ddd2286fddaaba48eefc7ce873c8a777984376a
Author: Elías Gabriel Pérez <eg642...@gmail.com>
Commit: Elías Gabriel Pérez <eg642...@gmail.com>
Change compat required version to 30.1.0.0
compat 30.1.0.0 adds support for oklab color functions that were only
available in emacs > 30.1.
* colorful-mode.el (colorful--oklab-to-hex): Remove now redundant
code.
---
colorful-mode.el | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/colorful-mode.el b/colorful-mode.el
index 9dd6cf2ca4..eac1f40eb2 100644
--- a/colorful-mode.el
+++ b/colorful-mode.el
@@ -6,7 +6,7 @@
;; Maintainer: Shen, Jen-Chieh <jcs090...@gmail.com>
;; Elias G. Perez <eg642...@gmail.com>
;; Created: 2024-04-10
-;; Package-Requires: ((emacs "28.1") (compat "30"))
+;; Package-Requires: ((emacs "28.1") (compat "30.1.0.0"))
;; Homepage: https://github.com/DevelopmentCool2449/colorful-mode
;; Keywords: faces, tools, matching, convenience
;; Version: 1.2.3
@@ -363,18 +363,8 @@ The conversion is controlled by
`colorful-short-hex-conversions'. If
(defun colorful--oklab-to-hex (l a b)
"Convert OKLab color (L, A, B) to HEX format.
L, A and B must be floats divided by 100."
- (if-let* (((functionp 'color-oklab-to-srgb))
- (rgb (mapcar #'color-clamp (color-oklab-to-srgb l a b))))
- (apply #'color-rgb-to-hex rgb)
- (let* ((ll (expt (+ (* 1.0 l) (* 0.39633779 a) (* 0.21580376 b)) 3))
- (mm (expt (+ (* 1.00000001 l) (* -0.10556134 a) (* -0.06385417 b))
3))
- (ss (expt (+ (* 1.00000005 l) (* -0.08948418 a) (* -1.29148554 b))
3))
- (x (+ (* ll 1.22701385) (* mm -0.55779998) (* ss 0.28125615)))
- (y (+ (* ll -0.04058018) (* mm 1.11225687) (* ss -0.07167668)))
- (z (+ (* ll -0.07638128) (* mm -0.42148198) (* ss 1.58616322)))
- (srgb (color-xyz-to-srgb x y z))
- (rgb (mapcar #'color-clamp srgb)))
- (apply #'color-rgb-to-hex rgb))))
+ (let ((rgb (mapcar #'color-clamp (color-oklab-to-srgb l a b))))
+ (apply #'color-rgb-to-hex rgb)))
(defun colorful--oklch-to-hex (l c h)
"Convert OKLCH color (L, C, H) to HEX format.
