(U-00024182): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / lisp / font.el

diff --git a/lisp/font.el b/lisp/font.el
index 8baaa84..b0e002f 100644 (file)
--- a/lisp/font.el
+++ b/lisp/font.el
@@ -99,6 +99,7 @@
 
 (defconst font-window-system-mappings
   '((x         . (x-font-create-name x-font-create-object))
+    (gtk       . (x-font-create-name x-font-create-object))
     (ns        . (ns-font-create-name ns-font-create-object))
     (mswindows . (mswindows-font-create-name mswindows-font-create-object))
     (pm        . (x-font-create-name x-font-create-object)) ; Change? FIXME
@@ -309,8 +310,8 @@ Canonical sizes are in points.  If SPEC is null, nil is returned.  If SPEC is
 a number, it is interpreted as the desired point size and returned unchanged.
 Otherwise SPEC must be a string consisting of a number and an optional type.
 The type may be the strings \"px\", \"pix\", or \"pixel\" (pixels), \"pt\" or
-\"point\" (points), \"pa\" or \"pica\" (picas), \"in\" or \"inch\" (inches), \"cm\"
-(centimeters), or \"mm\" (millimeters).
+\"point\" (points), \"pa\" or \"pica\" (picas), \"in\" or \"inch\" (inches),
+\"cm\" (centimeters), or \"mm\" (millimeters).
 
 1 in = 2.54 cm = 6 pa = 25.4 mm = 72 pt.  Pixel size is device-dependent."
   (cond
@@ -349,7 +350,7 @@ The type may be the strings \"px\", \"pix\", or \"pixel\" (pixels), \"pt\" or
       (setq num (string-to-number spec))
       (cond
        ((member type '("pixel" "px" "pix"))
-       (setq retval (* num (/ pix-width mm-width) (/ 25.4 72.0))))
+       (setq retval (* num (/ mm-width pix-width) (/ 72.0 25.4))))
        ((member type '("point" "pt"))
        (setq retval num))
        ((member type '("pica" "pa"))
@@ -1077,8 +1078,6 @@ for use in the 'weight' field of an mswindows font string.")
 The list (R G B) is returned, or an error is signaled if the lookup fails."
   (let ((lib-list (if (boundp 'x-library-search-path)
                      x-library-search-path
-                   ;; This default is from XEmacs 19.13 - hope it covers
-                   ;; everyone.
                    (list "/usr/X11R6/lib/X11/"
                          "/usr/X11R5/lib/X11/"
                          "/usr/lib/X11R6/X11/"
@@ -1089,7 +1088,9 @@ The list (R G B) is returned, or an error is signaled if the lookup fails."
                          "/usr/local/lib/X11R5/X11/"
                          "/usr/X11/lib/X11/"
                          "/usr/lib/X11/"
+                         "/usr/share/X11/"
                          "/usr/local/lib/X11/"
+                         "/usr/local/share/X11/"
                          "/usr/X386/lib/X11/"
                          "/usr/x386/lib/X11/"
                          "/usr/XFree86/lib/X11/"