[Emacs-diffs] trunk r113185: * lisp/htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.

[Glenn Morris]

------------------------------------------------------------
revno: 113185
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14668
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-06-25 23:59:48 -0700
message:
  * lisp/htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.
  (hfy-size): Handle ttys.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/htmlfontify.el            
htmlfontify.el-20091119213711-g4mo9tswbas14kj6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-26 01:52:09 +0000
+++ b/lisp/ChangeLog    2013-06-26 06:59:48 +0000
@@ -1,5 +1,8 @@
 2013-06-26  Glenn Morris  <address@hidden>
 
+       * 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-node-re, info-xref-note-re): New constants.
        (info-xref-check-buffer): Use info-xref-note-re.

=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el       2013-02-22 01:32:45 +0000
+++ b/lisp/htmlfontify.el       2013-06-26 06:59:48 +0000
@@ -748,6 +748,10 @@
 member lower than that of the color you are processing) strange things
 may happen."
   ;;(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")))
         (rgb16 (mapcar (lambda (I) (float (1+ I))) (hfy-colour-vals  colour))))
     (if rgb16
@@ -773,6 +777,8 @@
   "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
 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
    (cond
     ;;(t                 (cons "font-size" ": 1em"))