summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-13 13:30:33 -0700
committerEli Zaretskii <eliz@gnu.org>2016-09-23 16:55:52 +0300
commit9135bd7af7bdf9f805b185a77fe4e6d33dec4009 (patch)
tree3dbebfada02bbb3369d4838a82bc261e4a694bfd /lisp/faces.el
parente0dd65cd444fd9e5ee6b5921936c6c829df75e50 (diff)
downloademacs-9135bd7af7bdf9f805b185a77fe4e6d33dec4009.tar.gz
Improve display of tex-verbatim and Info quoted
Problem reported by Glenn Morris (Bug#19889). * doc/emacs/display.texi (Standard Faces): * doc/lispref/display.texi (Basic Faces): * etc/NEWS: Mention fixed-pitch-serif. * lisp/faces.el (face-font-family-alternatives): New family alias Monospace Serif. (fixed-pitch-serif): New face, which uses the new family. * lisp/info.el (Info-quoted): * lisp/textmodes/tex-mode.el (tex-verbatim): Use the new face. * test/lisp/legacy/font-parse-tests.el (font-parse-tests--data): Add test case for Monospace Serif. This is backport from master (cherry picked from commit 36906806ccfc0e53f1d8c365ab0d7151288b7833)
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el29
1 files changed, 29 insertions, 0 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index fddc036c13e..b1ea0f0fc34 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -98,7 +98,31 @@ a font height that isn't optimal."
(defcustom face-font-family-alternatives
(mapcar (lambda (arg) (mapcar 'purecopy arg))
'(("Monospace" "courier" "fixed")
+
+ ;; Monospace Serif is an Emacs invention, intended to work around
+ ;; portability problems when using Courier. It should work well
+ ;; when combined with Monospaced and with other standard fonts.
+ ("Monospace Serif"
+
+ ;; This looks good on GNU/Linux.
+ "Courier 10 Pitch"
+ ;; This looks good on MS-Windows and OS X.
+ "Consolas"
+ ;; This looks good on OS X. "Courier" looks good too, but is
+ ;; jagged on GNU/Linux and so is listed later as "courier".
+ "Courier Std"
+ ;; Although these are anti-aliased, they are a bit faint compared
+ ;; to the above.
+ "FreeMono" "Nimbus Mono L"
+ ;; These are aliased and look jagged.
+ "courier" "fixed"
+ ;; Omit Courier New, as it is the default MS-Windows font and so
+ ;; would look no different, and is pretty faint on other platforms.
+ )
+
+ ;; This is present for backward compatibility.
("courier" "CMU Typewriter Text" "fixed")
+
("Sans Serif" "helv" "helvetica" "arial" "fixed")
("helv" "helvetica" "arial" "fixed")))
"Alist of alternative font family names.
@@ -2280,6 +2304,11 @@ If you set `term-file-prefix' to nil, this function does nothing."
"The basic fixed-pitch face."
:group 'basic-faces)
+(defface fixed-pitch-serif
+ '((t :family "Monospace Serif"))
+ "The basic fixed-pitch face with serifs."
+ :group 'basic-faces)
+
(defface variable-pitch
'((((type w32))
;; This is a kludgy workaround for an issue discussed in