Merge pull request #16 from pnathan/issue-15

Properly addresses color strings

Author: pnathan

cl-ansi-text.asd

@@ -5,7 +5,7 @@
   :components ((:file "cl-ansi-text")
                (:file "define-colors"))
   :name "cl-ansi-text"
-  :version "1.2"
+  :version "1.2.1"
   :maintainer "Paul Nathan"
   :author "Paul Nathan"
   :licence "LLGPL"

src/cl-ansi-text.lisp

@@ -203,7 +203,7 @@ then writes out the string that resets the decoration."
 
 (defmethod rgb-color-code ((color string) &optional (style :foreground))
   "Takes RGB integer ala Web integers"
-  (rgb-color-code (cl-colors2:hex-to-rgb color)
+  (rgb-color-code (cl-colors2:parse-hex-rgb color)
                   style))
 
 (defmethod rgb-color-code ((color cl-colors2:rgb) &optional (style :foreground))

test/cl-ansi-text-test.lisp

@@ -82,6 +82,20 @@
     (is (equal '(#\Esc #\[ #\4 #\8 #\; #\2 #\; #\2 #\5 #\5 #\; #\2 #\5 #\5 #\; #\2 #\5 #\5 #\m)
                (make-color-string-as-list #xFFFFFF :effect :unset :style :background)))))
 
+(test color-rgb
+      ;; RGB plain
+      (is (equal (coerce (cl-ansi-text:make-color-string "ff0000") 'list)
+                 '(#\Esc #\[ #\3 #\1 #\m)))
+      ;; Web Style
+      (is (equal (coerce (cl-ansi-text:make-color-string "#ff0000") 'list)
+                 '(#\Esc #\[ #\3 #\1 #\m)))
+
+      ;; redux, but with 3 octets not 3 16-lets
+      (is (equal (coerce (cl-ansi-text:make-color-string "f00") 'list)
+                 '(#\Esc #\[ #\3 #\1 #\m)))
+      (is (equal (coerce (cl-ansi-text:make-color-string "#f00") 'list)
+                 '(#\Esc #\[ #\3 #\1 #\m))))
+
 (test color-named-functions
   (let ((str "Test string."))
     (is (equal (black str)
@@ -125,4 +139,3 @@
     (is
      (equal str
             (white (cyan (magenta (blue (yellow (green (red (black str))))))))))))
-