Fix background height

4 files changed, 28 insertions, 33 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
diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 0f439efb050..0756213576b 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,8 +1,13 @@
+2007-01-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+        * ps-print.ps: Fix background height.
+        (ps-print-version): New version 7.2.1.
+
 2007-01-25  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el: Split XEmacs/Emacs definitions and sample setup code
         into separate files.
-        (ps-print-version): New Version 7.2.
+        (ps-print-version): New version 7.2.
         (ps-postscript-code-directory): Fix XEmacs initialization.
         (ps-generate-postscript-with-faces): Call
         ps-generate-postscript-with-faces1 (new fun).
@@ -60,7 +65,7 @@
 
         * ps-print.el: Handle frame parameters (background and/or foreground
         colors) changing dynamically.  Reported by Leo <sdl.web@gmail.com>.
-        (ps-print-version): New Version 7.1.
+        (ps-print-version): New version 7.1.
         (ps-x-frame-property, ps-e-frame-parameter): New aliases.
         (ps-frame-parameter): New fun.
         (ps-default-fg, ps-default-bg): New default value ('frame-parameter).
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index dfdfb2c52b9..67152c81034 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -10,11 +10,11 @@
 ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
 ;;      Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript
-;; Version: 7.2
+;; Version: 7.2.1
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
-(defconst ps-print-version "7.2"
-  "ps-print.el, v 7.2 <2007/01/19 vinicius>
+(defconst ps-print-version "7.2.1"
+  "ps-print.el, v 7.2.1 <2007/01/26 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -2938,8 +2938,6 @@ Valid values are:
 
    frame-parameter      The foreground-color frame parameter will be used.
 
-   frame-parameter      The foreground-color frame parameter will be used.
-
    NUMBER       It's a real value between 0.0 (black) and 1.0 (white) that
                 indicate the gray color.
 
@@ -2983,8 +2981,6 @@ Valid values are:
 
    frame-parameter      The background-color frame parameter will be used.
 
-   frame-parameter      The background-color frame parameter will be used.
-
    NUMBER       It's a real value between 0.0 (black) and 1.0 (white) that
                 indicate the gray color.