-;;; 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.
;; 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: <2001-07-15 12:25:51 pavel>
;; This file is part of GNU Emacs.
;;;###autoload
(defvar bdf-directory-list
- (if (eq system-type 'ms-dos)
+ (if (and (memq system-type '(ms-dos windows-nt))
+ (boundp 'installation-directory))
(list (expand-file-name "fonts/bdf" installation-directory))
'("/usr/local/share/emacs/fonts/bdf"))
"*List of directories to search for `BDF' font files.
The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
-;; MS-DOS users like to move the binary around after it's built, but
-;; the value above is computed at load-up time.
-(and (eq system-type 'ms-dos)
+;; MS-DOS and MS-Windows users like to move the binary around after
+;; it's built, but the value above is computed at load-up time.
+(and (and (memq system-type '(ms-dos windows-nt))
+ (boundp 'installation-directory))
(setq bdf-directory-list
(list (expand-file-name "fonts/bdf" installation-directory))))
(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
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))