(sieve-string-bytes): Remove.

[gnu-emacs] / lisp / ps-mule.el

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 54054e4e36e8befe43d9f7e0c0c2b826308d2e1b..f3bbd5348497af9de89b87db91c1e75729af7243 100644 (file)
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1,7 +1,7 @@
 ;;; 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)
@@ -276,7 +276,7 @@ Currently, data for Japanese and Korean PostScript printers are listed.")
     (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
@@ -579,10 +579,7 @@ FONT-SPEC-TABLE is 0, 1, 2, 3, 4, 5, or 6, each represents font tags f0, f1,
 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))
@@ -594,30 +591,20 @@ f2, f3, h0, h1, and H0 respectively."
          (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."
@@ -674,7 +661,10 @@ the sequence."
   (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)
@@ -687,11 +677,10 @@ the sequence."
       (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)
@@ -721,10 +710,9 @@ the sequence."
                 (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)))
 
@@ -1042,13 +1030,13 @@ FONTTAG should be a string \"/h0\", \"/h1\", \"/L0\", or \"/H0\".
 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)