Merge from emacs--rel--22

[gnu-emacs] / etc / ps-prin1.ps

diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 2b4808c789c5f2ac86cf472013bd7511d97c8bb6..36e0efeb0c84ac044a9f1a30f634ac1606e3a6ee 100644 (file)
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,13 +1,14 @@
 % === BEGIN ps-print prologue 1
-% version: 6.0
+% version: 6.1
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+%   Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
 % 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 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 %
 % GNU Emacs is distributed in the hope that it will be useful,
@@ -429,14 +430,16 @@ StandardEncoding 46 82 getinterval aload pop
 % stack: --
 /printBackground{
   /BackgroundColor where{
+    /LHg LineHeight 0.65 mul def
+    /PHg PrintHeight LHg add def
     pop gsave BackgroundColor SetColor
     NumberOfColumns{
      gsave
-     0 LineHeight 0.65 mul rmoveto
+     0 LHg rmoveto
      PrintWidth 0 rlineto
-     0 PrintHeight neg rlineto
+     0 PHg neg rlineto
      PrintWidth neg 0 rlineto
-     0 PrintHeight rlineto
+     0 PHg rlineto
      fill
      grestore
      PrintWidth InterColumn add 0 rmoveto
@@ -770,28 +773,16 @@ StandardEncoding 46 82 getinterval aload pop
   /is_right exch def
   HFStart moveto
   { % ---- process the lines
-   dup 0 get F
+   aload pop
+   exch F
    gsave
+    dup xcheck{exec}if
     is_right{
-     PrintHeaderWidth HFPad HFPad add sub 0 rmoveto
-     dup{
-      dup type /nametype eq{
-       pop
-      }{
-        dup xcheck{exec}if
-       stringwidth pop neg 0 rmoveto
-      }ifelse
-     } forall
+     dup stringwidth pop
+     PrintHeaderWidth exch sub HFPad HFPad add sub 0 rmoveto
     }if
     HFColor SetColor
-    {
-     dup type /nametype eq {
-       pop
-     }{
-       dup xcheck{exec}if
-       show
-     } ifelse
-    } forall
+    show
    grestore
    0 HFLineHeight neg rmoveto
   }forall