Merge from emacs--rel--22

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

diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 3f28771f3a004dc23894f5e7ceda3d808737c980..cfebe26caf1ecb69ca2353d5ded959295ee38696 100644 (file)
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1,14 +1,13 @@
 ;;; ps-mule.el --- provide multi-byte character facility to ps-print
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
-;; Author: Vinicius Jose Latorre <vinicius@cpqd.com.br>
-;;     Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
-;; Maintainer: Kenichi Handa <handa@etl.go.jp> (multi-byte characters)
-;;     Vinicius Jose Latorre <vinicius@cpqd.com.br>
+;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
+;;     Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
+;;     Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript, multibyte, mule
-;; Time-stamp: <2003/05/14 22:19:41 vinicius>
 
 ;; This file is part of GNU Emacs.
 
@@ -1039,9 +1038,12 @@ the sequence."
            /BOTTOM LLY def
            currentfont /RelativeCompose known {
                /relative currentfont /RelativeCompose get def
+               relative false eq {
+                   %% Disable relative composition by setting sufficiently low
+                   %% and high positions.
+                   /relative [ -100000 100000 ] def
+               } if
            } {
-               %% Disable relative composition by setting sufficiently low
-               %% and high positions.
                /relative [ -100000 100000 ] def
            } ifelse
            [ elt 0 0 ]
@@ -1236,7 +1238,7 @@ NewBitmapDict
        } ifelse
        /FirstCode -1 store
 
-       bmp 0 get SpaceWidthRatio ratio div mul size div 0      % wx wy
+       bmp 0 get size div 0            % wx wy
        setcharwidth                    % We can't use setcachedevice here.
 
        bmp 1 get 0 gt bmp 2 get 0 gt and {
@@ -1412,7 +1414,8 @@ FONTTAG should be a string \"/h0\" or \"/h1\"."
        (goto-char from)
        (while (and (<= (length char-pos-list) max-unprintable-chars)
                    (re-search-forward "\\cu" to t))
-         (push (cons (preceding-char) (1- (point))) char-pos-list))))
+         (or (aref ps-print-translation-table (preceding-char))
+             (push (cons (preceding-char) (1- (point))) char-pos-list)))))
     (with-output-to-temp-buffer "*Warning*"
       (with-current-buffer standard-output
        (when char-pos-list
@@ -1578,5 +1581,9 @@ This checks if all multi-byte characters in the region are printable or not."
 
 (provide 'ps-mule)
 
-;;; arch-tag: bca017b2-66a7-4e59-8584-103e749eadbe
+;; Local Variables:
+;; generated-autoload-file: "ps-print.el"
+;; End:
+
+;; arch-tag: bca017b2-66a7-4e59-8584-103e749eadbe
 ;;; ps-mule.el ends here