--- vflib-source/gs7.04-j-vlib.diff.vflib.fixup	Sat Feb  2 22:40:12 2002
+++ vflib-source/gs7.04-j-vlib.diff	Sun May  4 00:30:29 2003
@@ -1,41 +1,36 @@
-diff -Nur gs7.04-orig/lib/bdftops gs7.04/lib/bdftops
---- gs7.04-orig/lib/bdftops	Wed Mar 28 06:15:55 2001
-+++ gs7.04/lib/bdftops	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/bdftops.vflib	Tue Mar 27 22:15:55 2001
++++ ghostscript-7.05/lib/bdftops	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: bdftops,v 1.2 2001/03/27 21:15:55 alexcher Exp $
 -exec gs -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
 +gswin32c -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
-diff -Nur gs7.04-orig/lib/dvipdf gs7.04/lib/dvipdf
---- gs7.04-orig/lib/dvipdf	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/dvipdf	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/dvipdf.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/dvipdf	Fri May  3 14:57:52 2002
 @@ -37,4 +37,4 @@
  
  # We have to include the options twice because -I only takes effect if it
  # appears before other options.
 -exec dvips -q -f "$infile" | gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
 +dvipsk -Ppdf -D600 -q -f "$infile" | gswin32c $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-diff -Nur gs7.04-orig/lib/eps2eps gs7.04/lib/eps2eps
---- gs7.04-orig/lib/eps2eps	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/eps2eps	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/eps2eps.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/eps2eps	Fri May  3 14:57:52 2002
 @@ -17,4 +17,4 @@
  	exit 1
  fi
  
 -exec gs -q -sDEVICE=epswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
 +gswin32c -q -sDEVICE=epswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
-diff -Nur gs7.04-orig/lib/font2c gs7.04/lib/font2c
---- gs7.04-orig/lib/font2c	Thu Mar 09 17:40:39 2000
-+++ gs7.04/lib/font2c	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/font2c.vflib	Thu Mar  9 08:40:39 2000
++++ ghostscript-7.05/lib/font2c	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: font2c,v 1.1 2000/03/09 08:40:39 lpd Exp $
 -exec gs -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
 +gswin32c -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
-diff -Nur gs7.04-orig/lib/gs_init.ps gs7.04/lib/gs_init.ps
---- gs7.04-orig/lib/gs_init.ps	Fri Feb 01 12:25:45 2002
-+++ gs7.04/lib/gs_init.ps	Sat Feb 02 21:03:11 2002
-@@ -121,6 +121,7 @@
+--- ghostscript-7.05/lib/gs_init.ps.vflib	Mon Apr 15 07:49:43 2002
++++ ghostscript-7.05/lib/gs_init.ps	Fri May  3 14:57:52 2002
+@@ -120,6 +120,7 @@
  currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if
  currentdict /NOPAGEPROMPT known   /NOPAGEPROMPT exch def
  currentdict /NOPAUSE known   /NOPAUSE exch def
@@ -43,70 +38,63 @@
  currentdict /NOPLATFONTS known   /NOPLATFONTS exch def
  currentdict /NOPROMPT known   /NOPROMPT exch def
  % The default value of ORIENT1 is true, not false.
-@@ -1679,6 +1680,12 @@
- % Turn off array packing, since some PostScript code assumes that
+@@ -1686,6 +1687,12 @@
  % procedures are writable.
  false setpacking
-+
+ 
 +% Load the kanji font environment.
 +NOKANJI not {
 +  (metrics2.ps) runlibfile
 +  (kinit.ps) runlibfile
 +} if
- 
++
  (END INIT) VMDEBUG
  
-diff -Nur gs7.04-orig/lib/gsbj gs7.04/lib/gsbj
---- gs7.04-orig/lib/gsbj	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gsbj	Sat Feb 02 22:17:06 2002
+ /.currentuserparams where {
+--- ghostscript-7.05/lib/gsbj.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gsbj	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gsbj,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +gswin32c -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -Nur gs7.04-orig/lib/gsdj gs7.04/lib/gsdj
---- gs7.04-orig/lib/gsdj	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gsdj	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/gsdj.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gsdj	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gsdj,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +gswin32c -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -Nur gs7.04-orig/lib/gsdj500 gs7.04/lib/gsdj500
---- gs7.04-orig/lib/gsdj500	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gsdj500	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/gsdj500.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gsdj500	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gsdj500,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +gswin32c -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -Nur gs7.04-orig/lib/gslj gs7.04/lib/gslj
---- gs7.04-orig/lib/gslj	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gslj	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/gslj.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gslj	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gslj,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +gswin32c -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -Nur gs7.04-orig/lib/gslp gs7.04/lib/gslp
---- gs7.04-orig/lib/gslp	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gslp	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/gslp.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gslp	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gslp,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +gswin32c -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -Nur gs7.04-orig/lib/gsnd gs7.04/lib/gsnd
---- gs7.04-orig/lib/gsnd	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/gsnd	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/gsnd.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/gsnd	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: gsnd,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -DNODISPLAY "$@"
 +gswin32c -DNODISPLAY "$@"
-diff -Nur gs7.04-orig/lib/pdf2dsc gs7.04/lib/pdf2dsc
---- gs7.04-orig/lib/pdf2dsc	Fri Dec 29 14:03:49 2000
-+++ gs7.04/lib/pdf2dsc	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/pdf2dsc.vflib	Fri Dec 29 05:03:49 2000
++++ ghostscript-7.05/lib/pdf2dsc	Fri May  3 14:57:52 2002
 @@ -22,5 +22,5 @@
  dscfile=$2
  : ${dscfile:=`echo $pdffile | sed 's,\.[^/.]*,,'`.dsc}
@@ -114,63 +102,56 @@
 -exec gs -q -dNODISPLAY -dSAFER -dDELAYSAFER\
 +gswin32c -q -dNODISPLAY -dSAFER -dDELAYSAFER\
      -sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
-diff -Nur gs7.04-orig/lib/pdf2ps gs7.04/lib/pdf2ps
---- gs7.04-orig/lib/pdf2ps	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/pdf2ps	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/pdf2ps.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/pdf2ps	Fri May  3 14:57:52 2002
 @@ -26,4 +26,4 @@
  # Doing an initial 'save' helps keep fonts from being flushed between pages.
  # We have to include the options twice because -I only takes effect if it
  # appears before other options.
 -exec gs $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
 +gswin32c $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
-diff -Nur gs7.04-orig/lib/pdfopt gs7.04/lib/pdfopt
---- gs7.04-orig/lib/pdfopt	Mon Jul 23 15:57:27 2001
-+++ gs7.04/lib/pdfopt	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/pdfopt.vflib	Mon Jul 23 07:57:27 2001
++++ ghostscript-7.05/lib/pdfopt	Fri May  3 14:57:52 2002
 @@ -17,4 +17,4 @@
  	exit 1
  fi
  
 -exec gs -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
 +gswin32c -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
-diff -Nur gs7.04-orig/lib/pf2afm gs7.04/lib/pf2afm
---- gs7.04-orig/lib/pf2afm	Sun Feb 04 06:31:40 2001
-+++ gs7.04/lib/pf2afm	Sat Feb 02 22:17:06 2002
+--- ghostscript-7.05/lib/pf2afm.vflib	Sat Feb  3 21:31:40 2001
++++ ghostscript-7.05/lib/pf2afm	Fri May  3 14:57:52 2002
 @@ -5,4 +5,4 @@
  # Output goes to fontfilename.afm, which must not already exist.
  # See pf2afm.ps for more details.
  
 -exec gs -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
 +gswin32c -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
-diff -Nur gs7.04-orig/lib/pfbtopfa gs7.04/lib/pfbtopfa
---- gs7.04-orig/lib/pfbtopfa	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/pfbtopfa	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/pfbtopfa.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/pfbtopfa	Fri May  3 14:57:52 2002
 @@ -13,4 +13,4 @@
      exit 1
  fi
  
 -exec gs -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
 +gswin32c -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
-diff -Nur gs7.04-orig/lib/pphs gs7.04/lib/pphs
---- gs7.04-orig/lib/pphs	Mon Jul 16 01:25:02 2001
-+++ gs7.04/lib/pphs	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/pphs.vflib	Sun Jul 15 17:25:02 2001
++++ ghostscript-7.05/lib/pphs	Fri May  3 14:57:52 2002
 @@ -4,4 +4,4 @@
  #	pphs filename.pdf
  # Output goes to stdout.
  
 -exec gs -q -dNODISPLAY -- pphs.ps "$@"
 +gswin32c -q -dNODISPLAY -- pphs.ps "$@"
-diff -Nur gs7.04-orig/lib/printafm gs7.04/lib/printafm
---- gs7.04-orig/lib/printafm	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/printafm	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/printafm.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/printafm	Fri May  3 14:57:52 2002
 @@ -4,4 +4,4 @@
  #	printafm fontname
  # Output goes to stdout.
  
 -exec gs -q -dNODISPLAY -- printafm.ps "$@"
 +gswin32c -q -dNODISPLAY -- printafm.ps "$@"
-diff -Nur gs7.04-orig/lib/ps2ascii gs7.04/lib/ps2ascii
---- gs7.04-orig/lib/ps2ascii	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/ps2ascii	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2ascii.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/ps2ascii	Fri May  3 14:57:52 2002
 @@ -10,9 +10,9 @@
  
  OPTIONS="-q -dNODISPLAY -dSAFER -dNOBIND -dWRITESYSTEMDICT -dSIMPLE"
@@ -184,12 +165,11 @@
 -	gs $OPTIONS -c save -f ps2ascii.ps "$1" -c quit >"$2"
 +	gswin32c $OPTIONS -c save -f ps2ascii.ps "$1" -c quit >"$2"
  fi
-diff -Nur gs7.04-orig/lib/ps2epsi gs7.04/lib/ps2epsi
---- gs7.04-orig/lib/ps2epsi	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/ps2epsi	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2epsi.vflib	Mon Apr 22 21:18:24 2002
++++ ghostscript-7.05/lib/ps2epsi	Fri May  3 14:57:52 2002
 @@ -1,7 +1,7 @@
  #!/bin/sh
- # $Id: ps2epsi,v 1.7 2001/06/22 16:09:22 lpd Exp $
+ # $Id: ps2epsi,v 1.7.2.1 2002/04/22 20:18:24 giles Exp $
  
 -tmpfile=/tmp/ps2epsi$$
 +tmpfile=ps2epsi$$
@@ -214,63 +194,56 @@
  rm -f $tmpfile
  
  (
-diff -Nur gs7.04-orig/lib/ps2pdf gs7.04/lib/ps2pdf
---- gs7.04-orig/lib/ps2pdf	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/ps2pdf	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2pdf.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/ps2pdf	Fri May  3 14:57:52 2002
 @@ -4,4 +4,4 @@
  
  # Currently, we produce PDF 1.2 by default, but this is not guaranteed
  # not to change in the future.
 -exec ps2pdf12 "$@"
 +ps2pdf12 "$@"
-diff -Nur gs7.04-orig/lib/ps2pdf12 gs7.04/lib/ps2pdf12
---- gs7.04-orig/lib/ps2pdf12	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/ps2pdf12	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2pdf12.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/ps2pdf12	Fri May  3 14:57:52 2002
 @@ -2,4 +2,4 @@
  # $Id: ps2pdf12,v 1.1 2000/03/09 08:40:40 lpd Exp $
  # Convert PostScript to PDF 1.2 (Acrobat 3-and-later compatible).
  
 -exec ps2pdfwr -dCompatibilityLevel=1.2 "$@"
 +ps2pdfwr -dCompatibilityLevel=1.2 "$@"
-diff -Nur gs7.04-orig/lib/ps2pdf13 gs7.04/lib/ps2pdf13
---- gs7.04-orig/lib/ps2pdf13	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/ps2pdf13	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2pdf13.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/ps2pdf13	Fri May  3 14:57:52 2002
 @@ -2,4 +2,4 @@
  # $Id: ps2pdf13,v 1.1 2000/03/09 08:40:40 lpd Exp $
  # Convert PostScript to PDF 1.3 (Acrobat 4-and-later compatible).
  
 -exec ps2pdfwr -dCompatibilityLevel=1.3 "$@"
 +ps2pdfwr -dCompatibilityLevel=1.3 "$@"
-diff -Nur gs7.04-orig/lib/ps2pdf14 gs7.04/lib/ps2pdf14
---- gs7.04-orig/lib/ps2pdf14	Mon Sep 11 04:33:47 2000
-+++ gs7.04/lib/ps2pdf14	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2pdf14.vflib	Sun Sep 10 20:33:47 2000
++++ ghostscript-7.05/lib/ps2pdf14	Fri May  3 14:57:52 2002
 @@ -2,4 +2,4 @@
  # $Id: ps2pdf14,v 1.1 2000/09/10 19:33:47 lpd Exp $
  # Convert PostScript to PDF 1.4 (Acrobat 5-and-later compatible).
  
 -exec ps2pdfwr -dCompatibilityLevel=1.4 "$@"
 +ps2pdfwr -dCompatibilityLevel=1.4 "$@"
-diff -Nur gs7.04-orig/lib/ps2pdfwr gs7.04/lib/ps2pdfwr
---- gs7.04-orig/lib/ps2pdfwr	Thu Jan 24 07:07:54 2002
-+++ gs7.04/lib/ps2pdfwr	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2pdfwr.vflib	Tue Jan 22 21:34:04 2002
++++ ghostscript-7.05/lib/ps2pdfwr	Fri May  3 14:57:52 2002
 @@ -33,4 +33,4 @@
  
  # We have to include the options twice because -I only takes effect if it
  # appears before other options.
 -exec gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
 +gswin32c $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
-diff -Nur gs7.04-orig/lib/ps2ps gs7.04/lib/ps2ps
---- gs7.04-orig/lib/ps2ps	Sat Jun 23 01:09:22 2001
-+++ gs7.04/lib/ps2ps	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/ps2ps.vflib	Fri Jun 22 17:09:22 2001
++++ ghostscript-7.05/lib/ps2ps	Fri May  3 14:57:52 2002
 @@ -17,4 +17,4 @@
  	exit 1
  fi
  
 -exec gs -q -sDEVICE=pswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
 +gswin32c -q -sDEVICE=pswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
-diff -Nur gs7.04-orig/lib/pv.sh gs7.04/lib/pv.sh
---- gs7.04-orig/lib/pv.sh	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/pv.sh	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/pv.sh.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/pv.sh	Fri May  3 14:57:52 2002
 @@ -32,6 +32,6 @@
  shift
  trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
@@ -280,22 +253,15 @@
 +dvipsk -Ppdf -D600 -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
 +gswin32 $FILE.$$.pv
  exit 0
-diff -Nur gs7.04-orig/lib/wftopfa gs7.04/lib/wftopfa
---- gs7.04-orig/lib/wftopfa	Thu Mar 09 17:40:40 2000
-+++ gs7.04/lib/wftopfa	Sat Feb 02 22:17:08 2002
+--- ghostscript-7.05/lib/wftopfa.vflib	Thu Mar  9 08:40:40 2000
++++ ghostscript-7.05/lib/wftopfa	Fri May  3 14:57:52 2002
 @@ -1,3 +1,3 @@
  #!/bin/sh
  # $Id: wftopfa,v 1.1 2000/03/09 08:40:40 lpd Exp $
 -exec gs -q -dNODISPLAY -- wftopfa.ps "$@"
 +gswin32c -q -dNODISPLAY -- wftopfa.ps "$@"
-diff -Nur gs7.04-orig/src/Makefile gs7.04/src/Makefile
---- gs7.04-orig/src/Makefile	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/Makefile	Sat Feb 02 21:04:36 2002
-@@ -0,0 +1 @@
-+!include msvc32.mak
-diff -Nur gs7.04-orig/src/VF.h gs7.04/src/VF.h
---- gs7.04-orig/src/VF.h	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/VF.h	Sat Feb 02 21:04:42 2002
+--- ghostscript-7.05/src/VF.h.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/VF.h	Fri May  3 14:57:52 2002
 @@ -0,0 +1,87 @@
 +/*
 + * VF.h
@@ -384,10 +350,9 @@
 +#define  VF_TT_COORDINATES           4
 +
 +#endif /* __VF_H__ */ 
-diff -Nur gs7.04-orig/src/files.h gs7.04/src/files.h
---- gs7.04-orig/src/files.h	Tue Mar 13 16:09:28 2001
-+++ gs7.04/src/files.h	Sat Feb 02 21:11:10 2002
-@@ -120,6 +120,7 @@
+--- ghostscript-7.05/src/files.h.vflib	Fri Feb 22 19:45:55 2002
++++ ghostscript-7.05/src/files.h	Fri May  3 14:57:52 2002
+@@ -118,6 +118,7 @@
  /* Procedures exported by zfile.c. */
  	/* for imainarg.c */
  FILE *lib_fopen(P1(const char *));
@@ -395,10 +360,9 @@
  
  	/* for imain.c */
  int lib_file_open(P7(const char *, uint, byte *, uint, uint *, ref *,
-diff -Nur gs7.04-orig/src/gdevmsxf.c gs7.04/src/gdevmsxf.c
---- gs7.04-orig/src/gdevmsxf.c	Wed Sep 20 04:00:14 2000
-+++ gs7.04/src/gdevmsxf.c	Sat Feb 02 21:12:01 2002
-@@ -333,8 +333,8 @@
+--- ghostscript-7.05/src/gdevmsxf.c.vflib	Fri Feb 22 19:45:56 2002
++++ ghostscript-7.05/src/gdevmsxf.c	Fri May  3 14:57:52 2002
+@@ -331,8 +331,8 @@
  
  /* Render a character. */
  int
@@ -409,10 +373,9 @@
  {
      char chr = (char)xg;
      int code;
-diff -Nur gs7.04-orig/src/gdevxxf.c gs7.04/src/gdevxxf.c
---- gs7.04-orig/src/gdevxxf.c	Wed Sep 20 04:00:23 2000
-+++ gs7.04/src/gdevxxf.c	Sat Feb 02 21:12:45 2002
-@@ -334,7 +334,7 @@
+--- ghostscript-7.05/src/gdevxxf.c.vflib	Fri Feb 22 19:45:57 2002
++++ ghostscript-7.05/src/gdevxxf.c	Fri May  3 14:57:52 2002
+@@ -332,7 +332,7 @@
  
  /* Render a character. */
  private int
@@ -421,10 +384,9 @@
  	      int xo, int yo, gx_color_index color, int required)
  {
      x_xfont *xxf = (x_xfont *) xf;
-diff -Nur gs7.04-orig/src/gxccache.c gs7.04/src/gxccache.c
---- gs7.04-orig/src/gxccache.c	Fri Jul 06 05:36:55 2001
-+++ gs7.04/src/gxccache.c	Sat Feb 02 21:13:51 2002
-@@ -277,6 +277,7 @@
+--- ghostscript-7.05/src/gxccache.c.vflib	Fri Feb 22 19:45:58 2002
++++ ghostscript-7.05/src/gxccache.c	Fri May  3 14:57:52 2002
+@@ -275,6 +275,7 @@
  	 */
  	if (gs_color_writes_pure(pgs)) {
  	    code = (*xf->common.procs->render_char) (xf, xg,
@@ -432,7 +394,7 @@
  					imaging_dev, cx, cy,
  					pdevc->colors.pure, 0);
  	    if_debug8('K', "[K]render_char display: xfont=0x%lx, glyph=0x%lx\n\tdev=0x%lx(%s) x,y=%d,%d, color=0x%lx => %d\n",
-@@ -294,6 +295,7 @@
+@@ -292,6 +293,7 @@
  	    gs_make_mem_mono_device(&mdev, 0, imaging_dev);
  	    gx_open_cache_device(&mdev, cc);
  	    code = (*xf->common.procs->render_char) (xf, xg,
@@ -440,10 +402,9 @@
  				       (gx_device *) & mdev, cx - x, cy - y,
  						     (gx_color_index) 1, 1);
  	    if_debug7('K', "[K]render_char to bits: xfont=0x%lx, glyph=0x%lx\n\tdev=0x%lx(%s) x,y=%d,%d => %d\n",
-diff -Nur gs7.04-orig/src/gxccman.c gs7.04/src/gxccman.c
---- gs7.04-orig/src/gxccman.c	Wed Sep 20 04:00:33 2000
-+++ gs7.04/src/gxccman.c	Sat Feb 02 21:16:59 2002
-@@ -35,6 +35,7 @@
+--- ghostscript-7.05/src/gxccman.c.vflib	Fri Feb 22 19:45:58 2002
++++ ghostscript-7.05/src/gxccman.c	Fri May  3 14:57:52 2002
+@@ -33,6 +33,7 @@
  #include "gxfont.h"
  #include "gxfcache.h"
  #include "gxxfont.h"
@@ -451,7 +412,7 @@
  
  /* Define the descriptors for the cache structures. */
  private_st_cached_fm_pair();
-@@ -216,7 +217,7 @@
+@@ -214,7 +215,7 @@
  
      /* We mustn't attempt to use xfonts for stroked characters, */
      /* because such characters go outside their bounding box. */
@@ -460,7 +421,7 @@
  	gs_matrix mat;
  
  	mat.xx = pair->mxx, mat.xy = pair->mxy;
-@@ -310,6 +311,17 @@
+@@ -308,6 +309,17 @@
      }
  }
  
@@ -478,7 +439,7 @@
  /* Look up an xfont by name. */
  /* The caller must already have done get_xfont_device to get the proper */
  /* device to pass as the first argument to lookup_font. */
-@@ -318,14 +330,27 @@
+@@ -316,14 +328,27 @@
        gs_font_name * pfstr, int encoding_index, const cached_fm_pair * pair,
  		     const gs_matrix * pmat)
  {
@@ -507,10 +468,9 @@
      if_debug1('k', "[k]... xfont=0x%lx\n", (ulong) xf);
      return xf;
  }
-diff -Nur gs7.04-orig/src/gxxfont.h gs7.04/src/gxxfont.h
---- gs7.04-orig/src/gxxfont.h	Wed Sep 20 04:00:40 2000
-+++ gs7.04/src/gxxfont.h	Sat Feb 02 21:17:32 2002
-@@ -124,7 +124,7 @@
+--- ghostscript-7.05/src/gxxfont.h.vflib	Fri Feb 22 19:45:59 2002
++++ ghostscript-7.05/src/gxxfont.h	Fri May  3 14:57:52 2002
+@@ -122,7 +122,7 @@
      /* The target may be any Ghostscript device. */
  
  #define xfont_proc_render_char(proc)\
@@ -519,9 +479,8 @@
      int x, int y, gx_color_index color, int required))
      xfont_proc_render_char((*render_char));
  
-diff -Nur gs7.04-orig/src/gxxfvf.c gs7.04/src/gxxfvf.c
---- gs7.04-orig/src/gxxfvf.c	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/gxxfvf.c	Sat Feb 02 21:34:18 2002
+--- ghostscript-7.05/src/gxxfvf.c.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/gxxfvf.c	Fri May  3 14:57:52 2002
 @@ -0,0 +1,479 @@
 +/*
 +Akira Tanaka <akr@jaist.ac.jp> created for gs5.10-vflib-1.4. 1998/05/13
@@ -1002,9 +961,8 @@
 +
 +  return code;
 +}
-diff -Nur gs7.04-orig/src/gxxfvf.h gs7.04/src/gxxfvf.h
---- gs7.04-orig/src/gxxfvf.h	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/gxxfvf.h	Sat Feb 02 21:05:04 2002
+--- ghostscript-7.05/src/gxxfvf.h.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/gxxfvf.h	Fri May  3 14:57:52 2002
 @@ -0,0 +1,75 @@
 +/* gxxfvfsvf.h */
 +/* eXternal Font interface for VFlib */
@@ -1081,9 +1039,8 @@
 +gx_xfont *vf_lookup_font_by_name(P6(const byte *fname, uint len,
 +  int encoding_index, const gs_uid *puid, const gs_matrix *pmat,
 +  gs_memory_t *mem));
-diff -Nur gs7.04-orig/src/gxxfvfd.c gs7.04/src/gxxfvfd.c
---- gs7.04-orig/src/gxxfvfd.c	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/gxxfvfd.c	Sat Feb 02 21:05:10 2002
+--- ghostscript-7.05/src/gxxfvfd.c.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/gxxfvfd.c	Fri May  3 14:57:52 2002
 @@ -0,0 +1,228 @@
 +/* gxxfvfl.c */
 +/* eXternal Font implementation for VFlib --- Drawing routines */
@@ -1313,9 +1270,8 @@
 +
 +  return 0;
 +}
-diff -Nur gs7.04-orig/src/gxxfvfp.c gs7.04/src/gxxfvfp.c
---- gs7.04-orig/src/gxxfvfp.c	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/gxxfvfp.c	Sat Feb 02 21:05:16 2002
+--- ghostscript-7.05/src/gxxfvfp.c.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/gxxfvfp.c	Fri May  3 14:57:52 2002
 @@ -0,0 +1,495 @@
 +/* gxxfvfl.c */
 +/* eXternal Font implementation for VFlib --- Painting routines */
@@ -1812,10 +1768,9 @@
 +  if(pwidth) *pwidth = width;
 +  return 0;
 +}
-diff -Nur gs7.04-orig/src/int.mak gs7.04/src/int.mak
---- gs7.04-orig/src/int.mak	Thu Jan 24 07:07:55 2002
-+++ gs7.04/src/int.mak	Sat Feb 02 21:20:53 2002
-@@ -1747,6 +1747,17 @@
+--- ghostscript-7.05/src/int.mak.vflib	Fri Feb 22 19:45:59 2002
++++ ghostscript-7.05/src/int.mak	Fri May  3 14:57:52 2002
+@@ -1745,6 +1745,17 @@
  	$(ADDMOD) $(PSD)pdfread -ps pdf_ops gs_l2img
  	$(ADDMOD) $(PSD)pdfread -ps pdf_base pdf_draw pdf_font pdf_main pdf_sec
  
@@ -1833,9 +1788,8 @@
  # ================ Dependencies for auxiliary programs ================ #
  
  GENINIT_DEPS=$(stdpre_h)
-diff -Nur gs7.04-orig/src/kfutil.c gs7.04/src/kfutil.c
---- gs7.04-orig/src/kfutil.c	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/kfutil.c	Sat Feb 02 21:05:28 2002
+--- ghostscript-7.05/src/kfutil.c.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/kfutil.c	Fri May  3 14:57:52 2002
 @@ -0,0 +1,174 @@
 +/*
 + * kfutil.c --- kanji font utilities
@@ -2011,9 +1965,8 @@
 +		return 0;
 +	};
 +}
-diff -Nur gs7.04-orig/src/kfutil.h gs7.04/src/kfutil.h
---- gs7.04-orig/src/kfutil.h	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/kfutil.h	Sat Feb 02 21:05:32 2002
+--- ghostscript-7.05/src/kfutil.h.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/kfutil.h	Fri May  3 14:57:52 2002
 @@ -0,0 +1,7 @@
 +/*
 +Akira Tanaka <akr@jaist.ac.jp> created for gs5.10-vflib-1.3. 1998/05/12
@@ -2022,10 +1975,9 @@
 +
 +int kf_vmatrix(P5(int jis_code, floatp xcl, floatp ycl, gs_rect *pbbox, gs_matrix *pmat));
 +int kf_is_vchar(P1(int jis_code));
-diff -Nur gs7.04-orig/src/lib.mak gs7.04/src/lib.mak
---- gs7.04-orig/src/lib.mak	Sat Oct 27 01:25:15 2001
-+++ gs7.04/src/lib.mak	Sat Feb 02 21:23:40 2002
-@@ -353,6 +353,8 @@
+--- ghostscript-7.05/src/lib.mak.vflib	Wed Apr 10 01:53:33 2002
++++ ghostscript-7.05/src/lib.mak	Fri May  3 14:57:52 2002
+@@ -351,6 +351,8 @@
  gxtext_h=$(GLSRC)gxtext.h $(gsrefct_h) $(gstext_h)
  gxtmap_h=$(GLSRC)gxtmap.h
  gxxfont_h=$(GLSRC)gxxfont.h $(gsccode_h) $(gsmatrix_h) $(gsuid_h) $(gsxfont_h)
@@ -2034,7 +1986,7 @@
  # The following are out of order because they include other files.
  gxband_h=$(GLSRC)gxband.h $(gxclio_h)
  gxcdevn_h=$(GLSRC)gxcdevn.h $(gsrefct_h) $(gxcindex_h)
-@@ -643,6 +645,21 @@
+@@ -641,6 +643,21 @@
   $(gzcpath_h) $(gzline_h) $(gzpath_h)
  	$(GLCC) $(GLO_)gxstroke.$(OBJ) $(C_) $(GLSRC)gxstroke.c
  
@@ -2056,7 +2008,7 @@
  ###### Higher-level facilities
  
  $(GLOBJ)gsalpha.$(OBJ) : $(GLSRC)gsalpha.c $(GX)\
-@@ -969,13 +986,14 @@
+@@ -975,13 +992,14 @@
  LIB8x=$(GLOBJ)gxpaint.$(OBJ) $(GLOBJ)gxpath.$(OBJ) $(GLOBJ)gxpath2.$(OBJ)
  LIB9x=$(GLOBJ)gxpcopy.$(OBJ) $(GLOBJ)gxpdash.$(OBJ) $(GLOBJ)gxpflat.$(OBJ)
  LIB10x=$(GLOBJ)gxsample.$(OBJ) $(GLOBJ)gxstroke.$(OBJ) $(GLOBJ)gxsync.$(OBJ)
@@ -2072,7 +2024,7 @@
  LIBd=$(LIB1d) $(LIB2d) $(LIB3d) $(LIB4d)
  LIB_ALL=$(LIBs) $(LIBx) $(LIBd)
  # We include some optional library modules in the dependency list,
-@@ -1009,6 +1027,7 @@
+@@ -1015,6 +1033,7 @@
  	$(ADDMOD) $(GLD)libx $(LIB8x)
  	$(ADDMOD) $(GLD)libx $(LIB9x)
  	$(ADDMOD) $(GLD)libx $(LIB10x)
@@ -2080,10 +2032,9 @@
  	$(ADDMOD) $(GLD)libx -imageclass 1_simple 3_mono
  	$(ADDMOD) $(GLD)libx -imagetype 1 mask1
  
-diff -Nur gs7.04-orig/src/msvc32.mak gs7.04/src/msvc32.mak
---- gs7.04-orig/src/msvc32.mak	Fri Feb 01 15:27:58 2002
-+++ gs7.04/src/msvc32.mak	Sat Feb 02 21:28:13 2002
-@@ -42,28 +42,28 @@
+--- ghostscript-7.05/src/msvc32.mak.vflib	Fri Apr 19 07:32:22 2002
++++ ghostscript-7.05/src/msvc32.mak	Fri May  3 14:57:52 2002
+@@ -40,28 +40,28 @@
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
  
  !ifndef BINDIR
@@ -2120,7 +2071,7 @@
  !endif
  
  # Define the root directory for Ghostscript installation.
-@@ -72,7 +72,7 @@
+@@ -70,7 +70,7 @@
  AROOTDIR=c:/gs
  !endif
  !ifndef GSROOTDIR
@@ -2129,7 +2080,7 @@
  !endif
  
  # Define the directory that will hold documentation at runtime.
-@@ -88,7 +88,7 @@
+@@ -86,7 +86,7 @@
  # illegal escape.
  
  !ifndef GS_LIB_DEFAULT
@@ -2138,7 +2089,7 @@
  !endif
  
  # Define whether or not searching for initialization files should always
-@@ -126,7 +126,7 @@
+@@ -124,7 +124,7 @@
  # Leave TDEBUG set to 1.
  
  !ifndef TDEBUG
@@ -2147,7 +2098,7 @@
  !endif
  
  # Setting NOPRIVATE=1 makes private (static) procedures and variables public,
-@@ -199,7 +199,7 @@
+@@ -197,7 +197,7 @@
  # See icclib.mak for more information
  
  !ifndef ICCSRCDIR
@@ -2156,7 +2107,7 @@
  !endif
  
  # Define the directory where the ijs source is stored,
-@@ -207,7 +207,7 @@
+@@ -205,7 +205,7 @@
  # See ijs.mak for more information.
  
  !ifndef IJSSRCDIR
@@ -2165,7 +2116,7 @@
  IJSEXECTYPE=win
  !endif
  
-@@ -236,7 +236,7 @@
+@@ -234,7 +234,7 @@
  # (currently, 4, 5, and 6 are supported).
  
  !ifndef MSVC_VERSION 
@@ -2174,7 +2125,7 @@
  !endif
  
  # Define the drive, directory, and compiler name for the Microsoft C files.
-@@ -261,7 +261,7 @@
+@@ -259,7 +259,7 @@
  
  !if $(MSVC_VERSION) == 5
  ! ifndef DEVSTUDIO
@@ -2183,7 +2134,7 @@
  ! endif
  !if "$(DEVSTUDIO)"==""
  COMPBASE=
-@@ -433,7 +433,7 @@
+@@ -444,7 +444,7 @@
  # Choose the language feature(s) to include.  See gs.mak for details.
  
  !ifndef FEATURE_DEVS
@@ -2192,7 +2143,7 @@
  !endif
  
  # Choose whether to compile the .ps initialization files into the executable.
-@@ -540,9 +540,15 @@
+@@ -551,9 +551,15 @@
  GSDLL_DLL=$(BINDIR)\$(GSDLL).dll
  GSDLL_OBJS=$(GLOBJ)gsdll.$(OBJ) $(GLOBJ)gp_msdll.$(OBJ)
  
@@ -2208,31 +2159,9 @@
  
  !if $(MAKEDLL)
  # The graphical small EXE loader
-diff -Nur gs7.04-orig/src/msvccmd.mak gs7.04/src/msvccmd.mak
---- gs7.04-orig/src/msvccmd.mak	Wed Jun 13 08:06:19 2001
-+++ gs7.04/src/msvccmd.mak	Sat Feb 02 21:29:03 2002
-@@ -35,7 +35,7 @@
- #else $(MSVC_VERSION) != 4
- 
- # MSVC 5.x does recognize /QI0f.
--QI0f=/QI0f
-+QI0f=/QI0f /QIfdiv-
- 
- # Define separate CCAUX command-line switch that must be at END of line.
- 
-@@ -162,7 +162,7 @@
- 
- # The /MT is for multi-threading.  We would like to make this an option,
- # but it's too much work right now.
--GENOPT=$(CP) $(CD) $(CT) $(CS) /W2 /nologo /MT
-+GENOPT=$(CP) $(CD) $(CT) $(CS) /w /nologo /MT
- 
- CCFLAGS=$(PLATOPT) $(FPFLAGS) $(CPFLAGS) $(CFLAGS) $(XCFLAGS)
- CC=$(COMP) /c $(CCFLAGS) @$(GLGENDIR)\ccf32.tr
-diff -Nur gs7.04-orig/src/winlib.mak gs7.04/src/winlib.mak
---- gs7.04-orig/src/winlib.mak	Fri Feb 01 12:30:13 2002
-+++ gs7.04/src/winlib.mak	Sat Feb 02 21:29:28 2002
-@@ -66,9 +66,9 @@
+--- ghostscript-7.05/src/winlib.mak.vflib	Fri Feb 22 19:46:00 2002
++++ ghostscript-7.05/src/winlib.mak	Fri May  3 14:57:52 2002
+@@ -64,9 +64,9 @@
  # We also have to use a batch file for for the equivalent of rm -f,
  # because the DOS ERASE command returns an error status if the file
  # doesn't exist.
@@ -2245,25 +2174,26 @@
  
  # Define the generic compilation flags.
  
-diff -Nur gs7.04-orig/src/zfile.c gs7.04/src/zfile.c
---- gs7.04-orig/src/zfile.c	Thu Jan 31 05:08:31 2002
-+++ gs7.04/src/zfile.c	Sat Feb 02 21:19:46 2002
-@@ -1223,3 +1223,12 @@
-     }
+--- espgs-7.05.6/src/zfile.c.vflib      Sun Jul 21 06:03:21 2002
++++ espgs-7.05.6/src/zfile.c    Sun May  4 00:18:01 2003
+@@ -1232,6 +1232,15 @@
      return 0;
  }
-+
+
 +FILE *
 +lib_ffopen(const char *bname, char *rfname, int maxflen)
 +{
 +  FILE *file = NULL;
-+  int code = lib_file_fopen(iodev_default, bname, "r", &file, 
++  int code = lib_file_fopen(iodev_default, bname, "r", &file,
 +                                 rfname, maxflen);
 +  return (code < 0 ? NULL : file);
 +}
-diff -Nur gs7.04-orig/src/zkfvflib.c gs7.04/src/zkfvflib.c
---- gs7.04-orig/src/zkfvflib.c	Thu Jan 01 09:00:00 1970
-+++ gs7.04/src/zkfvflib.c	Sat Feb 02 21:05:42 2002
++
+ /* for dmprt searching current path */
+ FILE *
+ lib_fopen2(const char *bname)
+--- ghostscript-7.05/src/zkfvflib.c.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/src/zkfvflib.c	Fri May  3 14:57:52 2002
 @@ -0,0 +1,80 @@
 +/*
 + * zkfvflib.c --- Kanji font operator for VFlib.
@@ -2345,9 +2275,86 @@
 +  {"3kfVFlib", zkfVFlib},
 +  op_def_end(0)
 +};
-diff -Nur gs7.04-orig/vflib/allkanji.ps gs7.04/vflib/allkanji.ps
---- gs7.04-orig/vflib/allkanji.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/allkanji.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/src/ugcclib.mak.vflib	Fri Apr 19 07:32:22 2002
++++ ghostscript-7.05/src/ugcclib.mak	Fri May  3 14:57:52 2002
+@@ -153,7 +153,7 @@
+ LIB_ONLY=$(GLOBJ)gslib.$(OBJ) $(GLOBJ)gsnogc.$(OBJ) $(GLOBJ)gconfig.$(OBJ) $(GLOBJ)gscdefs.$(OBJ)
+ ldt_tr=$(GLOBJ)ldt.tr
+ $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(LIB_ALL) $(DEVS_ALL) $(LIB_ONLY)
+-	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
++	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) $(VFLIBDIRS) -o $(GS_XE)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(LIB_ONLY) -s
+ 	cat $(ld_tr) >>$(ldt_tr)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
+--- ghostscript-7.05/src/unixtrad.mak.vflib	Fri Apr 19 07:32:22 2002
++++ ghostscript-7.05/src/unixtrad.mak	Fri May  3 14:57:52 2002
+@@ -71,7 +71,7 @@
+ # Define the default directory/ies for the runtime initialization and
+ # font files.  Separate multiple directories with a :.
+ 
+-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
++GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdatadir)/vflib:$(gsdir)/fonts
+ 
+ # Define whether or not searching for initialization files should always
+ # look in the current directory first.  This leads to well-known security
+@@ -265,6 +265,14 @@
+ XLIBDIR=
+ XLIBS=Xt Xext X11
+ 
++# Define the directory/ies for the VFlib files.
++#VFINCLUDE=-I/usr/local/include
++#VFLIBDIRS=-L/usr/local/lib
++#VFLIBS=VFlib
++VFINCLUDE=
++VFLIBDIRS=
++VFLIBS=VFlib2 ttf
++
+ # Define whether this platform has floating point hardware:
+ #	FPU_TYPE=2 means floating point is faster than fixed point.
+ # (This is the case on some RISCs with multiple instruction dispatch.)
+@@ -291,7 +299,7 @@
+ 
+ # Choose the language feature(s) to include.  See gs.mak for details.
+ 
+-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(GLD)pipe.dev
++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(GLD)pipe.dev $(PSD)kfvflib.dev
+ 
+ # Choose whether to compile the .ps initialization files into the executable.
+ # See gs.mak for details.
+--- ghostscript-7.05/src/unixlink.mak.vflib	Fri May  3 15:03:08 2002
++++ ghostscript-7.05/src/unixlink.mak	Fri May  3 15:03:45 2002
+@@ -61,7 +61,7 @@
+ # which has limited environment space.
+ ldt_tr=$(PSOBJ)ldt.tr
+ $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL)
+-	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
++	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) $(VFLIBDIRS) -o $(GS_XE)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gs.$(OBJ) -s
+ 	cat $(ld_tr) >>$(ldt_tr)
+ 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)
+--- ghostscript-7.05/src/unixinst.mak.vflib	Fri May  3 14:58:56 2002
++++ ghostscript-7.05/src/unixinst.mak	Fri May  3 15:03:03 2002
+@@ -51,6 +51,7 @@
+ PSDOCDIR=$(PSLIBDIR)/../doc
+ PSEXDIR=$(PSLIBDIR)/../examples
+ PSMANDIR=$(PSLIBDIR)/../man
++PSVFDIR=$(PSLIBDIR)/../vflib
+ 
+ install-data: install-libdata install-doc install-man install-examples
+ 
+@@ -158,3 +159,10 @@
+ iso2022.ps;\
+ 	do $(INSTALL_DATA) $(PSEXDIR)/cjk/$$f $(exdir)/cjk ;\
+ 	done
++	-mkdir -p $(gsdatadir)/vflib
++	for f in \
++allkanji.ps article9.ps fmaptype.ps hankaku.ps jcidcmap.ps jcidemu.ps \
++jcidinit.ps jcidjp1.ps kbase.ps kcomp.ps kconfig.ps kfcid.ps \
++kfvflib.ps kinit.ps kmapping.ps koutline.ps metrics2.ps vchars.ps vchars1.ps kfvflib.ps;\
++	do if ( test -f $(PSVFDIR)/$$f ); then $(INSTALL_DATA) $(PSVFDIR)/$$f $(vfdir); fi;\
++	done
+--- ghostscript-7.05/vflib/allkanji.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/allkanji.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,102 @@
 +%!PS-Adobe-2.0
 +%
@@ -2451,9 +2458,8 @@
 +	} for
 +} forall
 +showpage
-diff -Nur gs7.04-orig/vflib/article9.ps gs7.04/vflib/article9.ps
---- gs7.04-orig/vflib/article9.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/article9.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/article9.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/article9.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,97 @@
 +%!PS-Adobe-2.0
 +%
@@ -2552,9 +2558,8 @@
 +NEXTLINE
 +
 +showpage
-diff -Nur gs7.04-orig/vflib/fmaptype.ps gs7.04/vflib/fmaptype.ps
---- gs7.04-orig/vflib/fmaptype.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/fmaptype.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/fmaptype.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/fmaptype.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,245 @@
 +%!PS-Adobe-2.0
 +%
@@ -2801,9 +2806,8 @@
 +NEWLINE
 +
 +showpage
-diff -Nur gs7.04-orig/vflib/hankaku.ps gs7.04/vflib/hankaku.ps
---- gs7.04-orig/vflib/hankaku.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/hankaku.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/hankaku.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/hankaku.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,93 @@
 +%!PS-Adobe-2.0
 +%
@@ -2898,9 +2902,8 @@
 +	SHOW_BYTE_CHARS
 +} forall
 +
-diff -Nur gs7.04-orig/vflib/kbase.ps gs7.04/vflib/kbase.ps
---- gs7.04-orig/vflib/kbase.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kbase.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/kbase.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kbase.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,302 @@
 +%
 +% kbase.ps  -  define /basekanji operator
@@ -3204,9 +3207,8 @@
 +
 +	uniqueid end
 +} bind def
-diff -Nur gs7.04-orig/vflib/kcomp.ps gs7.04/vflib/kcomp.ps
---- gs7.04-orig/vflib/kcomp.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kcomp.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/kcomp.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kcomp.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,612 @@
 +%
 +% kcomp.ps  -  define /compositekanji operator
@@ -3820,9 +3822,8 @@
 +
 +  pop pop pop pop pop pop
 +} bind def
-diff -Nur gs7.04-orig/vflib/kconfig.ps gs7.04/vflib/kconfig.ps
---- gs7.04-orig/vflib/kconfig.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kconfig.ps	Wed Nov 03 20:48:16 1999
+--- ghostscript-7.05/vflib/kconfig.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kconfig.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,139 @@
 +%
 +% Kanji Font Configuration File (VFlib: Vector Font library)
@@ -3851,8 +3852,8 @@
 +%
 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 +
-+/Ryumin-Light		4300000	(r-microsoft-mincho)	VFlibkanji
-+/GothicBBB-Medium	4300200	(r-microsoft-gothic)	VFlibkanji
++/Ryumin-Light		4300000	(r-kochi-mincho)	VFlibkanji
++/GothicBBB-Medium	4300200	(r-kochi-gothic)	VFlibkanji
 +
 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 +%
@@ -3963,9 +3964,8 @@
 +
 +% /GothicBBB-Medium /RodinPlus-B copycompfont
 +% /GothicBBB-Medium /RodinPlus-DB copycompfont
-diff -Nur gs7.04-orig/vflib/kfvflib.ps gs7.04/vflib/kfvflib.ps
---- gs7.04-orig/vflib/kfvflib.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kfvflib.ps	Thu Aug 05 01:09:40 1999
+--- ghostscript-7.05/vflib/kfvflib.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kfvflib.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,37 @@
 +%
 +% kfvflib.ps - Configuration for Vector Fonts under `VFlib'.
@@ -4004,9 +4004,8 @@
 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 +
 +end
-diff -Nur gs7.04-orig/vflib/kinit.ps gs7.04/vflib/kinit.ps
---- gs7.04-orig/vflib/kinit.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kinit.ps	Sun Jul 18 22:15:38 1999
+--- ghostscript-7.05/vflib/kinit.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kinit.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,454 @@
 +%
 +% kinit.ps  -  install Kanji fonts
@@ -4462,9 +4461,8 @@
 +end
 +
 +%QUIET not { (done.\n) print flush } if
-diff -Nur gs7.04-orig/vflib/kmapping.ps gs7.04/vflib/kmapping.ps
---- gs7.04-orig/vflib/kmapping.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/kmapping.ps	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/kmapping.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/kmapping.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,155 @@
 +%
 +% Mapping from character names to Kanji JIS code
@@ -4621,9 +4619,8 @@
 +	Private /MappingDict get exch 2 copy known 
 +	{ get Private /MappingOffset get add }{ pop pop 16#2121 } ifelse
 +} def
-diff -Nur gs7.04-orig/vflib/koutline.ps gs7.04/vflib/koutline.ps
---- gs7.04-orig/vflib/koutline.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/koutline.ps	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/koutline.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/koutline.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,62 @@
 +%
 +% koutline.ps  -  define /outlinekanji operator
@@ -4687,9 +4684,8 @@
 +
 +	uniqueid end
 +} def
-diff -Nur gs7.04-orig/vflib/koutline.ps+ gs7.04/vflib/koutline.ps+
---- gs7.04-orig/vflib/koutline.ps+	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/koutline.ps+	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/koutline.ps+.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/koutline.ps+	Fri May  3 14:57:52 2002
 @@ -0,0 +1,64 @@
 +%
 +% koutline.ps  -  define /outlinekanji operator
@@ -4755,9 +4751,8 @@
 +
 +	uniqueid end
 +} def
-diff -Nur gs7.04-orig/vflib/metrics2.ps gs7.04/vflib/metrics2.ps
---- gs7.04-orig/vflib/metrics2.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/metrics2.ps	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/metrics2.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/metrics2.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,97 @@
 +%
 +% wmode.ps  -  define /setmetrics2 operator
@@ -4856,9 +4851,8 @@
 +	
 +	end
 +} bind def
-diff -Nur gs7.04-orig/vflib/vchars.ps gs7.04/vflib/vchars.ps
---- gs7.04-orig/vflib/vchars.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/vchars.ps	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/vchars.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/vchars.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,46 @@
 +%!PS-Adobe-2.0
 +%
@@ -4906,9 +4900,8 @@
 +
 +cshow
 +showpage
-diff -Nur gs7.04-orig/vflib/vchars1.ps gs7.04/vflib/vchars1.ps
---- gs7.04-orig/vflib/vchars1.ps	Thu Jan 01 09:00:00 1970
-+++ gs7.04/vflib/vchars1.ps	Thu Aug 05 01:09:42 1999
+--- ghostscript-7.05/vflib/vchars1.ps.vflib	Fri May  3 14:57:52 2002
++++ ghostscript-7.05/vflib/vchars1.ps	Fri May  3 14:57:52 2002
 @@ -0,0 +1,55 @@
 +%!PS-Adobe-2.0
 +%