--- 4_1.3/doc/Makefile.orig	Fri Oct  2 17:33:22 1998
+++ 4_1.3/doc/Makefile	Fri Oct  2 17:33:22 1998
@@ -0,0 +1,19 @@
+INSTALL_DOC = /usr/bin/install -c -o root -g wheel -m 644
+CJK_DOC_DIR = $(PREFIX)/share/doc/CJK
+
+#
+# Nothing to be done for "all" "clean"
+#
+all:
+clean:
+
+#
+# Install the documents.
+#
+install: install-chinese-doc
+	$(INSTALL_DOC) `find . -type f |sed -e "s/.[/]//" |sed -e "/[/]/d"` $(CJK_DOC_DIR)
+
+install-chinese-doc:
+	(mkdir -p $(CJK_DOC_DIR)/chinese) && \
+	($(INSTALL_DOC) chinese/* $(CJK_DOC_DIR)/chinese)
+
--- 4_1.3/doc/teTeX/Makefile.orig	Fri Oct  2 17:33:22 1998
+++ 4_1.3/doc/teTeX/Makefile	Fri Oct  2 17:33:22 1998
@@ -0,0 +1,37 @@
+PREFIX = /usr/local
+
+all: patch
+
+patch: MakeXXX-patch config-patch
+
+MakeXXX-patch:
+	patch ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
+	patch ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
+	patch ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
+
+config-patch:
+	patch ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
+	patch ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
+
+uninstall-patch: uninstall-MakeXXX-patch uninstall-config-patch
+
+uninstall-MakeXXX-patch:
+	patch -R ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
+	patch -R ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
+	patch -R ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
+
+uninstall-config-patch:
+	patch -R ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
+	patch -R ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
+
+test-patch: test-MakeXXX-patch test-config-patch
+
+test-MakeXXX-patch:
+	patch -C ${PREFIX}/bin/MakeTeXPK < MakeTeXPK.diff
+	patch -C ${PREFIX}/bin/MakeTeXTFM < MakeTeXTFM.diff
+	patch -C ${PREFIX}/bin/MakeTeXnames < MakeTeXnames.diff
+
+test-config-patch:
+	patch -C ${PREFIX}/share/texmf/fontname/special.map < special.map.diff
+	patch -C ${PREFIX}/share/texmf/web2c/texmf.cnf < texmf.cnf.diff
+
--- 4_1.3/doc/teTeX/MakeTeXPK.diff.orig	Fri Jun 20 11:13:00 1997
+++ 4_1.3/doc/teTeX/MakeTeXPK.diff	Fri Oct  2 17:33:22 1998
@@ -1,65 +1,98 @@
---- MakeTeXPK.orig	Fri Aug  2 20:39:02 1996
-+++ MakeTeXPK	Fri Nov 15 01:24:22 1996
-@@ -65,14 +65,44 @@
- : ${MAKETEXDIR=$TEXMF/maketex}
- export TEXMF MAKETEXDIR
- 
-+: ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
-+: ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
-+export TTF2PKDIR HBF2GFDIR
-+
- # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
- # We have to figure out the name of the base font -- $NAME is probably
- # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
- pattern="^r?$NAME"'(0|8r)?([ 	]|$)' 
- psline=`egrep "$pattern" $PSMAPFILE`
-+pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
-+pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+hbfcfgfile=$HBF2GFDIR/$pattern.cfg
-+
- if test -n "$psline"; then
-   cmd="gsftopk $NAME $DPI"
-   MODE=gsftopk
-+
-+# test for Chinese TTF. We check whether $NAME without the last two digits is
-+# in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
-+# $ttfline) expanded to MakeTTFPK.
-+
-+elif test -n "$ttfline"; then
-+  dottfline="ttfline=\"$ttfline\""
-+  eval "$dottfline"
-+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+  cmd="MakeTTFPK dummy $NAME.${DPI}pk $ff \"$ttfline\" $DPI"
-+  MODE=modeless
-+  psline=ttf2pk
-+
-+# test for CJK bitmap fonts. We check whether $NAME without the last two
-+# digits has a config file in $HBF2GFDIR.
-+
-+elif test -r $hbfcfgfile; then
-+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+  cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
-+  MODE=modeless
-+
- else
-   # If an explicit mode is not supplied, try to guess. You can get a
-   # list of extant modes from ftp.cs.umb.edu:pub/tex/modes.mf.
-@@ -92,7 +122,7 @@
- 
-   # Run Metafont. Always use plain Metafont, since reading cmbase.mf
-   # does not noticeably slow things down.
--  cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
-+  cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
- fi
- 
- donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
-@@ -123,7 +153,7 @@
- eval "$mdir"
- 
- echo "$progname: Running $cmd"
--$cmd </dev/null
-+eval "$cmd </dev/null"
- ret=$?
- if test -z "$psline"; then  
-   test -r $GFNAME ||
+*** MakeTeXPK.teTeX	Fri Aug 22 05:45:35 1997
+--- MakeTeXPK	Fri Jun 12 03:52:38 1998
+***************
+*** 80,93 ****
+  : ${MAKETEXDIR=$TEXMF/maketex}
+  export TEXMF MAKETEXDIR
+  
+  # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
+  # We have to figure out the name of the base font -- $NAME is probably
+  # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
+! pattern="^r?$NAME"'(0|8r)?([ 	]|$)' 
+  psline=`egrep "$pattern" $PSMAPFILE`
+  if test -n "$psline"; then
+    cmd="gsftopk $NAME $DPI"
+    MODE=gsftopk
+    # some installations have set up gs in such a way that creating files
+    # is only allowed if the parameter -DNOSAFER is used:
+    GS_OPTIONS=-DNOSAFER; export GS_OPTIONS
+--- 80,124 ----
+  : ${MAKETEXDIR=$TEXMF/maketex}
+  export TEXMF MAKETEXDIR
+  
++ : ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
++ : ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
++ export TTF2PKDIR HBF2GFDIR
++ 
+  # grep for the font in $PSMAPFILE, if some ps-to-pk is claimed to be supported.
+  # We have to figure out the name of the base font -- $NAME is probably
+  # something like pplr, but it's rpplr or pplr0 or pplr8r that's in psfonts.map.
+! pattern="^r?$NAME"'(0|8r)?([  ]|$)' 
+  psline=`egrep "$pattern" $PSMAPFILE`
++ pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
++ ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
++ pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
++ hbfcfgfile=$HBF2GFDIR/$pattern.cfg
++ 
+  if test -n "$psline"; then
+    cmd="gsftopk $NAME $DPI"
+    MODE=gsftopk
++  
++ # test for Chinese TTF. We check whether $NAME without the last two digits is
++ # in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
++ # $ttfline) expanded to MakeTTFPK.
++ 
++ elif test -n "$ttfline"; then
++   dottfline="ttfline=\"$ttfline\""
++ eval "$dottfline"
++   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
++   cmd="MakeTTFPK dummy $NAME.${DPI}pk $ff \"$ttfline\" $DPI"
++ 
++   MODE=modeless
++   psline=ttf2pk
++ 
++ # test for CJK bitmap fonts. We check whether $NAME without the last two
++ # digits has a config file in $HBF2GFDIR.
++ 
++ elif test -r $hbfcfgfile; then
++   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
++   cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
++   MODE=modeless
++ 
+    # some installations have set up gs in such a way that creating files
+    # is only allowed if the parameter -DNOSAFER is used:
+    GS_OPTIONS=-DNOSAFER; export GS_OPTIONS
+***************
+*** 111,117 ****
+  
+    # Run Metafont. Always use plain Metafont, since reading cmbase.mf
+    # does not noticeably slow things down.
+!   cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
+  fi
+  
+  donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
+--- 142,148 ----
+  
+    # Run Metafont. Always use plain Metafont, since reading cmbase.mf
+    # does not noticeably slow things down.
+!   cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
+  fi
+  
+  donames='set x `MakeTeXnames $NAME $DPI $MODE $DEST`
+***************
+*** 142,148 ****
+  eval "$mdir"
+  
+  echo "$progname: Running $cmd"
+! $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
+  if test -z "$psline"; then  
+    test -r $GFNAME ||
+      { test -r $NAME.`expr $DPI + 1`gf && DPI=`expr $DPI + 1` &&
+--- 173,179 ----
+  eval "$mdir"
+  
+  echo "$progname: Running $cmd"
+! eval $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
+  if test -z "$psline"; then  
+    test -r $GFNAME ||
+      { test -r $NAME.`expr $DPI + 1`gf && DPI=`expr $DPI + 1` &&
--- 4_1.3/doc/teTeX/MakeTeXTFM.diff.orig	Fri Jun 20 11:13:00 1997
+++ 4_1.3/doc/teTeX/MakeTeXTFM.diff	Fri Oct  2 17:33:22 1998
@@ -1,108 +1,137 @@
---- MakeTeXTFM.orig	Fri Aug  2 20:39:17 1996
-+++ MakeTeXTFM	Sun Nov 10 23:05:25 1996
-@@ -41,6 +41,10 @@
- : ${MAKETEXDIR=$TEXMF/maketex}
- export TEXMF MAKETEXDIR
- 
-+: ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
-+: ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
-+export TTF2PKDIR HBF2GFDIR
-+
- # Possible local customizations?
- test -r $MAKETEXDIR/maketex.site && . $MAKETEXDIR/maketex.site
- 
-@@ -48,7 +52,32 @@
- BDPI=${MT_DEF_BDPI-600}
- DPI=$BDPI
- 
--cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
-+pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
-+pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
-+hbfcfgfile=$HBF2GFDIR/$pattern.cfg
-+
-+# test for Chinese TTF. We check whether $NAME without the last two digits is
-+# in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
-+# $ttfline) expanded to MakeTTFPK.
-+
-+if test -n "$ttfline"; then
-+  dottfline="ttfline=\"$ttfline\""
-+  eval "$dottfline"
-+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+  cmd="MakeTTFPK $NAME.tfm dummy $ff \"$ttfline\" $DPI"
-+  MODE=ttf2pk
-+
-+# test for CJK bitmap fonts. We check whether $NAME without the last two
-+# digits has a config file in $HBF2GFDIR.
-+
-+elif test -r $hbfcfgfile; then
-+  ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
-+  cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
-+  MODE=hbf2gf
-+else
-+  cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
-+fi
- 
- set x `MakeTeXnames $NAME $DPI $MODE $DEST`
- PKDEST=$2
-@@ -56,6 +85,7 @@
- PKDESTDIR=`echo $PKDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
- TFMDESTDIR=`echo $TFMDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
- PKNAME=`basename $PKDEST`
-+PLNAME=$NAME.pl
- TFMNAME=$NAME.tfm
- GFNAME=$NAME.$DPI'gf'
- 
-@@ -76,7 +106,10 @@
-   { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
- 
- echo "$progname: Running $cmd"
--$cmd </dev/null
-+eval "$cmd </dev/null"
-+if test "$MODE" = "hbf2gf"; then
-+  pltotf ./$PLNAME $TFMNAME || exit 1
-+fi
- test -f $TFMNAME ||
-   { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
- 
-@@ -93,22 +126,25 @@
- echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
- append_db $TFMDESTDIR $TFMNAME
- 
--MakeTeXmkdir "$PKDESTDIR"
--test -d "$PKDESTDIR" || exit 1
--if test ! -f $PKDESTDIR/$PKNAME; then
--  cd $TEMPDIR
--  test -r $GFNAME ||
--    { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
--  gftopk ./$GFNAME $PKNAME || exit 1
--  mv $PKNAME $PKDESTDIR/pktmp.$$
--  cd $PKDESTDIR
--  if test -f $PKNAME; then
--    rm -f pktmp.$$
--  else
-+# we don't install any .pk files produced ttf2pk or hbf2gf.
-+if test "$MODE" != "hbf2gf" && test "$MODE" != "ttf2pk"; then
-+  MakeTeXmkdir "$PKDESTDIR"
-+  test -d "$PKDESTDIR" || exit 1
-+  if test ! -f $PKDESTDIR/$PKNAME; then
-+    cd $TEMPDIR
-+    test -r $GFNAME ||
-+      { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
-+    gftopk ./$GFNAME $PKNAME || exit 1
-+    mv $PKNAME $PKDESTDIR/pktmp.$$
-     cd $PKDESTDIR
--    mv pktmp.$$ $PKNAME
--    chmod 644 $PKNAME
--    append_db $PKDESTDIR $PKNAME
-+    if test -f $PKNAME; then
-+      rm -f pktmp.$$
-+    else
-+      cd $PKDESTDIR
-+      mv pktmp.$$ $PKNAME
-+      chmod 644 $PKNAME
-+      append_db $PKDESTDIR $PKNAME
-+    fi
-   fi
- fi
- ) 1>&2 </dev/null
+*** MakeTeXTFM.teTeX	Fri Aug 22 05:45:35 1997
+--- MakeTeXTFM	Fri Jun 12 16:17:03 1998
+***************
+*** 41,46 ****
+--- 41,50 ----
+  : ${MAKETEXDIR=$TEXMF/maketex}
+  export TEXMF MAKETEXDIR
+  
++ : ${TTF2PKDIR=`kpsetool -v '$TTF2PKDIR'`}
++ : ${HBF2GFDIR=`kpsetool -v '$HBF2GFDIR'`}
++ export TTF2PKDIR HBF2GFDIR
++ 
+  # Possible local customizations?
+  test -r $MAKETEXDIR/maketex.site && . $MAKETEXDIR/maketex.site
+  
+***************
+*** 48,54 ****
+  BDPI=${MT_DEF_BDPI-600}
+  DPI=$BDPI
+  
+! cmd="mf \mode:=$MODE; mag:=$MAG; scrollmode; input $NAME"
+  
+  set x `MakeTeXnames $NAME $DPI $MODE $DEST`
+  PKDEST=$2
+--- 52,83 ----
+  BDPI=${MT_DEF_BDPI-600}
+  DPI=$BDPI
+  
+! pattern='^'`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
+! ttfline=`egrep "$pattern" $TTF2PKDIR/ttf2pk.cfg | sed -e 's/^.*://'`
+! pattern=`echo $NAME | sed -e 's/[0-9a-f][0-9a-f]$//'`
+! hbfcfgfile=$HBF2GFDIR/$pattern.cfg
+! 
+! # test for Chinese TTF. We check whether $NAME without the last two digits is
+! # in the file $TTF2PKDIR/ttf2pk.cfg; if yes, we forward the complete line (in
+! # $ttfline) expanded to MakeTTFPK.
+! 
+! if test -n "$ttfline"; then
+!   dottfline="ttfline=\"$ttfline\""
+!   eval "$dottfline"
+!   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
+!   cmd="MakeTTFPK $NAME.tfm dummy $ff \"$ttfline\" $DPI"
+!   MODE=ttf2pk
+! 
+! # test for CJK bitmap fonts. We check whether $NAME without the last two
+! # digits has a config file in $HBF2GFDIR.
+! 
+! elif test -r $hbfcfgfile; then
+!   ff=`echo $NAME|sed -e 's/.*\([0-9a-f][0-9a-f]\)$/\1/'`
+!   cmd="hbf2gf $hbfcfgfile $ff $DPI 1.0"
+!   MODE=hbf2gf
+! else
+!   cmd="mf \"\mode:=$MODE; mag:=$MAG; scrollmode; input $NAME\""
+! fi
+  
+  set x `MakeTeXnames $NAME $DPI $MODE $DEST`
+  PKDEST=$2
+***************
+*** 56,61 ****
+--- 85,91 ----
+  PKDESTDIR=`echo $PKDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
+  TFMDESTDIR=`echo $TFMDEST | sed 's/^[^\/]*$/./; s/\/[^\/]*$//'`
+  PKNAME=`basename $PKDEST`
++ PLNAME=$NAME.pl
+  TFMNAME=$NAME.tfm
+  GFNAME=$NAME.$DPI'gf'
+  
+***************
+*** 76,82 ****
+    { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
+  
+  echo "$progname: Running $cmd"
+! $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
+  test -f $TFMNAME ||
+    { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
+  
+--- 106,115 ----
+    { echo "$progname: could not mkdir $TFMDESTDIR."; exit 1; }
+  
+  echo "$progname: Running $cmd"
+! eval $cmd </dev/null || { echo "$progname: \`$cmd' failed." >&2; exit 1; }
+! if test "$MODE" = "hbf2gf"; then
+!   pltotf ./$PLNAME $TFMNAME || exit 1
+! fi
+  test -f $TFMNAME ||
+    { echo "$progname: '$cmd' failed to make $TFMNAME."; exit 1; }
+  
+***************
+*** 93,114 ****
+  echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
+  append_db $TFMDESTDIR $TFMNAME
+  
+! MakeTeXmkdir "$PKDESTDIR"
+! test -d "$PKDESTDIR" || exit 1
+! if test ! -f $PKDESTDIR/$PKNAME; then
+!   cd $TEMPDIR
+!   test -r $GFNAME ||
+!     { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
+!   gftopk ./$GFNAME $PKNAME || exit 1
+!   mv $PKNAME $PKDESTDIR/pktmp.$$
+!   cd $PKDESTDIR
+!   if test -f $PKNAME; then
+!     rm -f pktmp.$$
+!   else
+      cd $PKDESTDIR
+!     mv pktmp.$$ $PKNAME
+!     chmod 644 $PKNAME
+!     append_db $PKDESTDIR $PKNAME
+    fi
+  fi
+  ) 1>&2 </dev/null
+--- 126,150 ----
+  echo $TFMDESTDIR/$TFMNAME >  $TEMPDIR/mtout.$$
+  append_db $TFMDESTDIR $TFMNAME
+  
+! # we don't install any .pk files produced ttf2pk or hbf2gf.
+! if test "$MODE" != "hbf2gf" && test "$MODE" != "ttf2pk"; then
+!   MakeTeXmkdir "$PKDESTDIR"
+!   test -d "$PKDESTDIR" || exit 1
+!   if test ! -f $PKDESTDIR/$PKNAME; then
+!     cd $TEMPDIR
+!     test -r $GFNAME ||
+!       { echo "$progname: Metafont failed to make $GFNAME."; exit 1; }
+!     gftopk ./$GFNAME $PKNAME || exit 1
+!     mv $PKNAME $PKDESTDIR/pktmp.$$
+      cd $PKDESTDIR
+!     if test -f $PKNAME; then
+!       rm -f pktmp.$$
+!     else
+!       cd $PKDESTDIR
+!       mv pktmp.$$ $PKNAME
+!       chmod 644 $PKNAME
+!       append_db $PKDESTDIR $PKNAME
+!     fi
+    fi
+  fi
+  ) 1>&2 </dev/null
--- 4_1.3/doc/teTeX/MakeTeXnames.diff.orig	Fri Jun 20 11:13:00 1997
+++ 4_1.3/doc/teTeX/MakeTeXnames.diff	Fri Oct  2 17:33:22 1998
@@ -1,12 +1,20 @@
---- MakeTeXnames.orig	Mon Aug 12 09:50:35 1996
-+++ MakeTeXnames	Mon Nov 11 07:26:00 1996
-@@ -53,8 +54,7 @@
- if test -r $FONTNAME/special.map; then
-   set x `awk \
- '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
--                 && substr (NAME, length (NAME), 1) ~ /[0-9]/ \
--                  && substr ($1, length ($1), 1) ~ /[^0-9]/)) \
-+  && substr (NAME, length ($1) + 1, length (NAME) - length ($1)) ~ /[0-9]/)) \
-  { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
-   shift
-   SUPPLIER=$1; TYPEFACE=$2
+*** MakeTeXnames.teTeX	Fri Aug 22 05:45:35 1997
+--- MakeTeXnames	Thu Jun 11 21:20:59 1998
+***************
+*** 53,60 ****
+  if test -r $FONTNAME/special.map; then
+    set x `awk \
+  '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
+!                  && substr (NAME, length (NAME), 1) ~ /[0-9]/ \
+!                   && substr ($1, length ($1), 1) ~ /[^0-9]/)) \
+   { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
+    shift
+    SUPPLIER=$1; TYPEFACE=$2
+--- 53,59 ----
+  if test -r $FONTNAME/special.map; then
+    set x `awk \
+  '{if ($1 == NAME || (substr (NAME, 1, length ($1)) == $1 \
+!   && substr (NAME, length ($1) + 1, length (NAME) - length ($1)) ~ /[0-9]/)) \
+   { print $2 " " $3; exit; }}' NAME=$NAME $FONTNAME/special.map`
+    shift
+    SUPPLIER=$1; TYPEFACE=$2
--- 4_1.3/doc/teTeX/special.map.diff.orig	Fri Jun 20 11:13:00 1997
+++ 4_1.3/doc/teTeX/special.map.diff	Fri Oct  2 17:33:22 1998
@@ -1,45 +1,52 @@
---- special.ori	Tue Jul 15 17:39:57 1997
-+++ special.map	Tue Jul 15 17:42:25 1997
-@@ -281,6 +281,7 @@
- czssq		jknappen	sauter
- czssqi		jknappen	sauter
- dc		jknappen	dc
-+ec		jknappen	ec
- fc		jknappen	fc
- icm		jknappen	sauter
- ilasy		jknappen	sauter
-@@ -294,3 +295,34 @@
- tc		jknappen	tc
- wasy		jknappen	sauter
- stmary		jknappen	sauter
-+@c Vietnamese fonts in ET5 encoding
-+vm		wlemberg	vm
-+@c Russian LH fonts created with 0eccreat.tex
-+rx		lh		rx
-+@c CJK bitmap fonts in HBF format (to be handled by hbf2gf)
-+@c two running digits will be appended to the fontname
-+b5ka12		chinese		b5ka12
-+b5kr12		chinese		b5kr12
-+c1so12		chinese		c1so12
-+c2so12		chinese		c2so12
-+c3so12		chinese		c3so12
-+c4so12		chinese		c4so12
-+c5so12		chinese		c5so12
-+c6so12		chinese		c6so12
-+c7so12		chinese		c7so12
-+csso12		chinese		csso12
-+gsfs14		chinese		gsfs14
-+gsfr14		chinese		gsfr14
-+j2so12		japanese	j2so12
-+jssl12		japanese	jssl12
-+jsso12		japanese	jsso12
-+ksso17		korean		ksso17
-+@c CJK truetype fonts (to be handled by ttf2pk)
-+@c two running (hex) digits will be appended to the fontname
-+ntukai		chinese		ntukai
-+ntukar		chinese		ntukar
-+ntufsm		chinese		ntufsm
-+uwpstj		chinese		uwpstj
-+uwjmg3		japanese	uwjmg3
-+uwkmjf		korean		uwkmjf
-+cyberb		unicode		cyberb
+*** special.map.teTeX	Thu Feb 27 08:22:16 1997
+--- special.map	Thu Jun 11 09:51:32 1998
+***************
+*** 292,297 ****
+--- 292,298 ----
+  ec		jknappen	ec
+  iec		jknappen	ec
+  dc		jknappen	dc
++ ec		jknappen	ec
+  fc		jknappen	fc
+  icm		jknappen	sauter
+  ilasy		jknappen	sauter
+***************
+*** 305,310 ****
+--- 306,342 ----
+  tc		jknappen	tc
+  wasy		jknappen	sauter
+  stmary		jknappen	sauter
++ @c Vietnamese fonts in ET5 encoding
++ vm		wlemberg	vm
++ @c Russian LH fonts created with 0eccreat.tex
++ rx		lh		rx
++ @c CJK bitmap fonts in HBF format (to be handled by hbf2gf)
++ @c two running digits will be appended to the fontname
++ b5ka12		chinese		b5ka12
++ b5kr12		chinese		b5kr12
++ c1so12		chinese		c1so12
++ c2so12		chinese		c2so12
++ c3so12		chinese		c3so12
++ c4so12		chinese		c4so12
++ c5so12		chinese		c5so12
++ c6so12		chinese		c6so12
++ c7so12		chinese		c7so12
++ csso12		chinese		csso12
++ gsfs14		chinese		gsfs14
++ gsfr14		chinese		gsfr14
++ j2so12		japanese	j2so12
++ jssl12		japanese	jssl12
++ jsso12		japanese	jsso12
++ ksso17		korean		ksso17
++ @c CJK truetype fonts (to be handled by ttf2pk)
++ @c two running (hex) digits will be appended to the fontname
++ ntukai		chinese		ntukai
++ ntukar		chinese		ntukar
++ ntufsm		chinese		ntufsm
++ uwpstj		chinese		uwpstj
++ uwjmg3		japanese	uwjmg3
++ uwkmjf		korean		uwkmjf
++ cyberb		unicode		cyberb
+  zpsycm		adobe		mathptm
+  zptmcm		adobe		mathptm
+  zpzccm		adobe		mathptm
--- 4_1.3/doc/teTeX/texmf.cnf.diff.orig	Fri Jun 20 11:13:00 1997
+++ 4_1.3/doc/teTeX/texmf.cnf.diff	Fri Oct  2 17:33:22 1998
@@ -1,21 +1,31 @@
---- texmf.cnf.orig	Mon Aug 19 19:31:34 1996
-+++ texmf.cnf	Thu Nov  7 06:55:41 1996
-@@ -71,7 +71,7 @@
- MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
- VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
- TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
--PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk}//:$KPSE_DOT
-+PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk,modeless}//:$KPSE_DOT
- GFFONTS		= $KPSE_DOT
- GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
- BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
-@@ -79,6 +79,9 @@
- TEXCONFIG	= $KPSE_DOT:~:$TEXMFS/{dvips//,web2c}
- DVIPSHEADERS	= $KPSE_DOT:$TEXMFS/{dvips,fonts/type1}//
- INDEXSTYLE	= $KPSE_DOT:$TEXMFS/makeindex//
-+
-+TTF2PKDIR	= $TEXMF/ttf2pk
-+HBF2GFDIR	= $TEXMF/hbf2gf
- 
- % The following line shows the compile-time default value. It does not
- % make any sense to change it for run-time.
+*** texmf.cnf.teTeX	Fri Aug 22 05:44:56 1997
+--- texmf.cnf	Thu Jun 11 21:16:24 1998
+***************
+*** 71,77 ****
+  MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
+  VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
+  TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
+! PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk}//:$KPSE_DOT
+  GFFONTS		= $KPSE_DOT
+  GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
+  BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
+--- 71,77 ----
+  MPSUPPORT	= $KPSE_DOT:$TEXMFS/metapost/support
+  VFFONTS		= $TEXMFS/fonts/vf//:$KPSE_DOT
+  TFMFONTS	= {$TEXMFS/fonts,$VARFONTS}/tfm//:$KPSE_DOT
+! PKFONTS		= {$TEXMFS/fonts,$VARFONTS}/pk/{$MAKETEX_MODE,gsftopk,ps2pk,modeless,ttf2pk}//:$KPSE_DOT
+  GFFONTS		= $KPSE_DOT
+  GLYPHFONTS	= $KPSE_DOT:$TEXMFS/fontname
+  BIBINPUTS	= $KPSE_DOT:$TEXMFS/bibtex/bib//
+***************
+*** 79,84 ****
+--- 79,87 ----
+  TEXCONFIG	= $KPSE_DOT:~:$TEXMFS/{dvips//,web2c}
+  DVIPSHEADERS	= $KPSE_DOT:$TEXMFS/{dvips,fonts/type1}//
+  INDEXSTYLE	= $KPSE_DOT:$TEXMFS/makeindex//
++ 
++ TTF2PKDIR	= $TEXMF/ttf2pk
++ HBF2GFDIR	= $TEXMF/hbf2gf
+  
+  % The following line shows the compile-time default value. It does not
+  % make any sense to change it for run-time.
