fiddlerwoaroof/dotfiles - Change RKYRGWWIIERC4W4TS4NVYTBPPL53U66JKZPHNEGYATGAPYXQ3JZQC

feat: add alternate color list

Created by Edward Langley on March 7, 2025

RKYRGWWIIERC4W4TS4NVYTBPPL53U66JKZPHNEGYATGAPYXQ3JZQC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

Insertion in tools/zenburn.lisp at line 40 [6.84]

[5.883]


(defun mv-compose (a b)
  (lambda (&rest args)
    (declare (dynamic-extent args))
    (multiple-value-call a (apply b args))))

Insertion in tools/zenburn.lisp at line 100 [6.84]

[5.3381]

[6.343]

(defun set-L-oklab (L r g b)
  (multiple-value-list
   (multiple-value-bind (_ a b)
       (multiple-value-call #'xyz-to-oklab
         (dufy:qrgb-to-xyz r g b))
     (declare (ignore _))
     (multiple-value-call #'dufy:xyz-to-qrgb
       (oklab-to-xyz L a b)))))

Replacement in tools/zenburn.lisp at line 120 [6.84]

∅:D[7.112] → [6.1306:1510]

B:BD[6.1306] → [6.1306:1510]

  '((fg+2     . (#xFF #xFF #xEF))
    (fg+1     . (#xF5 #xF5 #xD6))
    (fg       . (#xDC #xDC #xCC))
    (fg-1     . (#xA6 #xA6 #x89))
    (fg-2     . (#x65 #x65 #x55))
    (black    . (#x00 #x00 #x00))

[7.112]

[6.1510]

  '((black    . (#x00 #x00 #x00))

Replacement in tools/zenburn.lisp at line 129 [6.84]

B:BD[6.1782] → [6.1782:1918]

    (red+2    . (#xEC #xB3 #xB3))
    (red+1    . (#xDC #xA3 #xA3))
    (red      . (#xCC #x93 #x93))
    (red-1    . (#xBC #x83 #x83))

[6.1782]

[6.1918]

    (fg-2     . (#x65 #x65 #x55))
    (fg-1     . (#xA6 #xA6 #x89))
    (fg       . (#xDC #xDC #xCC))
    (fg+1     . (#xF5 #xF5 #xD6))
    (fg+2     . (#xFF #xFF #xEF))
    (red-6    . (#x6C #x33 #x33))
    (red-5    . (#x7C #x43 #x43))
    (red-4    . (#x8C #x53 #x53))
    (red-3    . (#x9C #x63 #x63))

Replacement in tools/zenburn.lisp at line 139 [6.84]

B:BD[6.1952] → [6.1952:2088]

    (red-3    . (#x9C #x63 #x63))
    (red-4    . (#x8C #x53 #x53))
    (red-5    . (#x7C #x43 #x43))
    (red-6    . (#x6C #x33 #x33))

[6.1952]

[6.2088]

    (red-1    . (#xBC #x83 #x83))
    (red      . (#xCC #x93 #x93))
    (red+1    . (#xDC #xA3 #xA3))
    (red+2    . (#xEC #xB3 #xB3))

Insertion in tools/zenburn.lisp at line 144 [6.84]

[6.2122]

    (yellow-2 . (#xD0 #xBF #x8F))
    (yellow-1 . (#xE0 #xCF #x9F))

Deletion in tools/zenburn.lisp at line 147 [6.84]
B:BD[6.2156] → [6.2156:2224]
```
    (yellow-1 . (#xE0 #xCF #x9F))
    (yellow-2 . (#xD0 #xBF #x8F))
```

Replacement in tools/zenburn.lisp at line 158 [6.84]

B:BD[6.2598] → [6.2598:2768]

    (blue+3   . (#xBD #xE0 #xF3))
    (blue+2   . (#xAC #xE0 #xE3))
    (blue+1   . (#x94 #xBF #xF3))
    (blue     . (#x8C #xD0 #xD3))
    (blue-1   . (#x7C #xB8 #xBB))

[6.2598]

[6.2768]

    (blue-5   . (#x36 #x60 #x60))
    (blue-4   . (#x4C #x70 #x73))
    (blue-3   . (#x5C #x88 #x8B))

Replacement in tools/zenburn.lisp at line 162 [6.84]

B:BD[6.2802] → [6.2802:2904]

    (blue-3   . (#x5C #x88 #x8B))
    (blue-4   . (#x4C #x70 #x73))
    (blue-5   . (#x36 #x60 #x60))

[6.2802]

[6.2904]

    (blue-1   . (#x7C #xB8 #xBB))
    (blue     . (#x8C #xD0 #xD3))
    (blue+1   . (#x94 #xBF #xF3))
    (blue+2   . (#xAC #xE0 #xE3))
    (blue+3   . (#xBD #xE0 #xF3))

Insertion in tools/zenburn.lisp at line 175 [6.84]

[7.176]

[6.2940]


(defun match-alist-order (pattern target)
  (format t "NOTICE ME: ~s~%"
          (set-difference (mapcar #'car pattern)
                          (mapcar #'car target)))

Insertion in tools/zenburn.lisp at line 181 [6.84]

[6.2941]

[7.177]

  (loop for (key . _) in pattern
        collect (assoc key target)))
(defparameter *alt-color-alist*
  (match-alist-order
   *color-alist*
   (append (mapcar (lambda (it)
                     (cons it (theme-color it)))
                   '(black
                     bg-2 bg-1 bg-05 bg bg+05 bg+1 bg+2 bg+3
                     fg-2 fg-1 fg fg+1 fg+2))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.45
                                  (theme-color it))))
                   '(red-6))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.5
                                  (theme-color it))))
                   '(red-5 green-5 blue-5))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.55
                                  (theme-color it))))
                   '(red-4 green-4 blue-4))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.6
                                  (theme-color it))))
                   '(red-3 green-3 blue-3))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.65
                                  (theme-color it))))
                   '(red-2 yellow-2 green-2 blue-2))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.7
                                  (theme-color it))))
                   '(blue-1 green-1 yellow-1 red-1))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.75
                                  (theme-color it))))
                   '(red orange yellow green cyan blue magenta))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.8
                                  (theme-color it))))
                   '(red+1 green+1 blue+1))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.85
                                  (theme-color it))))
                   '(red+2 green+2 blue+2))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.9
                                  (theme-color it))))
                   '(green+3 blue+3))
           (mapcar (lambda (it)
                     (cons it
                           (apply #'set-l-oklab
                                  0.95
                                  (theme-color it))))
                   '(green+4))
           )))

Replacement in tools/zenburn.lisp at line 285 [6.84]
B:BD[5.3550] → [5.3550:3592]
```
(defun oklab-color (name &optional (s t))
```
[5.3550]
[5.3592]
```
(defun oklab-value (name)
```

Replacement in tools/zenburn.lisp at line 288 [6.84]

B:BD[5.3668] → [5.3668:3976]

      (multiple-value-bind (l a b) (multiple-value-call #'xyz-to-oklab
                                     (dufy:qrgb-to-xyz r g b))
        (prog1 (format s
                       "oklab(~,3f% ~,3f ~,3f)"
                       (* 100.0 l) a b)
          (unless (null s)
            (format s "~%")))))))

[5.3668]

[5.3976]

      (multiple-value-list (multiple-value-call #'xyz-to-oklab
                             (dufy:qrgb-to-xyz r g b))))))
(defun oklab-color (name &optional (s t))
  (prog1 (apply #'format s
                "oklab(~,3f% ~,3f ~,3f)"
                (oklab-value name))
    (unless (null s)
      (format s "~%"
              ))))

Replacement in tools/zenburn.lisp at line 341 [6.84]

B:BD[6.3528] → [8.84:131]

      (flag :short-name "h" :long-name "help")

[6.3528]

[7.543]

    (flag :short-name "h" :long-name "help")
    (flag :short-name "a" :long-name "alt" :description "use alternate colors")

Insertion in tools/zenburn.lisp at line 375 [6.84]

[5.5097]

[9.994]

         (alt (net.didierverna.clon:getopt :context context
                                           :long-name "alt"
                                           :env-var "ZENBURN_ALT_PALETTE"))

Replacement in tools/zenburn.lisp at line 388 [6.84]

B:BD[6.4810] → [6.4810:4966]

B:BD[6.4966] → [5.5358:5407]

∅:D[5.5407] → [6.4966:5126]

B:BD[6.4966] → [6.4966:5126]

B:BD[6.5126] → [7.824:883]

∅:D[7.883] → [6.5183:5252]

B:BD[6.5183] → [6.5183:5252]

B:BD[6.5252] → [7.884:916]

B:BD[7.916] → [9.1117:1162]

∅:D[8.161] → [10.243:258]

B:BD[9.1162] → [10.243:258]

B:BD[10.258] → [5.5408:5543]

∅:D[5.5543] → [10.288:356]

B:BD[10.288] → [10.288:356]

∅:D[10.356] → [6.5359:5574]

∅:D[7.916] → [6.5359:5574]

∅:D[9.1162] → [6.5359:5574]

B:BD[6.5359] → [6.5359:5574]

    (cond ((net.didierverna.clon:getopt :context context
                                        :long-name "help")
           (net.didierverna.clon:help))
          (list-names
           (list-names t))
          ((and html css)
           (format *error-output* "Can't use HTML and CSS options together~%")
           (net.didierverna.clon:help))
          (css
           (let ((values (cdr (assoc css *color-alist*))))
             (format t "rgb(~{~d~^, ~})~%" values)))
          (html
           (html-color html t))
          (hsv
           (hsv-color hsv t))
          (hsl
           (hsl-color hsl t))
          (oklab
           (oklab-color oklab t))
          (cielab
           (cielab-color cielab t))
          #+(or)
          (float
           (float-color float t))
          ((null remainder)
           (summary))
          ((or foreground background)
           (zenburn-text foreground background "~{~a~^ ~}" remainder))
          (t
           (net.didierverna.clon:help)))))

[6.4810]

[6.5575]

    (let ((*color-alist* (if alt
                             *alt-color-alist*
                             *color-alist*)))
      (cond ((net.didierverna.clon:getopt :context context
                                          :long-name "help")
             (net.didierverna.clon:help))
            (list-names
             (list-names t))
            ((and html css)
             (format *error-output* "Can't use HTML and CSS options together~%")
             (net.didierverna.clon:help))
            (css
             (let ((values (cdr (assoc css *color-alist*))))
               (format t "rgb(~{~d~^, ~})~%" values)))
            (html
             (html-color html t))
            (hsv
             (hsv-color hsv t))
            (hsl
             (hsl-color hsl t))
            (oklab
             (oklab-color oklab t))
            (cielab
             (cielab-color cielab t))
            #+(or)
            (float
             (float-color float t))
            ((null remainder)
             (summary))
            ((or foreground background)
             (zenburn-text foreground background "~{~a~^ ~}" remainder))
            (t
             (net.didierverna.clon:help))))))