Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
eab35f39
Commit
eab35f39
authored
Jun 25, 2013
by
Glenn Morris
Browse files
* lisp/htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg.
(hfy-size): Handle ttys. Fixes: debbugs:14668
parent
f2136e1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/htmlfontify.el
lisp/htmlfontify.el
+6
-0
No files found.
lisp/ChangeLog
View file @
eab35f39
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.
...
...
lisp/htmlfontify.el
View file @
eab35f39
...
@@ -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"))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment