Fix background height

2 files changed, 18 insertions, 24 deletions

diff --git a/etc/ChangeLog.unicode b/etc/ChangeLog.unicode
index cbb310093e7..249eecc555b 100644
--- a/etc/ChangeLog.unicode
+++ b/etc/ChangeLog.unicode
@@ -1,3 +1,7 @@
+2007-01-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-prin1.ps (printBackground): Fix background height.
+
 2006-07-07  Kenichi Handa  <handa@m17n.org>
 
         * HELLO: Sync with HEAD.
@@ -70,7 +74,7 @@
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
+    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2007
         Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 2b4808c789c..3ab3d6176f6 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,7 +1,7 @@
 % === 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, 2007  Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
@@ -429,14 +429,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 +772,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