rpms/enscript/devel enscript-1.6.4-wrap_header.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: atkac

Update of /cvs/dist/rpms/enscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24325/enscript/devel

Modified Files:
	enscript-1.6.4-wrap_header.patch 
Log Message:
fixed long-header patch
Resolves: #202082


enscript-1.6.4-wrap_header.patch:
 simple.hdr |  112 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 62 insertions(+), 50 deletions(-)

Index: enscript-1.6.4-wrap_header.patch
===================================================================
RCS file: /cvs/dist/rpms/enscript/devel/enscript-1.6.4-wrap_header.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enscript-1.6.4-wrap_header.patch	1 Sep 2006 08:34:39 -0000	1.1
+++ enscript-1.6.4-wrap_header.patch	19 Dec 2006 15:57:29 -0000	1.2
@@ -1,6 +1,6 @@
---- enscript-1.6.4/lib/simple.hdr.wrap_header	2006-09-01 10:26:51.000000000 +0200
-+++ enscript-1.6.4/lib/simple.hdr	2006-09-01 10:25:30.000000000 +0200
-@@ -1,50 +1,72 @@
+--- enscript-1.6.4/lib/simple.hdr.wrap_header	2003-03-05 08:26:30.000000000 +0100
++++ enscript-1.6.4/lib/simple.hdr	2006-12-19 16:36:08.000000000 +0100
+@@ -1,50 +1,62 @@
 -% 
 -% Default simple header.
 -% Copyright (c) 1995 Markku Rossi.
@@ -99,27 +99,17 @@
 +      d_header_w user_header_right_str stringwidth pop sub 5 sub
 +      0 moveto user_header_right_str show
 +    } {
-+      
-+      d_header_w fname stringwidth pop lt 
++      5 0 moveto fmodstr show
++      45 0 rmoveto pagenumstr show
++      fname length d_header_w 6 idiv idiv 1 add 10 mul 5 exch moveto
++      1 1 fname length d_header_w 6 idiv idiv
 +      {
-+        5 10 moveto fname 0 d_header_w 6 idiv getinterval show
-+        5 0 moveto fname d_header_w 6 idiv dup neg fname length add getinterval show
-+        45 0 rmoveto fmodstr show
-+        45 0 rmoveto pagenumstr show
-+      }
-+      {
-+	5 10 moveto fname show
-+        d_header_w fname stringwidth pop fmodstr stringwidth pop add 45 add lt
-+        {
-+          5 0 moveto fmodstr show
-+          45 0 rmoveto pagenumstr show
-+        }
-+        {
-+          45 10 rmoveto fmodstr show
-+          45 10 rmoveto pagenumstr show
-+        } ifelse
-+      } ifelse
-+    } ifelse
++        dup fname exch 1 sub d_header_w 6 idiv mul d_header_w 6 idiv getinterval show
++        5 exch 10 mul fname length d_header_w 6 idiv idiv 1 add 10 mul exch sub moveto
++      } for
++      5 10 moveto
++      fname fname length d_header_w 6 idiv idiv d_header_w 6 idiv mul dup fname length exch sub getinterval show
++    }ifelse
 +
 +  grestore
 +} def