shr-color.el: fix several function calls.

shr.el: replace newline with space in style parsing

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2bfba62692add31adc346b15f27adc73013dd96a..b501b5ec55c0d39c3e274dc34c47bdbb4be2815d 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  Julien Danjou  <julien@danjou.info>
+
+       * shr.el (shr-parse-style): Replace \n with space in style parsing.
+
+       * shr-color.el (shr-color-hsl-to-rgb-fractions): Use shr-color-hue-to-rgb.
+       (shr-color->hexadecimal): Call shr-color-hsl-to-rgb-fractions.
+
 2010-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-color->hexadecimal): Autoload.

diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index 127dc68191a0ddf89ed8ebbd81e79bd0cc5fae94..5a9aff9416d7a98835c9a3f39e2f6875677a7a97 100644 (file)
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -54,6 +54,15 @@ This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"."
         (/ (* (string-to-number (substring number 0 string-length)) 255) 100)
       (string-to-number number))))
 
+(defun shr-color-hue-to-rgb (x y h)
+  "Convert X Y H to RGB value."
+  (when (< h 0) (incf h))
+  (when (> h 1) (decf h))
+  (cond ((< h (/ 1 6.0)) (+ x (* (- y x) h 6)))
+        ((< h 0.5) y)
+        ((< h (/ 2.0 3.0)) (+ x (* (- y x) (- (/ 2.0 3.0) h) 6)))
+        (t x)))
+
 (defun shr-color-hsl-to-rgb-fractions (h s l)
   "Convert H S L to fractional RGB values."
   (let (m1 m2)
@@ -61,9 +70,9 @@ This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"."
         (setq m2 (* l (+ s 1)))
         (setq m2 (- (+ l s) (* l s))))
     (setq m1 (- (* l 2) m2))
-    (list (rainbow-hue-to-rgb m1 m2 (+ h (/ 1 3.0)))
-         (rainbow-hue-to-rgb m1 m2 h)
-         (rainbow-hue-to-rgb m1 m2 (- h (/ 1 3.0))))))
+    (list (shr-color-hue-to-rgb m1 m2 (+ h (/ 1 3.0)))
+         (shr-color-hue-to-rgb m1 m2 h)
+         (shr-color-hue-to-rgb m1 m2 (- h (/ 1 3.0))))))
 
 (defun shr-color->hexadecimal (color)
   "Convert any color format to hexadecimal representation.
@@ -89,7 +98,7 @@ Like rgb() or hsl()."
                  (s (/ (string-to-number (match-string-no-properties 2 color)) 100.0))
                  (l (/ (string-to-number (match-string-no-properties 3 color)) 100.0)))
              (destructuring-bind (r g b)
-                 (rainbow-hsl-to-rgb-fractions h s l)
+                 (shr-color-hsl-to-rgb-fractions h s l)
                (format "#%02X%02X%02X" (* r 255) (* g 255) (* b 255)))))
           (t
            color))))

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 21bfdd37723e9b22e3d9306ac1d0232edddb249e..1efa31ad17686611bc368cfb1755604922265856 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -540,6 +540,9 @@ START, and END."
 
 (defun shr-parse-style (style)
   (when style
+    (save-match-data
+      (when (string-match "\n" style)
+        (setq style (replace-match " " t t style))))
     (let ((plist nil))
       (dolist (elem (split-string style ";"))
        (when elem