[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ELPA-diffs] /srv/bzr/emacs/elpa r298: rainbow-mode: version 0.4
From: |
Julien Danjou |
Subject: |
[ELPA-diffs] /srv/bzr/emacs/elpa r298: rainbow-mode: version 0.4 |
Date: |
Fri, 09 Nov 2012 12:44:12 +0100 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 298
committer: Julien Danjou <address@hidden>
branch nick: elpa
timestamp: Fri 2012-11-09 12:44:12 +0100
message:
rainbow-mode: version 0.4
* rainbow-mode.el: Use functions from color package to colorize HSL rather
than our own copy.
modified:
packages/rainbow-mode/rainbow-mode.el
=== modified file 'packages/rainbow-mode/rainbow-mode.el'
--- a/packages/rainbow-mode/rainbow-mode.el 2012-11-09 11:36:23 +0000
+++ b/packages/rainbow-mode/rainbow-mode.el 2012-11-09 11:44:12 +0000
@@ -4,7 +4,7 @@
;; Author: Julien Danjou <address@hidden>
;; Keywords: faces
-;; Version: 0.3
+;; Version: 0.4
;; This file is part of GNU Emacs.
@@ -34,6 +34,7 @@
(require 'regexp-opt)
(require 'faces)
+(require 'color)
(defgroup rainbow nil
"Show color strings with a background color."
@@ -315,26 +316,6 @@
(/ (* (string-to-number (substring number 0 string-length)) 255) 100)
(string-to-number number))))
-(defun rainbow-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 rainbow-hsl-to-rgb-fractions (h s l)
- "Convert H S L to fractional RGB values."
- (let (m1 m2)
- (if (<= l 0.5)
- (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))))))
-
(defun rainbow-colorize-hsl ()
"Colorize a match with itself."
(let ((h (/ (string-to-number (match-string-no-properties 1)) 360.0))
@@ -342,7 +323,7 @@
(l (/ (string-to-number (match-string-no-properties 3)) 100.0)))
(rainbow-colorize-match
(multiple-value-bind (r g b)
- (rainbow-hsl-to-rgb-fractions h s l)
+ (color-hsl-to-rgb h s l)
(format "#%02X%02X%02X" (* r 255) (* g 255) (* b 255))))))
(defun rainbow-colorize-rgb ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [ELPA-diffs] /srv/bzr/emacs/elpa r298: rainbow-mode: version 0.4,
Julien Danjou <=