No longer require `cl'; `dolist' is standard.

[bpt/emacs.git] / lisp / ps-bdf.el

diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 7335881..a6675f9 100644 (file)
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,11 +1,11 @@
-;;; ps-bdf.el --- BDF font file handler for ps-print.
+;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998,99,2001 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1998, 1999, 2001, 2003 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 
 ;; Keywords: wp, BDF, font, PostScript
-;; Maintainer: Kenichi Handa <handa@etl.go.jp>
-;; Time-stamp: <2001/03/05 09:04:32 vinicius>
+;; Maintainer: Kenichi Handa <handa@etl.go.jp>
+;; Time-stamp: <2003/07/11 21:13:44 vinicius>
 
 ;; This file is part of GNU Emacs.
 
@@ -102,7 +102,12 @@ If BDFNAME doesn't exist, return nil."
             (insert-file-contents file-name)
             buf)))))
 
-(defvar bdf-cache-file (convert-standard-filename "~/.bdfcache.el")
+(defvar bdf-cache-file (if (eq system-type 'ms-dos)
+                          ;; convert-standard-filename doesn't
+                          ;; guarantee that the .el extension will be
+                          ;; preserved.
+                          "~/_bdfcache.el"
+                        (convert-standard-filename "~/.bdfcache.el"))
   "Name of cache file which contains information of `BDF' font files.")
 
 (defvar bdf-cache nil
@@ -217,7 +222,7 @@ CODE, where N and CODE are in the following relation:
         (relative-compose 'false)
         (baseline-offset 0)
         size
-        font-bounding-box 
+        font-bounding-box
         default-char
         code-range
         offset-vector)
@@ -352,8 +357,11 @@ The value is a list of DWIDTH, BBX, and BITMAP-STRING.
 DWIDTH is a pixel width of a glyph.
 BBX is a bounding box of the glyph.
 BITMAP-STRING is a string representing bits by hexadecimal digits."
-  (let ((coding-system-for-read 'no-conversion)
-       dwidth bbx height yoff bitmap-string)
+  (let* ((coding-system-for-read 'no-conversion)
+        (bbx (elt (bdf-get-font-info bdfname) 4))
+        (dwidth (elt bbx 0))
+        (bitmap-string "")
+        height yoff)
     (condition-case nil
        (with-temp-buffer
          (insert-file-contents bdfname nil offset (+ offset maxlen))
@@ -445,4 +453,5 @@ BITMAP-STRING is a string representing bits by hexadecimal digits."
 
 (provide 'ps-bdf)
 
+;;; arch-tag: 9b875ba8-565a-4ecf-acaa-30cee732c898
 ;;; ps-bdf.el ends here