Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cope with multiple overlapping faces.

Browse source 
* lisp/htmlfontify.el (hfy-face-to-style-i): Treat inheritance right to
  left.
  (hfy-face-resolve-face): Handle font specification as well as font
  name. Documentation update. (Bug#21990)
This commit is contained in:
Phillip Lord 2016-01-17 22:03:10 +00:00
parent 66ff8bac8b
commit ef768c790e
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/htmlfontify.el
View file

@ -999,7 +999,7 @@ merged by the user - `hfy-flatten-style' should do this."
(append
parent
(hfy-face-to-style-i
(hfy-face-attr-for-class v hfy-display-class)) ))))
(hfy-face-attr-for-class v hfy-display-class))))))
(setq this
(if val (case key
(:family (hfy-family val))
@ -1018,7 +1018,7 @@ merged by the user - `hfy-flatten-style' should do this."
(:italic (hfy-slant 'italic))))))
(setq that (hfy-face-to-style-i next))
;;(lwarn t :warning "%S => %S" fn (nconc this that parent))
(nconc this that parent))) )
(nconc this parent that))) )
(defun hfy-size-to-int (spec)
"Convert SPEC, a CSS font-size specifier, to an Emacs :height attribute value.
@ -1056,13 +1056,19 @@ haven't encountered them yet. Returns a `hfy-style-assoc'."
(nconc r (hfy-size (if x (round n) (* n 1.0)))) ))
(defun hfy-face-resolve-face (fn)
"For FN return a face specification.
FN may be either a face or a face specification. If the latter,
then the specification is returned unchanged."
(cond
((facep fn)
(hfy-face-attr-for-class fn hfy-display-class))
;; FIXME: is this necessary? Faces can be symbols, but
;; not symbols refering to other symbols?
((and (symbolp fn)
(facep (symbol-value fn)))
(hfy-face-attr-for-class (symbol-value fn) hfy-display-class))
(t nil)))
(hfy-face-attr-for-class
(symbol-value fn) hfy-display-class))
(t fn)))
(defun hfy-face-to-style (fn)