From: Kenichi Handa <handa@m17n.org>
Date: Fri, 26 Sep 2003 11:28:16 +0000 (+0000)
Subject: (HeaderOrFooterTextLines): Handle multiple strings in a line.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1819
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7894f8e97c37266a18a1ea617aa61213685b1b2;p=emacs.git

(HeaderOrFooterTextLines): Handle multiple strings in a line.
---

diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 1716562b0f4..f21acd54cd3 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -767,16 +767,28 @@ StandardEncoding 46 82 getinterval aload pop
   /is_right exch def
   HFStart moveto
   { % ---- process the lines
-   aload pop
-   exch F
+   dup 0 get F
    gsave
-    dup xcheck{exec}if
     is_right{
-     dup stringwidth pop
-     PrintHeaderWidth exch sub HFPad HFPad add sub 0 rmoveto
+     PrintHeaderWidth HFPad HFPad add sub 0 rmoveto
+     dup{
+      dup type /nametype eq{
+	pop
+      }{
+        dup xcheck{exec}if
+	stringwidth pop neg 0 rmoveto
+      }ifelse
+     } forall
     }if
     HFColor SetColor
-    show
+    {
+     dup type /nametype eq {
+       pop
+     }{
+       dup xcheck{exec}if
+       show
+     } ifelse
+    } forall
    grestore
    0 HFLineHeight neg rmoveto
   }forall