update to newer version 1.64 from http://www.ipv6.tm.uka.de/~bless/ps2eps

minor changes to Makefile.in (which is our own, not from upstream)


git-svn-id: svn://tug.org/texlive/trunk@6665 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 42 insertions, 16 deletions

diff --git a/Build/source/utils/ps2eps/Changes.txt b/Build/source/utils/ps2eps/Changes.txt
index ccd6eb23237..50af3dfbe34 100644
--- a/Build/source/utils/ps2eps/Changes.txt
+++ b/Build/source/utils/ps2eps/Changes.txt
@@ -1,15 +1,28 @@
 ----------------------------
 Detailed Change Log:
 ----------------------------
+revision 1.64
+date: 2007-01-24 13:32:59 +0100;  author: bless;  state: Exp;  lines: +4 -4;
+- Year (C) update
+----------------------------
+revision 1.63
+date: 2007-01-24 13:29:37 +0100;  author: bless;  state: Exp;  lines: +3 -3;
+- Tried to make DSCfilter command more robust
+----------------------------
+revision 1.62 (not released)
+date: 2007-01-06 23:27:47 +0100;  author: bless;  state: Exp;  lines: +11 -5;
+- better detection for files that have a binary heading stuff containing
+  even %! as character sequence
+----------------------------
 revision 1.61
 date: 2006-12-28 17:34:06 +0100;  author: bless;  state: Exp;  lines: +5 -5;
 - changed year in comment and info printout only
 ----------------------------
-revision 1.60
+revision 1.60 (not released)
 date: 2006-12-28 17:31:39 +0100;  author: bless;  state: Exp;  lines: +9 -13;
 - incorporated changes for Windows/Cygwin detection by Karl Berry
 ----------------------------
-revision 1.59
+revision 1.59 (not released)
 date: 2006-04-04 11:04:47 +0200;  author: bless;  state: Exp;  lines: +4 -4;
 - removed surrounding ticks '' for -c $translation in $translatecmd
   (hint by Thomas Riedle)
diff --git a/Build/source/utils/ps2eps/Makefile.in b/Build/source/utils/ps2eps/Makefile.in
index 70c3a258bee..f7dd345b3c6 100644
--- a/Build/source/utils/ps2eps/Makefile.in
+++ b/Build/source/utils/ps2eps/Makefile.in
@@ -13,6 +13,8 @@ datarootdir = @datarootdir@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 mandir = @mandir@
+manext = 1
+man1dir = $(mandir)/man$(manext)
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -28,16 +30,17 @@ bbox: bbox.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 
 install: bbox
-	$(INSTALL) -d $(bindir) $(mandir)/man1
+	$(INSTALL) -d $(bindir)
+	$(INSTALL) -d $(man1dir)
 	$(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps
 	$(INSTALL_PROGRAM) bbox $(bindir)/bbox
-	$(INSTALL_DATA) $(srcdir)/ps2eps.1 $(mandir)/man1/ps2eps.1
-	$(INSTALL_DATA) $(srcdir)/bbox.1 $(mandir)/man1/bbox.1
+	$(INSTALL_DATA) $(srcdir)/ps2eps.1 $(man1dir)/ps2eps.1
+	$(INSTALL_DATA) $(srcdir)/bbox.1 $(man1dir)/bbox.1
 
 check:
 
 uninstall:
-	-rm -f $(bindir)/ps2eps $(bindir)/bbox $(mandir)/man1/ps2eps.1 $(mandir)/man1/bbox.1
+	-rm -f $(bindir)/ps2eps $(bindir)/bbox $(man1dir)/ps2eps.1 $(man1dir)/bbox.1
 
 clean:
 	-rm -f bbox bbox.o
diff --git a/Build/source/utils/ps2eps/README.txt b/Build/source/utils/ps2eps/README.txt
index 4242db6c342..0f9784de357 100644
--- a/Build/source/utils/ps2eps/README.txt
+++ b/Build/source/utils/ps2eps/README.txt
@@ -1,6 +1,10 @@
 DOCUMENTATION
 =============
 Please see documentation in the manpage or doc/ sub directory.
+Note that the manpage may have an older version number in it,
+which is nothing to worry about since there may have been minor changes 
+incorporated into ps2eps not requiring any update of the 
+documentation.
 
 INSTALLATION
 ============
diff --git a/Build/source/utils/ps2eps/ps2eps b/Build/source/utils/ps2eps/ps2eps
index aeb0e9a8e43..7092cbb0007 100755
--- a/Build/source/utils/ps2eps/ps2eps
+++ b/Build/source/utils/ps2eps/ps2eps
@@ -3,9 +3,9 @@
 # {#!/usr/bin/perl}.   
 # ps2eps - convert PostScript to EPS (Encapsulated PostScript) files
 # -------------------------------------------------------------------
-# $Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $
+# $Id: ps2eps,v 1.64 2007/01/24 12:32:59 bless Exp $
 # -------------------------------------------------------
-# (C)opyright 1999-2006 Roland Bless
+# (C)opyright 1999-2007 Roland Bless
 #
 # This program is free software; you can redistribute it and/or modify     
 # it under the terms of the GNU General Public License as published by     
@@ -57,7 +57,7 @@ else
 
 $bboxver=`bbox >$NULLDEV -V`;
 $bboxname= ($?== -1) ? "" : "bbox";
-$version= '$Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $'; #'
+$version= '$Id: ps2eps,v 1.64 2007/01/24 12:32:59 bless Exp $'; #'
 $insertPScode= 1;     # Insert surrounding Postscript code
 $infhandle = STDIN;   # Standard input is the default input file
 $outfhandle = STDOUT; # Standard output is default output if STDIN is input
@@ -144,7 +144,7 @@ $licensetxt= "\
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n";
 
 @prgidtxt= ( "$prgname - convert PostScript to EPS (Encapsulated PostScript) files\n",
-	     "(C)opyright 1998-2006 Roland Bless\n\n" );
+	     "(C)opyright 1998-2007 Roland Bless\n\n" );
 
 @helptxt= ("Version: $ver[2]\n",
           "Operation:\n",
@@ -670,11 +670,17 @@ while ($infname= (shift @filenames))
     {
       if ( /%!/ ) # This is usually the smallest magic sequence
       {           # Note: Adobe Photoshop generated a binary heading, so ^ is not applicable
-	if (! /%!PS-Adobe.*/i) # some strange programs use other magics
+	# %! may be part of a binary sequence, but then control characters follow
+        # so skip %! if non alphanumeric characters follow
+	if ( ! /%!.*[^\w]{2,}/ )
 	{
-	   print STDERR "** Warning **: Weird heading line -- ",$_," -- ";
+	  # some heading without two control characters found
+	  $before_startps= 0;
+	  if (! /%!PS-Adobe.*/i) # some strange programs use other magics
+	  {
+	      print STDERR "** Warning **: Weird heading line -- ",$_," -- ";
+	  }
 	}
-	$before_startps= 0; 
       }
       next CREATEOUTPUT;
     }
@@ -863,7 +869,7 @@ while ($infname= (shift @filenames))
 	       ||
                /$linefilter/             # lines by linefilter
 	       ||
-	       ($removeDSC && (/^%( |!)(\w )+/ || /^%%/)) # any type of structured comment
+	       ($removeDSC && (/^%( |!)(\w )+/ || /^%%([A-Za-z]+\s)/)) # any type of structured comment
 	       ||
 	       ($removeADO && 
 		(/^statusdict begin.*ProductName.*print product print.*flush end\r?\n?$/ ||
diff --git a/Build/source/utils/ps2eps/ps2eps.1 b/Build/source/utils/ps2eps/ps2eps.1
index 53ff0fa1393..4c0c674ada8 100644
--- a/Build/source/utils/ps2eps/ps2eps.1
+++ b/Build/source/utils/ps2eps/ps2eps.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "PS2EPS" "1" "28 Dezember 2006" "" ""
+.TH "PS2EPS" "1" "24 Januar 2007" "" ""
 
 .SH NAME
 ps2eps \- convert PostScript to EPS (Encapsulated PostScript) files
@@ -13,7 +13,7 @@ ps2eps \- convert PostScript to EPS (Encapsulated PostScript) files
 
 .SH "DESCRIPTION"
 .PP
-This manual page documents \fBps2eps\fR version 1.61.
+This manual page documents \fBps2eps\fR version 1.64.
 .PP
 \fBps2eps\fR is a tool (written in Perl) to produce 
 Encapsulated PostScript Files (EPS/EPSF) from usual one-paged Postscript