;;; ps-mule.el --- provide multi-byte character facility to ps-print
;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
;; Kenichi Handa <handa@m17n.org> (multi-byte characters)
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(indian-1-column
(normal bdf ("ind1c24-mule.bdf" "mule-indian-1col-24.bdf")))
(ethiopic
- (normal bdf ("ethio24f-uni.bdf" "ethiomx24f-uni.bdf") unicode-bmp))
+ (normal bdf ("ethio16f-uni.bdf" "ethiomx24f-uni.bdf") unicode-bmp))
(chinese-cns11643-3
(normal bdf ("cns3-40.bdf" "cns-3-40.bdf")))
(chinese-cns11643-4
called with no argument, and should return a list of strings.
CHECK-FUNC is a function to check if a font is available or not.
-It is called with one argument FONT-SPEC, and should return non-nil iff the
-font specified in FONT-SPEC is available.
+It is called with one argument FONT-SPEC, and should return non-nil if and
+only if the font specified in FONT-SPEC is available.
FONT-FUNC is a function to generate PostScript code which define a new font.
It is called with one argument FONT-SPEC, and should return a list of strings.
f2, f3, h0, h1, and H0 respectively."
(let* ((font-spec nil)
(font-id 0)
- (string-list nil)
- ;; At most 4-byte (EscChar FONT-ID CODE1 CODE2) per character.
- (str (make-string (* (- to from) 4) 0))
- (i 0))
+ (code-list nil))
(goto-char from)
(while (< (point) to)
(let* ((char (following-char))
(setq char ??
this-spec (ps-mule-get-font-spec char font-spec-table nil)
this-id (ps-mule-font-spec-font-id this-spec)))
- (or (= font-id this-id)
- (progn
- (if font-spec
- (setq string-list (cons (substring str 0 i) string-list)
- i 0))
- (setq font-id this-id)
- (or (= font-id 0)
- (progn
- (aset str i ps-mule-esc-char)
- (setq i (1+ i))
- (aset str i font-id)
- (setq i (1+ i))))))
+ (unless (= font-id this-id)
+ (setq font-id this-id)
+ (push ps-mule-esc-char code-list)
+ (push font-id code-list))
(setq font-spec this-spec)
(if (< char 128)
- (aset str i char)
+ (push char code-list)
(let* ((code (ps-mule-encode-char char font-spec)))
(if (= (ps-mule-font-spec-bytes font-spec) 1)
- (aset str i code)
- (aset str i (/ code 256))
- (setq i (1+ i))
- (aset str i (% code 256)))))
- (setq i (1+ i))
+ (push code code-list)
+ (push (/ code 256) code-list)
+ (push (% code 256) code-list))))
(forward-char 1)))
- (nreverse (cons (substring str 0 i) string-list))))
+ (apply 'unibyte-string (nreverse code-list))))
(defun ps-mule-plot-composition (composition font-spec-table)
"Generate PostScript code for plotting COMPOSITION with FONT-SPEC-TABLE."
(let* ((average-width (ps-avg-char-width 'ps-font-for-text))
(point (point))
(composition (find-composition from to nil t))
- (stop (if composition (car composition) to))
+ (stop (if (and composition
+ (not (vectorp (aref (nth 2 composition) 0))))
+ (car composition)
+ to))
(ascii-or-latin-1 "[\000-\377]+")
(run-width 0)
(endpos nil)
(cond ((= (point) stop)
(if (= stop to)
(setq endpos stop)
- (if (< from stop)
- (dolist (l (ps-mule-encode-region from (point)
- font-spec-table))
- (ps-output-string l)
- (ps-output " S\n")))
+ (when (< from stop)
+ (ps-output-string (ps-mule-encode-region from (point)
+ font-spec-table))
+ (ps-output " S\n"))
(setq width (* (nth 5 composition) average-width))
(if (< ps-width-remaining (+ run-width width))
(setq endpos stop)
(setq run-width (+ run-width width))
(forward-char 1))))))
- (if (< from endpos)
- (dolist (l (ps-mule-encode-region from endpos font-spec-table))
- (ps-output-string l)
- (ps-output " S\n")))
+ (when (< from endpos)
+ (ps-output-string (ps-mule-encode-region from endpos font-spec-table))
+ (ps-output " S\n"))
(goto-char point)
(cons endpos run-width)))
} ifelse def
dup 0 get stringwidth pop dup /WIDTH exch def bmp 0 get div
dup LLY mul /LLY exch def
- URY mul /URY exch def
+ URY mul /URY exch def
} {
pop
dup 0 get stringwidth pop /WIDTH exch def
/RIGHT WIDTH def
/TOP URY def
/BOTTOM LLY def
-
+
1 1 components length 1 sub {
components exch get
[ exch
(defun ps-mule-generate-bitmap-glyph (font-spec char code bitmap)
(let* ((id (ps-mule-font-spec-id font-spec))
- ;; FONT-RECORD ::= ([(SUBFONT-OUTPUT-LIST ...) | t]
+ ;; FONT-RECORD ::= ([(SUBFONT-OUTPUT-LIST ...) | t]
;; BASEFONT-OUTPUT-LIST SIZE REL-COMP B-OFFSET BBX)
(font-record (aref ps-mule-bitmap-font-record id))
enc-name
Any other value is treated as \"/H0\"."
(with-temp-buffer
(insert string)
- (ps-mule-encode-region (point-min) (point-max)
- (aref ps-mule-font-spec-tables
- (aref ps-mule-font-number-to-type
- (cond ((string= fonttag "/h0") 4)
- ((string= fonttag "/h1") 5)
- ((string= fonttag "/L0") 6)
- (t 0)))))))
+ (list (ps-mule-encode-region (point-min) (point-max)
+ (aref ps-mule-font-spec-tables
+ (aref ps-mule-font-number-to-type
+ (cond ((string= fonttag "/h0") 4)
+ ((string= fonttag "/h1") 5)
+ ((string= fonttag "/L0") 6)
+ (t 0))))))))
;;;###autoload
(defun ps-mule-begin-job (from to)
(defun ps-mule-redefine-font (font-number fonttag size ps-font)
(let* ((font-type (aref ps-mule-font-number-to-type font-number))
- (font-spec-alist (char-table-extra-slot
+ (font-spec-alist (char-table-extra-slot
(aref ps-mule-font-spec-tables font-type) 0)))
(ps-output-prologue
(list (if (ps-mule-font-spec-src (cdr (car font-spec-alist)))
(let ((output-head (list t))
(ps-mule-output-list (list t)))
(dotimes (i 4)
- (map-char-table 'ps-mule-prepare-glyph
+ (map-char-table 'ps-mule-prepare-glyph
(aref ps-mule-font-spec-tables i)))
(ps-mule-restruct-output-list (cdr ps-mule-output-list) output-head)
(ps-output-prologue (cdr output-head)))
(mapconcat #'(lambda (x)
(format "F%02X" (cdr x)))
font-list " ")))))
-
+
;; Redefine fonts f0, f1, f2, f3, h0, h1, H0.
(ps-mule-redefine-font 4 "h0" ps-header-title-font-size-internal
(ps-font 'ps-font-for-header 'bold))
HCoop / bpt / emacs.git / blobdiff