Mercurial > emacs
view lisp/gnus/shr-color.el @ 111789:f97704487fb3
Merge changes made in Gnus trunk.
nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 02 Dec 2010 22:21:31 +0000 |
parents | 6098376da331 |
children | b1eac6d41a93 |
line wrap: on
line source
;;; shr-color.el --- Simple HTML Renderer color management ;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Author: Julien Danjou <julien@danjou.info> ;; Keywords: html ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This package handles colors display for shr. ;;; Code: (require 'color) (eval-when-compile (require 'cl)) (defgroup shr-color nil "Simple HTML Renderer colors" :group 'shr) (defcustom shr-color-visible-luminance-min 40 "Minimum luminance distance between two colors to be considered visible. Must be between 0 and 100." :group 'shr :type 'float) (defcustom shr-color-visible-distance-min 5 "Minimum color distance between two colors to be considered visible. This value is used to compare result for `ciede2000'. Its an absolute value without any unit." :group 'shr :type 'integer) (defconst shr-color-html-colors-alist '(("AliceBlue" . "#F0F8FF") ("AntiqueWhite" . "#FAEBD7") ("Aqua" . "#00FFFF") ("Aquamarine" . "#7FFFD4") ("Azure" . "#F0FFFF") ("Beige" . "#F5F5DC") ("Bisque" . "#FFE4C4") ("Black" . "#000000") ("BlanchedAlmond" . "#FFEBCD") ("Blue" . "#0000FF") ("BlueViolet" . "#8A2BE2") ("Brown" . "#A52A2A") ("BurlyWood" . "#DEB887") ("CadetBlue" . "#5F9EA0") ("Chartreuse" . "#7FFF00") ("Chocolate" . "#D2691E") ("Coral" . "#FF7F50") ("CornflowerBlue" . "#6495ED") ("Cornsilk" . "#FFF8DC") ("Crimson" . "#DC143C") ("Cyan" . "#00FFFF") ("DarkBlue" . "#00008B") ("DarkCyan" . "#008B8B") ("DarkGoldenRod" . "#B8860B") ("DarkGray" . "#A9A9A9") ("DarkGrey" . "#A9A9A9") ("DarkGreen" . "#006400") ("DarkKhaki" . "#BDB76B") ("DarkMagenta" . "#8B008B") ("DarkOliveGreen" . "#556B2F") ("Darkorange" . "#FF8C00") ("DarkOrchid" . "#9932CC") ("DarkRed" . "#8B0000") ("DarkSalmon" . "#E9967A") ("DarkSeaGreen" . "#8FBC8F") ("DarkSlateBlue" . "#483D8B") ("DarkSlateGray" . "#2F4F4F") ("DarkSlateGrey" . "#2F4F4F") ("DarkTurquoise" . "#00CED1") ("DarkViolet" . "#9400D3") ("DeepPink" . "#FF1493") ("DeepSkyBlue" . "#00BFFF") ("DimGray" . "#696969") ("DimGrey" . "#696969") ("DodgerBlue" . "#1E90FF") ("FireBrick" . "#B22222") ("FloralWhite" . "#FFFAF0") ("ForestGreen" . "#228B22") ("Fuchsia" . "#FF00FF") ("Gainsboro" . "#DCDCDC") ("GhostWhite" . "#F8F8FF") ("Gold" . "#FFD700") ("GoldenRod" . "#DAA520") ("Gray" . "#808080") ("Grey" . "#808080") ("Green" . "#008000") ("GreenYellow" . "#ADFF2F") ("HoneyDew" . "#F0FFF0") ("HotPink" . "#FF69B4") ("IndianRed" . "#CD5C5C") ("Indigo" . "#4B0082") ("Ivory" . "#FFFFF0") ("Khaki" . "#F0E68C") ("Lavender" . "#E6E6FA") ("LavenderBlush" . "#FFF0F5") ("LawnGreen" . "#7CFC00") ("LemonChiffon" . "#FFFACD") ("LightBlue" . "#ADD8E6") ("LightCoral" . "#F08080") ("LightCyan" . "#E0FFFF") ("LightGoldenRodYellow" . "#FAFAD2") ("LightGray" . "#D3D3D3") ("LightGrey" . "#D3D3D3") ("LightGreen" . "#90EE90") ("LightPink" . "#FFB6C1") ("LightSalmon" . "#FFA07A") ("LightSeaGreen" . "#20B2AA") ("LightSkyBlue" . "#87CEFA") ("LightSlateGray" . "#778899") ("LightSlateGrey" . "#778899") ("LightSteelBlue" . "#B0C4DE") ("LightYellow" . "#FFFFE0") ("Lime" . "#00FF00") ("LimeGreen" . "#32CD32") ("Linen" . "#FAF0E6") ("Magenta" . "#FF00FF") ("Maroon" . "#800000") ("MediumAquaMarine" . "#66CDAA") ("MediumBlue" . "#0000CD") ("MediumOrchid" . "#BA55D3") ("MediumPurple" . "#9370D8") ("MediumSeaGreen" . "#3CB371") ("MediumSlateBlue" . "#7B68EE") ("MediumSpringGreen" . "#00FA9A") ("MediumTurquoise" . "#48D1CC") ("MediumVioletRed" . "#C71585") ("MidnightBlue" . "#191970") ("MintCream" . "#F5FFFA") ("MistyRose" . "#FFE4E1") ("Moccasin" . "#FFE4B5") ("NavajoWhite" . "#FFDEAD") ("Navy" . "#000080") ("OldLace" . "#FDF5E6") ("Olive" . "#808000") ("OliveDrab" . "#6B8E23") ("Orange" . "#FFA500") ("OrangeRed" . "#FF4500") ("Orchid" . "#DA70D6") ("PaleGoldenRod" . "#EEE8AA") ("PaleGreen" . "#98FB98") ("PaleTurquoise" . "#AFEEEE") ("PaleVioletRed" . "#D87093") ("PapayaWhip" . "#FFEFD5") ("PeachPuff" . "#FFDAB9") ("Peru" . "#CD853F") ("Pink" . "#FFC0CB") ("Plum" . "#DDA0DD") ("PowderBlue" . "#B0E0E6") ("Purple" . "#800080") ("Red" . "#FF0000") ("RosyBrown" . "#BC8F8F") ("RoyalBlue" . "#4169E1") ("SaddleBrown" . "#8B4513") ("Salmon" . "#FA8072") ("SandyBrown" . "#F4A460") ("SeaGreen" . "#2E8B57") ("SeaShell" . "#FFF5EE") ("Sienna" . "#A0522D") ("Silver" . "#C0C0C0") ("SkyBlue" . "#87CEEB") ("SlateBlue" . "#6A5ACD") ("SlateGray" . "#708090") ("SlateGrey" . "#708090") ("Snow" . "#FFFAFA") ("SpringGreen" . "#00FF7F") ("SteelBlue" . "#4682B4") ("Tan" . "#D2B48C") ("Teal" . "#008080") ("Thistle" . "#D8BFD8") ("Tomato" . "#FF6347") ("Turquoise" . "#40E0D0") ("Violet" . "#EE82EE") ("Wheat" . "#F5DEB3") ("White" . "#FFFFFF") ("WhiteSmoke" . "#F5F5F5") ("Yellow" . "#FFFF00") ("YellowGreen" . "#9ACD32")) "Alist of HTML colors. Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR).") (defun shr-color-relative-to-absolute (number) "Convert a relative NUMBER to absolute. If NUMBER is absolute, return NUMBER. This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"." (let ((string-length (- (length number) 1))) ;; Is this a number with %? (if (eq (elt number string-length) ?%) (/ (* (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) (if (<= l 0.5) (setq m2 (* l (+ s 1))) (setq m2 (- (+ l s) (* l s)))) (setq m1 (- (* l 2) m2)) (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. Like rgb() or hsl()." (when color (cond ;; Hexadecimal color: #abc or #aabbcc ((string-match "\\(#[0-9a-fA-F]\\{3\\}[0-9a-fA-F]\\{3\\}?\\)" color) (match-string 1 color)) ;; rgb() or rgba() colors ((or (string-match "rgb(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*)" color) (string-match "rgba(\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*\\([0-9]\\{1,3\\}\\(?:\s*%\\)?\\)\s*,\s*[0-9]*\.?[0-9]+\s*%?\s*)" color)) (format "#%02X%02X%02X" (shr-color-relative-to-absolute (match-string-no-properties 1 color)) (shr-color-relative-to-absolute (match-string-no-properties 2 color)) (shr-color-relative-to-absolute (match-string-no-properties 3 color)))) ;; hsl() or hsla() colors ((or (string-match "hsl(\s*\\([0-9]\\{1,3\\}\\)\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*)" color) (string-match "hsla(\s*\\([0-9]\\{1,3\\}\\)\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*\\([0-9]\\{1,3\\}\\)\s*%\s*,\s*[0-9]*\.?[0-9]+\s*%?\s*)" color)) (let ((h (/ (string-to-number (match-string-no-properties 1 color)) 360.0)) (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) (shr-color-hsl-to-rgb-fractions h s l) (color-rgb->hex r g b)))) ;; Color names ((cdr (assoc-string color shr-color-html-colors-alist t))) ;; Unrecognized color :( (t nil)))) (defun set-minimum-interval (val1 val2 min max interval &optional fixed) "Set minimum interval between VAL1 and VAL2 to INTERVAL. The values are bound by MIN and MAX. If FIXED is t, then val1 will not be touched." (let ((diff (abs (- val1 val2)))) (unless (>= diff interval) (if fixed (let* ((missing (- interval diff)) ;; If val2 > val1, try to increase val2 ;; That's the "good direction" (val2-good-direction (if (> val2 val1) (min max (+ val2 missing)) (max min (- val2 missing)))) (diff-val2-good-direction-val1 (abs (- val2-good-direction val1)))) (if (>= diff-val2-good-direction-val1 interval) (setq val2 val2-good-direction) ;; Good-direction is not so good, compute bad-direction (let* ((val2-bad-direction (if (> val2 val1) (max min (- val1 interval)) (min max (+ val1 interval)))) (diff-val2-bad-direction-val1 (abs (- val2-bad-direction val1)))) (if (>= diff-val2-bad-direction-val1 interval) (setq val2 val2-bad-direction) ;; Still not good, pick the best and prefer good direction (setq val2 (if (>= diff-val2-good-direction-val1 diff-val2-bad-direction-val1) val2-good-direction val2-bad-direction)))))) ;; No fixed, move val1 and val2 (let ((missing (/ (- interval diff) 2.0))) (if (< val1 val2) (setq val1 (max min (- val1 missing)) val2 (min max (+ val2 missing))) (setq val2 (max min (- val2 missing)) val1 (min max (+ val1 missing)))) (setq diff (abs (- val1 val2))) ; Recompute diff (unless (>= diff interval) ;; Not ok, we hit a boundary (let ((missing (- interval diff))) (cond ((= val1 min) (setq val2 (+ val2 missing))) ((= val2 min) (setq val1 (+ val1 missing))) ((= val1 max) (setq val2 (- val2 missing))) ((= val2 max) (setq val1 (- val1 missing))))))))) (list val1 val2))) (defun shr-color-visible (bg fg &optional fixed-background) "Check that BG and FG colors are visible if they are drawn on each other. Return (bg fg) if they are. If they are too similar, two new colors are returned instead. If FIXED-BACKGROUND is set, and if the color are not visible, a new background color will not be computed. Only the foreground color will be adapted to be visible on BG." ;; Convert fg and bg to CIE Lab (let ((fg-norm (color-rgb->normalize fg)) (bg-norm (color-rgb->normalize bg))) (if (or (null fg-norm) (null bg-norm)) (list bg fg) (let* ((fg-lab (apply 'color-srgb->lab fg-norm)) (bg-lab (apply 'color-srgb->lab bg-norm)) ;; Compute color distance using CIE DE 2000 (fg-bg-distance (color-cie-de2000 fg-lab bg-lab)) ;; Compute luminance distance (substract L component) (luminance-distance (abs (- (car fg-lab) (car bg-lab))))) (if (and (>= fg-bg-distance shr-color-visible-distance-min) (>= luminance-distance shr-color-visible-luminance-min)) (list bg fg) ;; Not visible, try to change luminance to make them visible (let ((Ls (set-minimum-interval (car bg-lab) (car fg-lab) 0 100 shr-color-visible-luminance-min fixed-background))) (unless fixed-background (setcar bg-lab (car Ls))) (setcar fg-lab (cadr Ls)) (list (if fixed-background bg (apply 'format "#%02x%02x%02x" (mapcar (lambda (x) (* (max (min 1 x) 0) 255)) (apply 'color-lab->srgb bg-lab)))) (apply 'format "#%02x%02x%02x" (mapcar (lambda (x) (* (max (min 1 x) 0) 255)) (apply 'color-lab->srgb fg-lab)))))))))) (provide 'shr-color) ;;; shr-color.el ends here