Commit eab35f39 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.

(hfy-size): Handle ttys.

Fixes: debbugs:14668
parent f2136e1e
2013-06-26 Glenn Morris <rgm@gnu.org> 2013-06-26 Glenn Morris <rgm@gnu.org>
* htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.
(hfy-size): Handle ttys. (Bug#14668)
* info-xref.el: Update for Texinfo 5 change in *note format. * info-xref.el: Update for Texinfo 5 change in *note format.
(info-xref-node-re, info-xref-note-re): New constants. (info-xref-node-re, info-xref-note-re): New constants.
(info-xref-check-buffer): Use info-xref-note-re. (info-xref-check-buffer): Use info-xref-note-re.
......
...@@ -748,6 +748,10 @@ if you've redefined white, (esp. if you've redefined it to have a triplet ...@@ -748,6 +748,10 @@ if you've redefined white, (esp. if you've redefined it to have a triplet
member lower than that of the color you are processing) strange things member lower than that of the color you are processing) strange things
may happen." may happen."
;;(message "hfy-colour-vals");;DBUG ;;(message "hfy-colour-vals");;DBUG
;; TODO? Can we do somehow do better than this?
(cond
((equal colour "unspecified-fg") (setq colour "black"))
((equal colour "unspecified-bg") (setq colour "white")))
(let ((white (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals "white"))) (let ((white (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals "white")))
(rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals colour)))) (rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals colour))))
(if rgb16 (if rgb16
...@@ -773,6 +777,8 @@ may happen." ...@@ -773,6 +777,8 @@ may happen."
"Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT. "Derive a CSS font-size specifier from an Emacs font :height attribute HEIGHT.
Does not cope with the case where height is a function to be applied to Does not cope with the case where height is a function to be applied to
the height of the underlying font." the height of the underlying font."
;; In ttys, the default face has :height == 1.
(and (not (display-graphic-p)) (equal 1 height) (setq height 100))
(list (list
(cond (cond
;;(t (cons "font-size" ": 1em")) ;;(t (cons "font-size" ": 1em"))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment