summaryrefslogtreecommitdiff
path: root/lisp/international/mule-diag.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-12-18 18:07:26 +0200
committerEli Zaretskii <eliz@gnu.org>2014-12-18 18:07:26 +0200
commitb1978229162b0d4c3b14d8ad8bff383eb3511969 (patch)
treed441fe077f75d8b962a24536edcc09f7af65a26d /lisp/international/mule-diag.el
parent687ae680bd12b0353e313808253e7a07c0828ebe (diff)
downloademacs-b1978229162b0d4c3b14d8ad8bff383eb3511969.tar.gz
Allow querying font by name for its height and other info. (Bug#19395)
src/font.c (Ffont_info): Add more font information to the vector returned by the function, inspired by query-font. Doc fix. doc/lispref/display.texi (Low-Level Font): Document font-info and query-font. lisp/international/mule-diag.el (describe-font-internal): Display additional info returned by font-info. lisp/linum.el (linum--face-width): Rename from linum--face-height, and use the new functionality of font-info. (linum-update-window): Use linum--face-width and frame-char-width, instead of approximating with height. etc/NEWS: Mention the enhancement in font-info.
Diffstat (limited to 'lisp/international/mule-diag.el')
-rw-r--r--lisp/international/mule-diag.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 13a178531bc..ead2decb771 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -825,10 +825,18 @@ but still contains full information about each coding system."
The IGNORED argument is ignored."
(print-list "name (opened by):" (aref font-info 0))
(print-list " full name:" (aref font-info 1))
+ (and (aref font-info 12)
+ (print-list " file name:" (aref font-info 12)))
(print-list " size:" (format "%2d" (aref font-info 2)))
(print-list " height:" (format "%2d" (aref font-info 3)))
(print-list " baseline-offset:" (format "%2d" (aref font-info 4)))
- (print-list "relative-compose:" (format "%2d" (aref font-info 5))))
+ (print-list "relative-compose:" (format "%2d" (aref font-info 5)))
+ (print-list " default-ascent:" (format "%2d" (aref font-info 6)))
+ (print-list " ascent:" (format "%2d" (aref font-info 8)))
+ (print-list " descent:" (format "%2d" (aref font-info 9)))
+ (print-list " average-width:" (format "%2d" (aref font-info 11)))
+ (print-list " space-width:" (format "%2d" (aref font-info 10)))
+ (print-list " max-width:" (format "%2d" (aref font-info 7))))
;;;###autoload
(defun describe-font (fontname)