texlive[65543] Build/source/texk/web2c: (e)(u)ptex: replace binaries

commits+takuji at tug.org commits+takuji at tug.org
Sun Jan 15 06:09:14 CET 2023


Revision: 65543
          http://tug.org/svn/texlive?view=revision&revision=65543
Author:   takuji
Date:     2023-01-15 06:09:14 +0100 (Sun, 15 Jan 2023)
Log Message:
-----------
(e)(u)ptex: replace binaries of (u)ptex to aliases of e(u)ptex

Ref.
https://github.com/texjporg/tex-jp-build/issues/32

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/ac/web2c.ac
    trunk/Build/source/texk/web2c/configure
    trunk/Build/source/texk/web2c/configure.ac
    trunk/Build/source/texk/web2c/eptexdir/ChangeLog
    trunk/Build/source/texk/web2c/eptexdir/am/eptex.am
    trunk/Build/source/texk/web2c/euptexdir/COPYRIGHT
    trunk/Build/source/texk/web2c/euptexdir/ChangeLog
    trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
    trunk/Build/source/texk/web2c/lib/Makefile.am
    trunk/Build/source/texk/web2c/lib/Makefile.in
    trunk/Build/source/texk/web2c/man/Makefile.am
    trunk/Build/source/texk/web2c/man/Makefile.in
    trunk/Build/source/texk/web2c/ptexdir/COPYRIGHT
    trunk/Build/source/texk/web2c/ptexdir/ChangeLog
    trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
    trunk/Build/source/texk/web2c/synctexdir/ChangeLog
    trunk/Build/source/texk/web2c/synctexdir/am/synctex.am
    trunk/Build/source/texk/web2c/uptexdir/COPYRIGHT
    trunk/Build/source/texk/web2c/uptexdir/ChangeLog
    trunk/Build/source/texk/web2c/uptexdir/am/uptex.am

Added Paths:
-----------
    trunk/Build/source/texk/web2c/eptexdir/COPYRIGHT

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/Makefile.in	2023-01-15 05:09:14 UTC (rev 65543)
@@ -112,22 +112,21 @@
 	$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
 	$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
 	$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
-	$(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
+	$(am__EXEEXT_29)
 noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
-	$(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
-	$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
-	$(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
-	$(am__EXEEXT_41) $(am__EXEEXT_42)
-TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
+	$(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \
+	$(am__EXEEXT_33) $(am__EXEEXT_34) $(am__EXEEXT_35) \
+	$(am__EXEEXT_36) $(am__EXEEXT_37) $(am__EXEEXT_38) \
+	$(am__EXEEXT_39) $(am__EXEEXT_40)
+TESTS = tangle.test $(am__EXEEXT_43) ctiedir/ctie.test \
 	cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
 	$(am__append_16) $(am__append_25) $(am__append_34) \
 	$(am__append_42) $(am__append_55) $(am__append_56) \
-	$(am__append_58) $(am__append_62) $(am__EXEEXT_46) \
-	$(am__append_67) $(am__append_72) $(am__append_75) \
-	$(am__append_77) $(am__append_82) $(am__append_85) \
-	$(am__append_106) $(am__append_107) $(am__append_108) \
-	$(am__append_109) $(am__append_117) $(am__append_119) \
-	$(am__append_121) $(am__append_156) libmd5/md5.test
+	$(am__append_58) $(am__append_63) $(am__append_67) \
+	$(am__append_70) $(am__append_75) $(am__append_78) \
+	$(am__append_99) $(am__append_100) $(am__append_101) \
+	$(am__append_102) $(am__append_110) $(am__append_112) \
+	$(am__append_114) $(am__append_141) libmd5/md5.test
 @WEB_TRUE at am__append_1 = $(web_programs)
 @WEB_TRUE at am__append_2 = $(web_tests)
 @TEX_TRUE at am__append_3 = tex
@@ -192,67 +191,70 @@
 @ETEX_TRUE at am__append_58 = $(etex_tests)
 @ETEX_TRUE at am__append_59 = etrip.diffs
 @ETEX_TRUE at am__append_60 = etrip-clean
- at PTEX_TRUE@am__append_61 = ptex
- at PTEX_TRUE@am__append_62 = $(ptex_tests)
- at PTEX_TRUE@am__append_63 = ptrip.diffs
- at PTEX_TRUE@am__append_64 = ptrip-clean
- at PWEB_TRUE@am__append_65 = $(pweb_tests)
- at EPTEX_TRUE@am__append_66 = eptex
- at EPTEX_TRUE@am__append_67 = $(eptex_tests)
- at EPTEX_TRUE@am__append_68 = eptrip.diffs
- at EPTEX_TRUE@am__append_69 = eptrip-clean
- at UPTEX_TRUE@am__append_70 = uptex
- at UPWEB_TRUE@am__append_71 = $(upweb_programs)
- at UPTEX_TRUE@am__append_72 = $(uptex_tests)
- at UPTEX_TRUE@am__append_73 = uptrip.diffs
- at UPTEX_TRUE@am__append_74 = uptrip-clean
- at UPWEB_TRUE@am__append_75 = $(upweb_tests)
- at EUPTEX_TRUE@am__append_76 = euptex
- at EUPTEX_TRUE@am__append_77 = $(euptex_tests)
- at EUPTEX_TRUE@am__append_78 = euptrip.diffs
- at EUPTEX_TRUE@am__append_79 = euptrip-clean
- at HITEX_TRUE@am__append_80 = hitex hishrink histretch
- at HITEX_TRUE@am__append_81 = himktables
- at HITEX_TRUE@am__append_82 = $(hitex_tests)
- at MINGW32_TRUE@am__append_83 = \
+ at EPTEX_TRUE@am__append_61 = eptex
+ at EPTEX_TRUE@am__append_62 = eptex$(EXEEXT):ptex
+ at EPTEX_TRUE@am__append_63 = $(eptex_tests)
+ at EPTEX_TRUE@am__append_64 = eptrip.diffs
+ at EPTEX_TRUE@am__append_65 = eptrip-clean
+
+#if UPTEX
+#bin_PROGRAMS += uptex
+#endif UPTEX
+ at UPWEB_TRUE@am__append_66 = $(upweb_programs)
+
+#if UPTEX
+#TESTS += $(uptex_tests)
+#TRIPTRAP += uptrip.diffs
+#TRIPTRAP_CLEAN += uptrip-clean
+#endif UPTEX
+ at UPWEB_TRUE@am__append_67 = $(upweb_tests)
+ at EUPTEX_TRUE@am__append_68 = euptex
+ at EUPTEX_TRUE@am__append_69 = euptex$(EXEEXT):uptex
+ at EUPTEX_TRUE@am__append_70 = $(euptex_tests)
+ at EUPTEX_TRUE@am__append_71 = euptrip.diffs
+ at EUPTEX_TRUE@am__append_72 = euptrip-clean
+ at HITEX_TRUE@am__append_73 = hitex hishrink histretch
+ at HITEX_TRUE@am__append_74 = himktables
+ at HITEX_TRUE@am__append_75 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_76 = \
 @MINGW32_TRUE@	pdftexdir/regex/regex.c \
 @MINGW32_TRUE@	pdftexdir/regex/regex.h
 
- at PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_77 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_78 = $(pdftex_tests) $(ttf2afm_tests) \
 @PDFTEX_TRUE@	$(pdftosrc_tests)
- at LUATEX_TRUE@am__append_86 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_91 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_79 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_80 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_81 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_82 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_83 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_84 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_85 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_86 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_87 = uninstall-luahbtex-links
 # keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_96 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_101 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_88 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_89 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_90 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_91 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_92 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_93 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_94 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_95 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_96 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_97 = uninstall-luajithbtex-links
 # keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_106 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_110 = xetex
- at XETEX_MACOSX_TRUE@am__append_111 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_112 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_115 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_98 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_99 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_100 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_101 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_102 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_103 = xetex
+ at XETEX_MACOSX_TRUE@am__append_104 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_105 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_106 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_107 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_108 = \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.cpp \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontInst_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.mm \
@@ -259,106 +261,84 @@
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeXFontMgr_Mac.h \
 @XETEX_MACOSX_TRUE@	xetexdir/XeTeX_mac.c
 
- at XETEX_MACOSX_FALSE@am__append_116 = \
+ at XETEX_MACOSX_FALSE@am__append_109 = \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.cpp \
 @XETEX_MACOSX_FALSE@	xetexdir/XeTeXFontMgr_FC.h
 
- at XETEX_TRUE@am__append_117 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_118 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_119 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_120 = aleph
- at ALEPH_TRUE@am__append_121 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_122 = synctex
- at SYNCTEX_TRUE@am__append_123 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_124 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_125 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_126 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_127 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_128 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_110 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_111 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_112 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_113 = aleph
+ at ALEPH_TRUE@am__append_114 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_115 = synctex
+ at SYNCTEX_TRUE@am__append_116 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_117 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_118 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_119 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_120 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
 @TEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @TEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_131 = \
+ at TEX_SYNCTEX_TRUE@am__append_122 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_123 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_124 = \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @TEX_SYNCTEX_TRUE@	synctexdir/synctex-tex.h
 
- at ETEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_125 = -I$(srcdir)/synctexdir \
 @ETEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @ETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_135 = \
+ at ETEX_SYNCTEX_TRUE@am__append_126 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_127 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_128 = \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-etex.h
 
- at PTEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
- at PTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
- at PTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
- at PTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
- at PTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
- at PTEX_SYNCTEX_TRUE@am__append_139 = \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-ptex.h
-
- at UPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
- at UPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
- at UPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
- at UPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
- at UPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
- at UPTEX_SYNCTEX_TRUE@am__append_143 = \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-uptex.h
-
- at EPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
+ at EPTEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
 @EPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_147 = \
+ at EPTEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
+ at EPTEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
+ at EPTEX_SYNCTEX_TRUE@am__append_132 = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-eptex.h
 
- at EUPTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
 @EUPTEX_SYNCTEX_TRUE@	$(ZLIB_INCLUDES) -D__SyncTeX__ \
 @EUPTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_149 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_150 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_151 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_136 = \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @EUPTEX_SYNCTEX_TRUE@	synctexdir/synctex-euptex.h
 
- at PDFTEX_SYNCTEX_TRUE@am__append_152 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
 @PDFTEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @PDFTEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_153 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_138 = \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @PDFTEX_SYNCTEX_TRUE@	synctexdir/synctex-pdftex.h
 
- at XETEX_SYNCTEX_TRUE@am__append_154 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
 @XETEX_SYNCTEX_TRUE@	-D__SyncTeX__ \
 @XETEX_SYNCTEX_TRUE@	-DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_155 = \
+ at XETEX_SYNCTEX_TRUE@am__append_140 = \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.c \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-common.h \
 @XETEX_SYNCTEX_TRUE@	synctexdir/synctex-xetex.h
 
- at SYNCTEX_TRUE@am__append_156 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_141 = $(synctex_tests)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -441,38 +421,36 @@
 @PMP_TRUE at am__EXEEXT_14 = pmpost$(EXEEXT)
 @UPMP_TRUE at am__EXEEXT_15 = upmpost$(EXEEXT)
 @ETEX_TRUE at am__EXEEXT_16 = etex$(EXEEXT)
- at PTEX_TRUE@am__EXEEXT_17 = ptex$(EXEEXT)
- at EPTEX_TRUE@am__EXEEXT_18 = eptex$(EXEEXT)
- at UPTEX_TRUE@am__EXEEXT_19 = uptex$(EXEEXT)
- at UPWEB_TRUE@am__EXEEXT_20 = $(am__EXEEXT_2)
- at EUPTEX_TRUE@am__EXEEXT_21 = euptex$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_22 = hitex$(EXEEXT) hishrink$(EXEEXT) \
+ at EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
+ at UPWEB_TRUE@am__EXEEXT_18 = $(am__EXEEXT_2)
+ at EUPTEX_TRUE@am__EXEEXT_19 = euptex$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_20 = hitex$(EXEEXT) hishrink$(EXEEXT) \
 @HITEX_TRUE@	histretch$(EXEEXT)
- at PDFTEX_TRUE@am__EXEEXT_23 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ at PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
 @PDFTEX_TRUE@	pdftosrc$(EXEEXT)
- at LUATEX_TRUE@am__EXEEXT_24 = luatex$(EXEEXT)
- at LUAHBTEX_TRUE@am__EXEEXT_25 = luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@am__EXEEXT_26 = luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@am__EXEEXT_27 = luajithbtex$(EXEEXT)
- at XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
- at OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_3)
- at ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
- at SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
+ at LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@am__EXEEXT_23 = luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@am__EXEEXT_24 = luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@am__EXEEXT_25 = luajithbtex$(EXEEXT)
+ at XETEX_TRUE@am__EXEEXT_26 = xetex$(EXEEXT)
+ at OTANGLE_TRUE@am__EXEEXT_27 = $(am__EXEEXT_3)
+ at ALEPH_TRUE@am__EXEEXT_28 = aleph$(EXEEXT)
+ at SYNCTEX_TRUE@am__EXEEXT_29 = synctex$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libdir)" "$(DESTDIR)$(man1dir)" \
 	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(syncincludedir)"
- at MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
- at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
- at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
- at MP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mpost$(EXEEXT)
- at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_pmpost$(EXEEXT)
- at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_upmpost$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_38 = himktables$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 =  \
+ at MF_TRUE@@WIN32_TRUE at am__EXEEXT_30 = call_mf$(EXEEXT)
+ at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_31 = call_mflua$(EXEEXT)
+ at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mfluajit$(EXEEXT)
+ at MP_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mpost$(EXEEXT)
+ at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_pmpost$(EXEEXT)
+ at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_upmpost$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_36 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 =  \
 @LUAJITHBTEX_TRUE@@WIN32_TRUE@	call_luajithbtex$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -1576,24 +1554,12 @@
 pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
 pooltype_LDADD = $(LDADD)
 pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h synctexdir/synctex.c \
-	synctexdir/synctex.h synctexdir/synctex-common.h \
-	synctexdir/synctex-ptex.h
- at PTEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_57)
-am__objects_58 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_58) ptex-ptex-pool.$(OBJEXT)
-ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
-am__DEPENDENCIES_11 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
- at PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
 am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
 synctex_OBJECTS = $(am_synctex_OBJECTS)
-am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- at MINGW32_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
-synctex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_14)
+am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at MINGW32_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+synctex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_12)
 nodist_tangle_OBJECTS = tangle.$(OBJEXT)
 tangle_OBJECTS = $(nodist_tangle_OBJECTS)
 tangle_LDADD = $(LDADD)
@@ -1604,14 +1570,14 @@
 am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_59 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_59)
-am__objects_60 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_60) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_57 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_57)
+am__objects_58 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_58) tex-tex-pool.$(OBJEXT)
 tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
- at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+ at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
 tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_15)
+	$(am__DEPENDENCIES_13)
 nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
 tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
 tftopl_LDADD = $(LDADD)
@@ -1630,48 +1596,40 @@
 am_upbibtex_OBJECTS =
 nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
 upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_16 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
 am_updvitype_OBJECTS =
 nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
 updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
 	$(nodist_updvitype_OBJECTS)
-am__objects_61 = upmpost-pmp.$(OBJEXT)
-am__objects_62 = upmpost-pmpmath.$(OBJEXT)
-am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_66 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_67 = upmpost-pmpxout.$(OBJEXT)
-am__objects_68 = upmpost-ppngout.$(OBJEXT)
-am__objects_69 = upmpost-ppsout.$(OBJEXT)
-am__objects_70 = upmpost-psvgout.$(OBJEXT)
-am__objects_71 = $(am__objects_61) $(am__objects_62) $(am__objects_63) \
-	$(am__objects_64) $(am__objects_65) upmpost-pmpost.$(OBJEXT) \
-	$(am__objects_66) $(am__objects_67) $(am__objects_68) \
-	$(am__objects_69) $(am__objects_70) upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_71)
+am__objects_59 = upmpost-pmp.$(OBJEXT)
+am__objects_60 = upmpost-pmpmath.$(OBJEXT)
+am__objects_61 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_62 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_63 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_64 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_65 = upmpost-pmpxout.$(OBJEXT)
+am__objects_66 = upmpost-ppngout.$(OBJEXT)
+am__objects_67 = upmpost-ppsout.$(OBJEXT)
+am__objects_68 = upmpost-psvgout.$(OBJEXT)
+am__objects_69 = $(am__objects_59) $(am__objects_60) $(am__objects_61) \
+	$(am__objects_62) $(am__objects_63) upmpost-pmpost.$(OBJEXT) \
+	$(am__objects_64) $(am__objects_65) $(am__objects_66) \
+	$(am__objects_67) $(am__objects_68) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_69)
 upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_17)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_15)
 am_uppltotf_OBJECTS =
 nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
 uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
-am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \
-	uptexdir/uptexextra.h uptexdir/uptex_version.h \
-	synctexdir/synctex.c synctexdir/synctex.h \
-	synctexdir/synctex-common.h synctexdir/synctex-uptex.h
- at UPTEX_SYNCTEX_TRUE@am__objects_72 =  \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/uptex-synctex.$(OBJEXT)
-dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
-	$(am__objects_72)
-am__objects_73 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_73) uptex-uptex-pool.$(OBJEXT)
+dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT)
+am__objects_70 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_70) uptex-uptex-pool.$(OBJEXT)
 uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
- at UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
 am_uptftopl_OBJECTS =
 nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
 uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
@@ -1708,20 +1666,20 @@
 	xetexdir/xetex_version.h synctexdir/synctex.c \
 	synctexdir/synctex.h synctexdir/synctex-common.h \
 	synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_74 =  \
+ at XETEX_SYNCTEX_TRUE@am__objects_71 =  \
 @XETEX_SYNCTEX_TRUE@	synctexdir/xetex-synctex.$(OBJEXT)
 dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
-	$(am__objects_74)
-am__objects_75 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_75) xetex-xetex-pool.$(OBJEXT)
+	$(am__objects_71)
+am__objects_72 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_72) xetex-xetex-pool.$(OBJEXT)
 xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
- at XETEX_MACOSX_FALSE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_20 = $(libxetex) $(am__DEPENDENCIES_1) \
+ at XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_19)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_20) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_16)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1)
 xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -1816,13 +1774,11 @@
 	./$(DEPDIR)/pmpost-pmpxout.Po ./$(DEPDIR)/pmpost-ppngout.Po \
 	./$(DEPDIR)/pmpost-ppsout.Po ./$(DEPDIR)/pmpost-psvgout.Po \
 	./$(DEPDIR)/pmpost-ptfmin.Po ./$(DEPDIR)/pooltype.Po \
-	./$(DEPDIR)/ptex-ptex-pool.Po ./$(DEPDIR)/ptex-ptex0.Po \
-	./$(DEPDIR)/ptex-ptexini.Po ./$(DEPDIR)/tangle.Po \
-	./$(DEPDIR)/tangleboot.Po ./$(DEPDIR)/tex-tex-pool.Po \
-	./$(DEPDIR)/tex-tex0.Po ./$(DEPDIR)/tex-texextra.Po \
-	./$(DEPDIR)/tex-texini.Po ./$(DEPDIR)/tftopl.Po \
-	./$(DEPDIR)/tie-tie.Po ./$(DEPDIR)/twill.Po \
-	./$(DEPDIR)/upbibtex-upbibtex.Po \
+	./$(DEPDIR)/tangle.Po ./$(DEPDIR)/tangleboot.Po \
+	./$(DEPDIR)/tex-tex-pool.Po ./$(DEPDIR)/tex-tex0.Po \
+	./$(DEPDIR)/tex-texextra.Po ./$(DEPDIR)/tex-texini.Po \
+	./$(DEPDIR)/tftopl.Po ./$(DEPDIR)/tie-tie.Po \
+	./$(DEPDIR)/twill.Po ./$(DEPDIR)/upbibtex-upbibtex.Po \
 	./$(DEPDIR)/updvitype-updvitype.Po ./$(DEPDIR)/upmpost-pmp.Po \
 	./$(DEPDIR)/upmpost-pmpmath.Po \
 	./$(DEPDIR)/upmpost-pmpmathbinary.Po \
@@ -2383,7 +2339,6 @@
 	pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po \
 	ptexdir/$(DEPDIR)/libkanji_a-kanji.Po \
 	ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po \
-	ptexdir/$(DEPDIR)/ptex-ptexextra.Po \
 	synctexdir/$(DEPDIR)/eptex-synctex.Po \
 	synctexdir/$(DEPDIR)/etex-synctex.Po \
 	synctexdir/$(DEPDIR)/euptex-synctex.Po \
@@ -2394,10 +2349,8 @@
 	synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo \
 	synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo \
 	synctexdir/$(DEPDIR)/pdftex-synctex.Po \
-	synctexdir/$(DEPDIR)/ptex-synctex.Po \
 	synctexdir/$(DEPDIR)/synctex-synctex_main.Po \
 	synctexdir/$(DEPDIR)/tex-synctex.Po \
-	synctexdir/$(DEPDIR)/uptex-synctex.Po \
 	synctexdir/$(DEPDIR)/xetex-synctex.Po \
 	uptexdir/$(DEPDIR)/libukanji_a-kanji.Po \
 	uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po \
@@ -2535,22 +2488,22 @@
 	$(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pktogf_SOURCES) \
 	$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
 	$(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \
-	$(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(synctex_SOURCES) \
-	$(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
-	$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
-	$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
-	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
-	$(nodist_twill_SOURCES) $(upbibtex_SOURCES) \
-	$(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \
-	$(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \
-	$(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \
-	$(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \
-	$(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \
-	$(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
-	$(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \
-	$(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \
-	$(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \
-	$(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
+	$(synctex_SOURCES) $(nodist_tangle_SOURCES) \
+	$(nodist_tangleboot_SOURCES) $(dist_tex_SOURCES) \
+	$(nodist_tex_SOURCES) $(nodist_tftopl_SOURCES) \
+	$(nodist_tie_SOURCES) $(ttf2afm_SOURCES) \
+	$(EXTRA_ttf2afm_SOURCES) $(nodist_twill_SOURCES) \
+	$(upbibtex_SOURCES) $(nodist_upbibtex_SOURCES) \
+	$(updvitype_SOURCES) $(nodist_updvitype_SOURCES) \
+	$(nodist_upmpost_SOURCES) $(uppltotf_SOURCES) \
+	$(nodist_uppltotf_SOURCES) $(dist_uptex_SOURCES) \
+	$(nodist_uptex_SOURCES) $(uptftopl_SOURCES) \
+	$(nodist_uptftopl_SOURCES) $(nodist_vftovp_SOURCES) \
+	$(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
+	$(nodist_wofm2opl_SOURCES) $(nodist_wopl2ofm_SOURCES) \
+	$(nodist_wovf2ovp_SOURCES) $(nodist_wovp2ovf_SOURCES) \
+	$(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
+	$(nodist_EXTRA_xetex_SOURCES)
 DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
 	$(libluaharfbuzz_a_SOURCES) $(libluajitharfbuzz_a_SOURCES) \
 	$(dist_libluajittex_a_SOURCES) $(dist_libluatex_a_SOURCES) \
@@ -2567,11 +2520,10 @@
 	$(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
 	$(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
 	$(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
-	$(am__dist_ptex_SOURCES_DIST) $(synctex_SOURCES) \
-	$(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
-	$(EXTRA_ttf2afm_SOURCES) $(upbibtex_SOURCES) \
-	$(updvitype_SOURCES) $(uppltotf_SOURCES) \
-	$(am__dist_uptex_SOURCES_DIST) $(uptftopl_SOURCES) \
+	$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
+	$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+	$(upbibtex_SOURCES) $(updvitype_SOURCES) $(uppltotf_SOURCES) \
+	$(dist_uptex_SOURCES) $(uptftopl_SOURCES) \
 	$(am__dist_xetex_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -2778,15 +2730,14 @@
   bases=`echo $$bases`
 AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_41 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
 	gftopk.test gftype.test mft.test patgen.test pktogf.test \
 	pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
 	vptovf.test weave.test twill.test
-am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
+am__EXEEXT_42 = $(am__EXEEXT_41) tests/bibtex-openout-test.pl \
 	tests/bibtex-longline-test.pl tests/bibtex-mem.test \
 	tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
-am__EXEEXT_46 =
+ at WEB_TRUE@am__EXEEXT_43 = $(am__EXEEXT_42)
 TEST_SUITE_LOG = test-suite.log
 am__test_logs1 = $(TESTS:=.log)
 am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -3013,7 +2964,7 @@
 NMEDIT = @NMEDIT@
 OBJCXX = @OBJCXX@
 OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_112)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_105)
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTANGLE = @OTANGLE@
@@ -3160,12 +3111,12 @@
 	libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
 	libmd5.a
 EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_124)
-lib_LTLIBRARIES = $(am__append_123)
+lib_LIBRARIES = $(am__append_117)
+lib_LTLIBRARIES = $(am__append_116)
 dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
 nodist_man_MANS = 
 TEST_EXTENSIONS = .pl .test
-
+#
 # By the way, the $(BUILT_SOURCES) suggestion in the Automake manual for
 # this does not work for us, because we want to be able to invoke
 # specific targets (hiall, hitex, hishrink, ...), and $(BUILT_SOURCES)
@@ -3248,14 +3199,12 @@
 	etexdir/etrip/trip2.in $(ptex_web_srcs) $(ptex_ch_srcs) \
 	ptexdir/ptex.defines ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
 	ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
-	ptexdir/README.txt $(ptex_tests) $(pweb_tests) \
-	ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
-	ptexdir/tests/sample.bib ptexdir/tests/nissya_bib.bbl \
-	tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib \
-	tests/enc-sjis.bib tests/enc-euc.bib tests/enc-utf8.bib \
-	tests/enc-utf8a.bib tests/enc-utf8b.bib tests/enc-amb0.bib \
-	tests/enc-amb1.bib tests/enc-amb2.bib tests/enc.aux \
-	tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
+	ptexdir/README.txt ptexdir/tests/nissya.bst \
+	ptexdir/tests/sample.bib tests/testfield.bst tests/enc-asc.bib \
+	tests/enc-jis.bib tests/enc-sjis.bib tests/enc-euc.bib \
+	tests/enc-utf8.bib tests/enc-utf8a.bib tests/enc-utf8b.bib \
+	tests/enc-amb0.bib tests/enc-amb1.bib tests/enc-amb2.bib \
+	tests/enc.aux tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
 	tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl \
 	tests/enc-up.bbl tests/memdata1.bst tests/memdata2.bst \
 	tests/memdata3.bst ptexdir/tests/ptex3.tex \
@@ -3561,9 +3510,7 @@
 	synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \
 	synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
 	synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
-	synctexdir/synctex-e-rec.ch0 synctexdir/synctex-p-mem.ch0 \
-	synctexdir/synctex-p-mem.ch1 synctexdir/synctex-p-rec.ch0 \
-	synctexdir/synctex-p-rec.ch1 synctexdir/synctex-ep-mem.ch0 \
+	synctexdir/synctex-e-rec.ch0 synctexdir/synctex-ep-mem.ch0 \
 	synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-ep-rec.ch0 \
 	synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
 	$(synctex_tests) libmd5/md5.test
@@ -3604,85 +3551,81 @@
 	$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
 	etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \
 	$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
-	ptex.pool ptex-tangle $(pweb_programs:=.c) \
-	$(pweb_programs:=.h) $(pweb_programs:=.p) \
-	$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
-	ptests/nissya_bib.* ptests/xexampl.aux ptests/xexampl.bbl \
-	ptests/xexampl.blg ptests/xenc*.* ptests/fn*.* \
-	ptests/memtest.bib ptests/memtest?.* ptests/xstory.dvityp \
-	ptests/xpagenum.typ ptests/xptex[34]*.typ ptests/xcmr10.tfm \
-	ptests/xcmr10.pl ptests/xsample*.typ ptests/x*min10.* \
-	ptests/xchcode*.* ptests/xskipjfmp.* ptrip.diffs \
-	$(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
-	eptex.pool eptex-tangle eptrip.diffs pdfprimitive-eptex.* \
-	$(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
-	uptex.pool uptex-tangle $(upweb_programs:=.c) \
-	$(upweb_programs:=.h) $(upweb_programs:=.p) \
-	$(upweb_programs:=-web2c) $(upweb_programs:=.web) \
-	uptests/nissya_bib.* uptests/xexampl.aux uptests/xexampl.bbl \
-	uptests/xexampl.blg uptests/xenc*.* uptests/fn*.* \
-	uptests/memtest.bib uptests/memtest?.* uptests/xstory.dvityp \
-	uptests/xpagenum.typ uptests/x*ptex[34]*.typ \
-	uptests/xcmr10.tfm uptests/xcmr10.pl uptests/xsample*.typ \
-	uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu.* \
-	uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \
-	uptests/xskipjfmp.* uptrip.diffs $(nodist_euptex_SOURCES) \
-	euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \
-	euptex-tangle euptrip.diffs pdfprimitive-euptex.* \
-	$(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \
-	$(nodist_histretch_SOURCES) hiformat-tangle hitex-tangle \
-	hello.log rule.log $(nodist_pdftex_SOURCES) pdftex-final.ch \
-	pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
-	pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
-	cnfline.log partoken-ok.log partoken-xfail.log pdftests/fn*.* \
-	postV3.afm postV7.afm test-13.pdf test-13.xref test-15.pdf \
-	test-15.xref $(nodist_libluatex_sources) luaimage.* \
-	luajitimage.* $(nodist_xetex_SOURCES) xetex.web xetex-final.ch \
-	xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
-	bug73.log bug73.out bug73.tex filedump.log filedump.out \
-	filedump.tex xetests/fn*.* $(omegaware_programs:=.c) \
-	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
-	$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
-	ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
-	omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
-	omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
-	omegaware/tests/xlig*.* ofont*vf omegaware/tests/xpagenum.* \
-	omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
-	omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
-	omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
-	omegaware/tests/xOCherokee.* ocftest.* omegaware/tests/xinbmp* \
-	omegaware/tests/xoverbmp* omegaware/tests/xrealnum.* \
-	omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
-	omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
-	omegaware/tests/xsample*.out omegaware/tests/shortend.* \
-	omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
-	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
-	omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
-	$(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
-	aleph.pool aleph-tangle
+	ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \
+	ptests/xexampl.bbl ptests/xexampl.blg ptests/xenc*.* \
+	ptests/fn*.* ptests/memtest.bib ptests/memtest?.* \
+	ptests/xstory.dvityp ptests/xpagenum.typ ptests/xptex[34]*.typ \
+	ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample*.typ \
+	ptests/x*min10.* ptests/xchcode*.* ptests/xskipjfmp.* \
+	ptrip.diffs $(nodist_eptex_SOURCES) eptex.web eptex.ch \
+	eptex-web2c eptex.p eptex.pool eptex-tangle eptrip.diffs \
+	pdfprimitive-eptex.* $(nodist_uptex_SOURCES) uptex.web \
+	uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
+	$(upweb_programs:=.c) $(upweb_programs:=.h) \
+	$(upweb_programs:=.p) $(upweb_programs:=-web2c) \
+	$(upweb_programs:=.web) uptests/nissya_bib.* \
+	uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
+	uptests/xenc*.* uptests/fn*.* uptests/memtest.bib \
+	uptests/memtest?.* uptests/xstory.dvityp uptests/xpagenum.typ \
+	uptests/x*ptex[34]*.typ uptests/xcmr10.tfm uptests/xcmr10.pl \
+	uptests/xsample*.typ uptests/x*min10.* uptests/xchcode*.* \
+	uptests/xtestnewu.* uptests/xuparse.* uptests/yuparse.* \
+	uptests/ygkhuge*.* uptests/xskipjfmp.* uptrip.diffs \
+	$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+	euptex.p euptex.pool euptex-tangle euptrip.diffs \
+	pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
+	$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
+	hiformat-tangle hitex-tangle hello.log rule.log \
+	$(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
+	pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
+	pdfimage.log pdfimage.pdf expanded.log cnfline.log \
+	partoken-ok.log partoken-xfail.log pdftests/fn*.* postV3.afm \
+	postV7.afm test-13.pdf test-13.xref test-15.pdf test-15.xref \
+	$(nodist_libluatex_sources) luaimage.* luajitimage.* \
+	$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
+	xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
+	bug73.tex filedump.log filedump.out filedump.tex xetests/fn*.* \
+	$(omegaware_programs:=.c) $(omegaware_programs:=.h) \
+	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
+	ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
+	omegaware/bad*.* omegaware/tests/charwdr.* \
+	omegaware/tests/charwdv.* omegaware/tests/xcheck* \
+	omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
+	omegaware/tests/xpagenum.* omegaware/tests/xofont* \
+	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+	ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
+	omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
+	omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
+	omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
+	omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
+	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
+	omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
+	omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
+	aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
 TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
 	$(am__append_36) $(am__append_44) $(am__append_60) \
-	$(am__append_64) $(am__append_69) $(am__append_74) \
-	$(am__append_79)
+	$(am__append_65) $(am__append_72)
 TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \
 	$(am__append_35) $(am__append_43) $(am__append_59) \
-	$(am__append_63) $(am__append_68) $(am__append_73) \
-	$(am__append_78)
+	$(am__append_64) $(am__append_71)
 bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
 	$(am__append_24) $(am__append_33) $(am__append_41) \
-	$(am__append_49) $(am__append_54) upbibtex$(EXEEXT):pbibtex \
-	updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \
-	uptftopl$(EXEEXT):ptftopl $(am__append_90) $(am__append_95) \
-	$(am__append_100) $(am__append_105)
+	$(am__append_49) $(am__append_54) $(am__append_62) \
+	upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
+	uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
+	$(am__append_69) $(am__append_83) $(am__append_88) \
+	$(am__append_93) $(am__append_98)
 install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
 	$(am__append_39) $(am__append_47) $(am__append_52) \
-	$(am__append_88) $(am__append_93) $(am__append_98) \
-	$(am__append_103)
+	$(am__append_81) $(am__append_86) $(am__append_91) \
+	$(am__append_96)
 uninstall_exe_links = $(am__append_13) $(am__append_23) \
 	$(am__append_32) $(am__append_40) $(am__append_48) \
-	$(am__append_53) $(am__append_89) $(am__append_94) \
-	$(am__append_99) $(am__append_104)
+	$(am__append_53) $(am__append_82) $(am__append_87) \
+	$(am__append_92) $(am__append_97)
 NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
 	cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \
 	cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \
@@ -3858,18 +3801,18 @@
 initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
 nodist_initex_SOURCES = callexe.c
 initex_LDADD = 
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_128)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_121)
 
 # With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_129)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_122)
 
 # TeX C sources
 tex_c_h = texini.c tex0.c texcoerce.h texd.h
 nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_131)
+dist_tex_SOURCES = texextra.c $(am__append_124)
 
 # We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_130)
+tex_prereq = texd.h $(am__append_123)
 tex_ch_srcs = \
 	tex.web \
 	tex.ch \
@@ -4365,10 +4308,10 @@
 	mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
 	mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
 	mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_132)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_125)
 
 # With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_133)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_126)
 etex_DEPENDENCIES = $(ZLIB_DEPEND)
 
 # e-TeX C sources
@@ -4375,11 +4318,11 @@
 etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
 nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
 dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
-	etexdir/etex_version.h $(am__append_135)
+	etexdir/etex_version.h $(am__append_128)
 
 # We must create etexd.h and etexdir/etex_version.h before building the
 # etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_134)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_127)
 etex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch
@@ -4403,30 +4346,13 @@
 ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
 ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
 ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
-p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
-
-#pweb_programs = pbibtex pdvitype ppltotf ptftopl
 pproglib = lib/libp.a
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
-#if PWEB
-#bin_PROGRAMS += $(pweb_programs)
-#endif PWEB
-#EXTRA_PROGRAMS += ptex $(pweb_programs)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_136)
+ptex_CPPFLAGS = $(ptex_cppflags)
 
-# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_137)
-ptex_DEPENDENCIES = $(ptex_dependencies)
-
-# pTeX C sources
-ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
-nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
-dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
-	ptexdir/ptex_version.h $(am__append_139)
-
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_138)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
 ptex_web_srcs = \
 	tex.web \
 	tex.ch \
@@ -4439,16 +4365,12 @@
 	$(ptex_ch_synctex) \
 	tex-binpool.ch
 
-
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/wcfname.test
 eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
-	$(ZLIB_INCLUDES) $(am__append_144)
+	$(ZLIB_INCLUDES) $(am__append_129)
 
 # With --enable-ipc, e-pTeX may need to link with -lsocket.
 eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_145)
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_130)
 eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-pTeX C sources
@@ -4455,11 +4377,11 @@
 eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
 nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
 dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
-	eptexdir/eptex_version.h $(am__append_147)
+	eptexdir/eptex_version.h $(am__append_132)
 
 # We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
 eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
-	eptexdir/eptex_version.h $(am__append_146)
+	eptexdir/eptex_version.h $(am__append_131)
 eptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -4495,21 +4417,19 @@
 upweb_programs = upbibtex updvitype uppltotf uptftopl
 libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
 libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_140)
+uptex_CPPFLAGS = $(uptex_cppflags)
 
 # With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_141)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs)
 uptex_DEPENDENCIES = $(uptex_dependencies)
 
 # upTeX C sources
 uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
 nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
-dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
-	uptexdir/uptex_version.h $(am__append_143)
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h
 
 # We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
-uptex_prereq = uptexd.h ptexdir/ptex_version.h \
-	uptexdir/uptex_version.h $(am__append_142)
+uptex_prereq = uptexd.h ptexdir/ptex_version.h uptexdir/uptex_version.h
 uptex_web_srcs = \
 	tex.web \
 	tex.ch \
@@ -4543,9 +4463,6 @@
 uptftopl_CPPFLAGS = $(uptex_cppflags)
 uptftopl_LDADD = $(uptex_ldadd)
 uptftopl_DEPENDENCIES = $(uptex_dependencies)
-
-# upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
 # uppPLtoTF/upTFtoPL
 upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
 	uptexdir/uppltotf.test uptexdir/uptftopl.test \
@@ -4555,11 +4472,11 @@
 	uptexdir/yokotate.test uptexdir/skipjfmp.test \
 	uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test
 euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
-	-I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_148)
+	-I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_133)
 
 # With --enable-ipc, e-upTeX may need to link with -lsocket.
 euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
-	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_149)
+	$(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_134)
 euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
 
 # e-upTeX C sources
@@ -4566,12 +4483,12 @@
 euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
 nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
 dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
-	$(am__append_151)
+	$(am__append_136)
 
 # We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
 euptex_prereq = euptexd.h etexdir/etex_version.h \
 	ptexdir/ptex_version.h eptexdir/eptex_version.h \
-	uptexdir/uptex_version.h $(am__append_150)
+	uptexdir/uptex_version.h $(am__append_135)
 euptex_web_srcs = \
 	tex.web \
 	etexdir/etex.ch \
@@ -4683,7 +4600,7 @@
 	pdftexdir/writejbig2.c pdftexdir/writejpg.c \
 	pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
 	pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
-	$(am__append_83)
+	$(am__append_76)
 @MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
 EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
 	pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4699,7 +4616,7 @@
 # Force Automake to use CXXLD for linking
 nodist_EXTRA_pdftex_SOURCES = dummy.cxx
 pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_152)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_137)
 pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
 
 # With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4712,7 +4629,7 @@
 nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
 dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
 	pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
-	$(am__append_153)
+	$(am__append_138)
 pdftex_ch_srcs = \
 	pdftexdir/pdftex.web \
 	pdftexdir/tex.ch0 \
@@ -5389,18 +5306,18 @@
 xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
 	$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
 	$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
-	$(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_111) \
-	$(am__append_113)
+	$(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_104) \
+	$(am__append_106)
 xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
 	$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
 	$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
-	$(am__append_114)
+	$(am__append_107)
 xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
 	$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
 	$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
 	$(PPLIB_DEPEND) libmd5.a
 @XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_154)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_139)
 xetex_CFLAGS = $(WARNING_CFLAGS)
 xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
 xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5409,7 +5326,7 @@
 nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
 dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
 	xetexdir/etex_version.h xetexdir/xetex_version.h \
-	$(am__append_155)
+	$(am__append_140)
 xetex_ch_srcs = \
 	xetexdir/xetex.web \
 	xetexdir/tex.ch0 \
@@ -5441,7 +5358,7 @@
 	xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
 	xetexdir/image/mfileio.h xetexdir/image/numbers.c \
 	xetexdir/image/numbers.h xetexdir/image/pngimage.c \
-	xetexdir/image/pngimage.h $(am__append_115) $(am__append_116)
+	xetexdir/image/pngimage.h $(am__append_108) $(am__append_109)
 
 # We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
 libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5546,13 +5463,13 @@
 synctex_SOURCES = \
 	synctexdir/synctex_main.c
 
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_125)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_126)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_118)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_119)
 libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
 libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
 libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
 libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_127)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_120)
 libsynctex_la_SOURCES = \
 	synctexdir/synctex_parser.c \
 	synctexdir/synctex_parser_local.h \
@@ -5584,28 +5501,6 @@
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch1 \
 @ETEX_SYNCTEX_TRUE@	synctexdir/synctex-e-rec.ch0
 
- at PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-def.ch0 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch0 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch0 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch1 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch0 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch0 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch1 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch2 \
- at PTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch1
-
- at UPTEX_SYNCTEX_TRUE@uptex_ch_synctex = \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-def.ch0 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch0 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-mem.ch0 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-mem.ch1 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch0 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch0 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch1 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-rec.ch2 \
- at UPTEX_SYNCTEX_TRUE@	synctexdir/synctex-p-rec.ch1
-
 @EPTEX_SYNCTEX_TRUE at eptex_ch_synctex = \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-def.ch0 \
 @EPTEX_SYNCTEX_TRUE@	synctexdir/synctex-ep-mem.ch0 \
@@ -8302,14 +8197,6 @@
 pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES) 
 	@rm -f pooltype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
-ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
-	ptexdir/$(DEPDIR)/$(am__dirstamp)
-synctexdir/ptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
-	synctexdir/$(DEPDIR)/$(am__dirstamp)
-
-ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES) 
-	@rm -f ptex$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
 synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
 	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
@@ -8368,8 +8255,6 @@
 	$(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
 uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
 	uptexdir/$(DEPDIR)/$(am__dirstamp)
-synctexdir/uptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
-	synctexdir/$(DEPDIR)/$(am__dirstamp)
 
 uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES) 
 	@rm -f uptex$(EXEEXT)
@@ -8600,9 +8485,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-psvgout.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pmpost-ptfmin.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pooltype.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex-pool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptex0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ptex-ptexini.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangle.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tangleboot.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tex-tex-pool.Po at am__quote@ # am--include-marker
@@ -9183,7 +9065,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/ptex-ptexextra.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/eptex-synctex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/etex-synctex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/euptex-synctex.Po at am__quote@ # am--include-marker
@@ -9194,10 +9075,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/pdftex-synctex.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/ptex-synctex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/synctex-synctex_main.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/tex-synctex.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/uptex-synctex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/xetex-synctex.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji.Po at am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote at uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po at am__quote@ # am--include-marker
@@ -18128,76 +18007,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
 
-ptexdir/ptex-ptexextra.o: ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.o -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
-
-ptexdir/ptex-ptexextra.obj: ptexdir/ptexextra.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.obj -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
-
-synctexdir/ptex-synctex.o: synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
-
-synctexdir/ptex-synctex.obj: synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
-
-ptex-ptexini.o: ptexini.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
-
-ptex-ptexini.obj: ptexini.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.obj -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
-
-ptex-ptex0.o: ptex0.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.o -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
-
-ptex-ptex0.obj: ptex0.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.obj -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
-
-ptex-ptex-pool.o: ptex-pool.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.o -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
-
-ptex-ptex-pool.obj: ptex-pool.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.obj -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
-
 synctexdir/synctex-synctex_main.o: synctexdir/synctex_main.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/synctex-synctex_main.o -MD -MP -MF synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo -c -o synctexdir/synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo synctexdir/$(DEPDIR)/synctex-synctex_main.Po
@@ -18548,20 +18357,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
 
-synctexdir/uptex-synctex.o: synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
-
-synctexdir/uptex-synctex.obj: synctexdir/synctex.c
- at am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
- at am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
-
 uptex-uptexini.o: uptexini.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.o -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
@@ -19927,9 +19722,6 @@
 	-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
 	-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
 	-rm -f ./$(DEPDIR)/pooltype.Po
-	-rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
-	-rm -f ./$(DEPDIR)/ptex-ptex0.Po
-	-rm -f ./$(DEPDIR)/ptex-ptexini.Po
 	-rm -f ./$(DEPDIR)/tangle.Po
 	-rm -f ./$(DEPDIR)/tangleboot.Po
 	-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -20510,7 +20302,6 @@
 	-rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
 	-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
 	-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
-	-rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
 	-rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
@@ -20521,10 +20312,8 @@
 	-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
 	-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
 	-rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
-	-rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
 	-rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
-	-rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
 	-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
 	-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
@@ -20707,9 +20496,6 @@
 	-rm -f ./$(DEPDIR)/pmpost-psvgout.Po
 	-rm -f ./$(DEPDIR)/pmpost-ptfmin.Po
 	-rm -f ./$(DEPDIR)/pooltype.Po
-	-rm -f ./$(DEPDIR)/ptex-ptex-pool.Po
-	-rm -f ./$(DEPDIR)/ptex-ptex0.Po
-	-rm -f ./$(DEPDIR)/ptex-ptexini.Po
 	-rm -f ./$(DEPDIR)/tangle.Po
 	-rm -f ./$(DEPDIR)/tangleboot.Po
 	-rm -f ./$(DEPDIR)/tex-tex-pool.Po
@@ -21290,7 +21076,6 @@
 	-rm -f pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
 	-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
 	-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
-	-rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
 	-rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
@@ -21301,10 +21086,8 @@
 	-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
 	-rm -f synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
 	-rm -f synctexdir/$(DEPDIR)/pdftex-synctex.Po
-	-rm -f synctexdir/$(DEPDIR)/ptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/synctex-synctex_main.Po
 	-rm -f synctexdir/$(DEPDIR)/tex-synctex.Po
-	-rm -f synctexdir/$(DEPDIR)/uptex-synctex.Po
 	-rm -f synctexdir/$(DEPDIR)/xetex-synctex.Po
 	-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
 	-rm -f uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
@@ -22022,29 +21805,6 @@
 # Generate ptex.ch
 ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
 	$(tie_c) ptex.web $(ptex_ch_srcs)
-ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-ptexdir/pver.log ptexdir/wcfname.log: ptex$(EXEEXT)
-#pweb_tests = \
-#	ptexdir/pbibtex.test \
-#	ptexdir/pdvitype.test \
-#	ptexdir/ppltotf.test \
-#	ptexdir/ptftopl.test
-#pweb_tests += \
-#	ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
-#	ptexdir/pbibtex-mem.test ptexdir/nissya.test
-#pweb_tests += \
-#	ptexdir/sample.test
-# ppPLtoTF/pTFtoPL
-#pweb_tests += \
-#	ptexdir/yokotate.test ptexdir/skipjfmp.test
-ptexdir/pbibtex.log: pbibtex$(EXEEXT)
-ptexdir/pdvitype.log: pdvitype$(EXEEXT)
-ptexdir/ppltotf.log: ppltotf$(EXEEXT)
-ptexdir/ptftopl.log: ptftopl$(EXEEXT)
-ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
-	ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
-ptexdir/sample.log: pdvitype$(EXEEXT)
-ptexdir/yokotate.log ptexdir/skipjfmp.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
 ptrip.diffs: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: ptrip-clean
@@ -22150,6 +21910,9 @@
 	$(up_tangle) uptftopl uptftopl
 uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
 	$(tie_m) tftopl.web tftopl.ch
+
+# upTeX Tests
+#uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
 uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log: uptex$(EXEEXT)
 uptexdir/upbibtex.log: upbibtex$(EXEEXT)
@@ -22193,7 +21956,7 @@
 	$(tie_c) euptex.web $(euptex_ch_srcs)
 euptexdir/euptriptest.log euptexdir/eptriptest.log: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/eupver.log: euptex$(EXEEXT)
+euptexdir/eupver.log euptexdir/wcfname.log: euptex$(EXEEXT)
 euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 	$(triptrap_diffs) $@
 .PHONY: euptrip-clean

Modified: trunk/Build/source/texk/web2c/ac/web2c.ac
===================================================================
--- trunk/Build/source/texk/web2c/ac/web2c.ac	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/ac/web2c.ac	2023-01-15 05:09:14 UTC (rev 65543)
@@ -31,9 +31,7 @@
 m4_define([kpse_tex_progs], [dnl
 [[tex],       [yes], [no],  [TeX],        []],
 [[etex],      [no],  [yes], [e-TeX],      [zlib]],
-[[ptex],      [yes], [yes], [pTeX],       [ptexenc zlib]],
 [[eptex],     [yes], [yes], [e-pTeX],     [ptexenc zlib]],
-[[uptex],     [yes], [yes], [upTeX],      [ptexenc zlib]],
 [[euptex],    [yes], [yes], [e-upTeX],    [ptexenc zlib]],
 [[aleph],     [yes], [],    [Aleph],      []],
 [[hitex],     [yes], [],    [HiTeX],      [zlib]],

Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/configure	2023-01-15 05:09:14 UTC (rev 65543)
@@ -834,18 +834,10 @@
 EUPTEX_SYNCTEX_TRUE
 EUPTEX_FALSE
 EUPTEX_TRUE
-UPTEX_SYNCTEX_FALSE
-UPTEX_SYNCTEX_TRUE
-UPTEX_FALSE
-UPTEX_TRUE
 EPTEX_SYNCTEX_FALSE
 EPTEX_SYNCTEX_TRUE
 EPTEX_FALSE
 EPTEX_TRUE
-PTEX_SYNCTEX_FALSE
-PTEX_SYNCTEX_TRUE
-PTEX_FALSE
-PTEX_TRUE
 ETEX_SYNCTEX_FALSE
 ETEX_SYNCTEX_TRUE
 ETEX_FALSE
@@ -1042,12 +1034,8 @@
 enable_tex_synctex
 enable_etex
 enable_etex_synctex
-enable_ptex
-enable_ptex_synctex
 enable_eptex
 enable_eptex_synctex
-enable_uptex
-enable_uptex_synctex
 enable_euptex
 enable_euptex_synctex
 enable_aleph
@@ -1785,12 +1773,8 @@
   --enable-tex-synctex      build TeX with SyncTeX support
   --enable-etex           compile and install e-TeX
   --disable-etex-synctex    build e-TeX without SyncTeX support
-  --disable-ptex          do not compile and install pTeX
-  --disable-ptex-synctex    build pTeX without SyncTeX support
   --disable-eptex         do not compile and install e-pTeX
   --disable-eptex-synctex   build e-pTeX without SyncTeX support
-  --disable-uptex         do not compile and install upTeX
-  --disable-uptex-synctex   build upTeX without SyncTeX support
   --disable-euptex        do not compile and install e-upTeX
   --disable-euptex-synctex  build e-upTeX without SyncTeX support
   --disable-aleph         do not compile and install Aleph
@@ -19728,28 +19712,6 @@
 test "x$enable_web2c:$enable_etex" = xyes:yes && {
   need_zlib=yes
 }
-# Check whether --enable-ptex was given.
-if test ${enable_ptex+y}
-then :
-  enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_ptex=yes ;;
-esac
-
-# Check whether --enable-ptex-synctex was given.
-if test ${enable_ptex_synctex+y}
-then :
-  enableval=$enable_ptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-eptex was given.
 if test ${enable_eptex+y}
 then :
@@ -19772,28 +19734,6 @@
   need_ptexenc=yes
   need_zlib=yes
 }
-# Check whether --enable-uptex was given.
-if test ${enable_uptex+y}
-then :
-  enableval=$enable_uptex;
-fi
-case $enable_uptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_uptex=yes ;;
-esac
-
-# Check whether --enable-uptex-synctex was given.
-if test ${enable_uptex_synctex+y}
-then :
-  enableval=$enable_uptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_uptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-euptex was given.
 if test ${enable_euptex+y}
 then :
@@ -22436,35 +22376,6 @@
   ETEX_SYNCTEX_TRUE='#'
   ETEX_SYNCTEX_FALSE=
 fi
- if test "x$enable_ptex" = xyes; then
-  PTEX_TRUE=
-  PTEX_FALSE='#'
-else
-  PTEX_TRUE='#'
-  PTEX_FALSE=
-fi
-
-case $enable_native_texlive_build:$enable_ptex_synctex in #(
-  yes:yes | no:yes | no:no) :
-     ;; #(
-  *) :
-    if test -z "$enable_ptex_synctex"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ptex-synctex=yes'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-ptex-synctex=yes'" >&6;}
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&5
-printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-ptex-synctex=yes' (native TeX Live build)" >&2;}
-fi
-         enable_ptex_synctex=yes ;;
-esac
- if test "x$enable_ptex_synctex" = xyes; then
-  PTEX_SYNCTEX_TRUE=
-  PTEX_SYNCTEX_FALSE='#'
-else
-  PTEX_SYNCTEX_TRUE='#'
-  PTEX_SYNCTEX_FALSE=
-fi
  if test "x$enable_eptex" = xyes; then
   EPTEX_TRUE=
   EPTEX_FALSE='#'
@@ -22494,35 +22405,6 @@
   EPTEX_SYNCTEX_TRUE='#'
   EPTEX_SYNCTEX_FALSE=
 fi
- if test "x$enable_uptex" = xyes; then
-  UPTEX_TRUE=
-  UPTEX_FALSE='#'
-else
-  UPTEX_TRUE='#'
-  UPTEX_FALSE=
-fi
-
-case $enable_native_texlive_build:$enable_uptex_synctex in #(
-  yes:yes | no:yes | no:no) :
-     ;; #(
-  *) :
-    if test -z "$enable_uptex_synctex"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-uptex-synctex=yes'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-uptex-synctex=yes'" >&6;}
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&5
-printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&2;}
-fi
-         enable_uptex_synctex=yes ;;
-esac
- if test "x$enable_uptex_synctex" = xyes; then
-  UPTEX_SYNCTEX_TRUE=
-  UPTEX_SYNCTEX_FALSE='#'
-else
-  UPTEX_SYNCTEX_TRUE='#'
-  UPTEX_SYNCTEX_FALSE=
-fi
  if test "x$enable_euptex" = xyes; then
   EUPTEX_TRUE=
   EUPTEX_FALSE='#'
@@ -23738,7 +23620,7 @@
 fi
 
 
-if test "x$enable_ptex:$enable_eptex" = xno:no
+if test "x$enable_eptex" = xno:no
 then :
   enable_pweb_progs=no
 else $as_nop
@@ -23753,7 +23635,7 @@
 fi
 
 
-if test "x$enable_uptex:$enable_euptex" = xno:no
+if test "x$enable_euptex" = xno:no
 then :
   enable_upweb_progs=no
 else $as_nop
@@ -28418,14 +28300,6 @@
   as_fn_error $? "conditional \"ETEX_SYNCTEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${PTEX_TRUE}" && test -z "${PTEX_FALSE}"; then
-  as_fn_error $? "conditional \"PTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${PTEX_SYNCTEX_TRUE}" && test -z "${PTEX_SYNCTEX_FALSE}"; then
-  as_fn_error $? "conditional \"PTEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${EPTEX_TRUE}" && test -z "${EPTEX_FALSE}"; then
   as_fn_error $? "conditional \"EPTEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28434,14 +28308,6 @@
   as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then
-  as_fn_error $? "conditional \"UPTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${UPTEX_SYNCTEX_TRUE}" && test -z "${UPTEX_SYNCTEX_FALSE}"; then
-  as_fn_error $? "conditional \"UPTEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${EUPTEX_TRUE}" && test -z "${EUPTEX_FALSE}"; then
   as_fn_error $? "conditional \"EUPTEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5

Modified: trunk/Build/source/texk/web2c/configure.ac
===================================================================
--- trunk/Build/source/texk/web2c/configure.ac	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/configure.ac	2023-01-15 05:09:14 UTC (rev 65543)
@@ -206,12 +206,12 @@
 
 AM_CONDITIONAL([WEB], [test "x$enable_web_progs" != xno])
 
-AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no],
+AS_IF([test "x$enable_eptex" = xno:no],
       [enable_pweb_progs=no],
       [enable_pweb_progs=$enable_web_progs])
 AM_CONDITIONAL([PWEB], [test "x$enable_pweb_progs" != xno])
 
-AS_IF([test "x$enable_uptex:$enable_euptex" = xno:no],
+AS_IF([test "x$enable_euptex" = xno:no],
       [enable_upweb_progs=no],
       [enable_upweb_progs=$enable_web_progs])
 AM_CONDITIONAL([UPWEB], [test "x$enable_upweb_progs" != xno])

Copied: trunk/Build/source/texk/web2c/eptexdir/COPYRIGHT (from rev 65542, trunk/Build/source/texk/web2c/euptexdir/COPYRIGHT)
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/COPYRIGHT	                        (rev 0)
+++ trunk/Build/source/texk/web2c/eptexdir/COPYRIGHT	2023-01-15 05:09:14 UTC (rev 65543)
@@ -0,0 +1,26 @@
+Copyright (C) 2009 ASCII MEDIA WORKS.
+Copyright (C) 2010-2023 Japanese TeX Development Community
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the author may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: trunk/Build/source/texk/web2c/eptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/ChangeLog	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/eptexdir/ChangeLog	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,3 +1,16 @@
+2023-01-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* wcfname.test, am/eptex.am:
+	Add tests for file names with JIS X 0208 characters
+	in `eptex --kanji-internal={euc,sjis}`.
+	https://github.com/texjporg/tex-jp-build/issues/136
+	* eptexextra.h:
+	Make AUTHOR "Japanese TeX Development Community".
+	* am/eptex.am:
+	Now we use alias of e-pTeX (eptex) for pTeX (ptex).
+	https://github.com/texjporg/tex-jp-build/issues/32
+	* COPYRIGHT: Add.
+
 2022-12-22  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* eptex.defines:

Modified: trunk/Build/source/texk/web2c/eptexdir/am/eptex.am
===================================================================
--- trunk/Build/source/texk/web2c/eptexdir/am/eptex.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/eptexdir/am/eptex.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -9,6 +9,7 @@
 ##
 if EPTEX
 bin_PROGRAMS += eptex
+bin_links += eptex$(EXEEXT):ptex
 endif EPTEX
 EXTRA_PROGRAMS += eptex
 

Modified: trunk/Build/source/texk/web2c/euptexdir/COPYRIGHT
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/COPYRIGHT	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/euptexdir/COPYRIGHT	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,5 +1,6 @@
 Copyright (C) 2009 ASCII MEDIA WORKS.
-Copyright (C) 2007-2022 Takuji Tanaka
+Copyright (C) 2007-2023 Takuji Tanaka
+Copyright (C) 2010-2023 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/Build/source/texk/web2c/euptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/euptexdir/ChangeLog	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,3 +1,18 @@
+2023-01-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* wcfname.test, am/euptex.am:
+	Add tests for file names with JIS X 0208 & UTF-8 characters
+	in `euptex --kanji-internal={euc,sjis,uptex}`.
+	https://github.com/texjporg/tex-jp-build/issues/136
+	* eptriptest.test, am/euptex.am:
+	Add tests for e-pTeX compatible mode.
+	* euptexextra.h:
+	Make AUTHOR "Japanese TeX Development Community".
+	* am/euptex.am:
+	Now we use alias of e-upTeX (euptex) for upTeX (uptex).
+	https://github.com/texjporg/tex-jp-build/issues/32
+	* COPYRIGHT: copyright year.
+
 2022-12-22  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* euptex.defines:

Modified: trunk/Build/source/texk/web2c/euptexdir/am/euptex.am
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/am/euptex.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/euptexdir/am/euptex.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -9,6 +9,7 @@
 ##
 if EUPTEX
 bin_PROGRAMS += euptex
+bin_links += euptex$(EXEEXT):uptex
 endif EUPTEX
 EXTRA_PROGRAMS += euptex
 

Modified: trunk/Build/source/texk/web2c/lib/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/lib/Makefile.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/lib/Makefile.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -10,9 +10,9 @@
 @KPATHSEA_RULE@
 
 noinst_LIBRARIES = lib.a
-if PTEX
+if EPTEX
 noinst_LIBRARIES += libp.a
-endif PTEX
+endif EPTEX
 EXTRA_LIBRARIES = libp.a
 
 ## We don't compile `texmfmp.c'; this file is included from 'texextra.c'

Modified: trunk/Build/source/texk/web2c/lib/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/lib/Makefile.in	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/lib/Makefile.in	2023-01-15 05:09:14 UTC (rev 65543)
@@ -88,7 +88,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
- at PTEX_TRUE@am__append_1 = libp.a
+ at EPTEX_TRUE@am__append_1 = libp.a
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \

Modified: trunk/Build/source/texk/web2c/man/Makefile.am
===================================================================
--- trunk/Build/source/texk/web2c/man/Makefile.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/man/Makefile.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -54,7 +54,7 @@
 pdftex_man_sources = pdftex.man pdftosrc.man ttf2afm.man
 EXTRA_DIST += $(pdftex_man_sources)
 
-if PTEX
+if EPTEX
 man_sources += ptex.man
 man1_links += ptex:eptex ptex:euptex ptex:uptex
 man_sources += ppltotf.man ptftopl.man
@@ -61,7 +61,7 @@
 man1_links += ppltotf:uppltotf ptftopl:uptftopl
 man_sources += pbibtex.man
 man1_links += pbibtex:upbibtex
-endif PTEX
+endif EPTEX
 EXTRA_DIST += ptex.man ppltotf.man ptftopl.man pbibtex.man
 
 if LUATEX

Modified: trunk/Build/source/texk/web2c/man/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/man/Makefile.in	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/man/Makefile.in	2023-01-15 05:09:14 UTC (rev 65543)
@@ -97,10 +97,10 @@
 @ETEX_TRUE at am__append_8 = etex.man
 @PDFTEX_TRUE at am__append_9 = $(pdftex_man_sources)
 @PDFTEX_TRUE at am__append_10 = pdftex:pdflatex
- at PTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
- at PTEX_TRUE@	pbibtex.man
- at PTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
- at PTEX_TRUE@	ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
+ at EPTEX_TRUE@am__append_11 = ptex.man ppltotf.man ptftopl.man \
+ at EPTEX_TRUE@	pbibtex.man
+ at EPTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \
+ at EPTEX_TRUE@	ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
 @LUATEX_TRUE at am__append_13 = luatex.man
 @LUATEX_TRUE at am__append_14 = luatex:texlua luatex:texluac \
 @LUATEX_TRUE@  luatex:luahbtex luatex:luajittex \

Modified: trunk/Build/source/texk/web2c/ptexdir/COPYRIGHT
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/COPYRIGHT	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/ptexdir/COPYRIGHT	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,5 +1,5 @@
 Copyright (C) 2009 ASCII MEDIA WORKS.
-Copyright (C) 2010-2022 Japanese TeX Development Community
+Copyright (C) 2010-2023 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/Build/source/texk/web2c/ptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/ptexdir/ChangeLog	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,3 +1,19 @@
+2023-01-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* ptexextra.h:
+	Make AUTHOR "Japanese TeX Development Community".
+	* {nissya,pbibtex{,-mem},pdvitype,sample}.test,
+	{ppltotf,ptftopl,skipjfmp,yokotate}.test,
+	pbibtex-{longline,openout}-test.pl:
+	Remove unused tests.
+	* {pbibtex,pdvitype,ppltotf,ptftopl}.ch:
+	Remove unused change files.
+	* am/ptex.am:
+	Remove binaries of pTeX (ptex).
+	Now we use alias of e-pTeX (eptex) for pTeX (ptex).
+	https://github.com/texjporg/tex-jp-build/issues/32
+	* COPYRIGHT: copyright year.
+
 2022-12-28  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* wcfname.test, am/ptex.am:

Modified: trunk/Build/source/texk/web2c/ptexdir/am/ptex.am
===================================================================
--- trunk/Build/source/texk/web2c/ptexdir/am/ptex.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/ptexdir/am/ptex.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -8,9 +8,7 @@
 ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
 ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
 ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
-p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
 
-#pweb_programs = pbibtex pdvitype ppltotf ptftopl
 
 ## pTeX library
 ##
@@ -25,27 +23,8 @@
 libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h ptexdir/kanji_dump.c
 libkanji_a_CPPFLAGS = $(ptex_cppflags)
 
-## pTeX
-##
-if PTEX
-bin_PROGRAMS += ptex
-endif PTEX
-#if PWEB
-#bin_PROGRAMS += $(pweb_programs)
-#endif PWEB
-#EXTRA_PROGRAMS += ptex $(pweb_programs)
-
 ptex_CPPFLAGS = $(ptex_cppflags)
 
-# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs)
-ptex_DEPENDENCIES = $(ptex_dependencies)
-
-# pTeX C sources
-ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
-nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
-dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h ptexdir/ptex_version.h
-
 # We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
 ptex_prereq = ptexd.h ptexdir/ptex_version.h
 $(ptex_OBJECTS): $(ptex_prereq)
@@ -92,7 +71,7 @@
 DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \
 	ptex.p ptex.pool ptex-tangle
 
-## 
+##
 EXTRA_DIST += \
 	ptexdir/COPYRIGHT \
 	ptexdir/COPYRIGHT.jis \
@@ -101,53 +80,10 @@
 	ptexdir/INSTALL.txt \
 	ptexdir/README.txt
 
-# pTeX Tests
-#
-ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/wcfname.test
-ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-ptexdir/pver.log ptexdir/wcfname.log: ptex$(EXEEXT)
-#pweb_tests = \
-#	ptexdir/pbibtex.test \
-#	ptexdir/pdvitype.test \
-#	ptexdir/ppltotf.test \
-#	ptexdir/ptftopl.test
-## pBibTeX
-#pweb_tests += \
-#	ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl \
-#	ptexdir/pbibtex-mem.test ptexdir/nissya.test
-## pDviType
-#pweb_tests += \
-#	ptexdir/sample.test
-# ppPLtoTF/pTFtoPL
-#pweb_tests += \
-#	ptexdir/yokotate.test ptexdir/skipjfmp.test
-ptexdir/pbibtex.log: pbibtex$(EXEEXT)
-ptexdir/pdvitype.log: pdvitype$(EXEEXT)
-ptexdir/ppltotf.log: ppltotf$(EXEEXT)
-ptexdir/ptftopl.log: ptftopl$(EXEEXT)
-ptexdir/pbibtex-openout-test.log ptexdir/pbibtex-longline-test.log \
-	ptexdir/pbibtex-mem.log ptexdir/nissya.log: pbibtex$(EXEEXT)
-ptexdir/sample.log: pdvitype$(EXEEXT)
-ptexdir/yokotate.log ptexdir/skipjfmp.log: ppltotf$(EXEEXT) ptftopl$(EXEEXT)
-
-EXTRA_DIST += $(ptex_tests) $(pweb_tests)
-DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
-	$(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
-
-if PTEX
-TESTS += $(ptex_tests)
-TRIPTRAP += ptrip.diffs
-TRIPTRAP_CLEAN += ptrip-clean
-endif PTEX
-if PWEB
-TESTS += $(pweb_tests)
-endif PWEB
-
 ## Test data and results
 ##
 ## ptexdir/nissya.test
-EXTRA_DIST += ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
-	ptexdir/tests/nissya_bib.bbl
+EXTRA_DIST += ptexdir/tests/nissya.bst ptexdir/tests/sample.bib
 DISTCLEANFILES += ptests/nissya_bib.*
 ## ptexdir/pbibtex.test
 EXTRA_DIST += tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib tests/enc-sjis.bib \

Modified: trunk/Build/source/texk/web2c/synctexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/synctexdir/ChangeLog	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/synctexdir/ChangeLog	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,3 +1,7 @@
+2023-01-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* am/synctex.am: Remove ptex and uptex.
+
 2022-08-30  Karl Berry  <karl at freefriends.org>
 
 	* man1/synctex.1,

Modified: trunk/Build/source/texk/web2c/synctexdir/am/synctex.am
===================================================================
--- trunk/Build/source/texk/web2c/synctexdir/am/synctex.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/synctexdir/am/synctex.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -151,72 +151,6 @@
 	synctexdir/synctex-e-mem.ch1 \
 	synctexdir/synctex-e-rec.ch0
 
-## SyncTeX infrastructure: pTeX
-
-if PTEX_SYNCTEX
-
-ptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-
-ptex_LDADD += $(ZLIB_LIBS)
-ptex_prereq += $(ZLIB_DEPEND)
-
-ptex_ch_synctex = \
-	synctexdir/synctex-def.ch0 \
-	synctexdir/synctex-p-mem.ch0 \
-	synctexdir/synctex-mem.ch0 \
-	synctexdir/synctex-p-mem.ch1 \
-	synctexdir/synctex-p-rec.ch0 \
-	synctexdir/synctex-rec.ch0 \
-	synctexdir/synctex-rec.ch1 \
-	synctexdir/synctex-rec.ch2 \
-	synctexdir/synctex-p-rec.ch1
-
-dist_ptex_SOURCES += \
-	synctexdir/synctex.c \
-	synctexdir/synctex.h \
-	synctexdir/synctex-common.h \
-	synctexdir/synctex-ptex.h
-
-ptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-
-endif PTEX_SYNCTEX
-
-EXTRA_DIST += \
-	synctexdir/synctex-p-mem.ch0 \
-	synctexdir/synctex-p-mem.ch1 \
-	synctexdir/synctex-p-rec.ch0 \
-	synctexdir/synctex-p-rec.ch1
-
-## SyncTeX infrastructure: upTeX
-
-if UPTEX_SYNCTEX
-
-uptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-
-uptex_LDADD += $(ZLIB_LIBS)
-uptex_prereq += $(ZLIB_DEPEND)
-
-uptex_ch_synctex = \
-	synctexdir/synctex-def.ch0 \
-	synctexdir/synctex-p-mem.ch0 \
-	synctexdir/synctex-mem.ch0 \
-	synctexdir/synctex-p-mem.ch1 \
-	synctexdir/synctex-p-rec.ch0 \
-	synctexdir/synctex-rec.ch0 \
-	synctexdir/synctex-rec.ch1 \
-	synctexdir/synctex-rec.ch2 \
-	synctexdir/synctex-p-rec.ch1
-
-dist_uptex_SOURCES += \
-	synctexdir/synctex.c \
-	synctexdir/synctex.h \
-	synctexdir/synctex-common.h \
-	synctexdir/synctex-uptex.h
-
-uptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-
-endif UPTEX_SYNCTEX
-
 ## SyncTeX infrastructure: e-pTeX
 
 if EPTEX_SYNCTEX

Modified: trunk/Build/source/texk/web2c/uptexdir/COPYRIGHT
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/COPYRIGHT	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/uptexdir/COPYRIGHT	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,5 +1,5 @@
 Copyright (C) 2009 ASCII MEDIA WORKS.
-Copyright (C) 2007-2022 Takuji Tanaka
+Copyright (C) 2007-2023 Takuji Tanaka
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog	2023-01-15 05:09:14 UTC (rev 65543)
@@ -1,3 +1,13 @@
+2023-01-15  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* uptexextra.h:
+	Make AUTHOR "Japanese TeX Development Community".
+	* am/uptex.am:
+	Remove binaries of upTeX (uptex).
+	Now we use alias of e-upTeX (euptex) for upTeX (uptex).
+	https://github.com/texjporg/tex-jp-build/issues/32
+	* COPYRIGHT: copyright year.
+
 2022-12-28  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* wcfname.test, am/uptex.am:

Modified: trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/am/uptex.am	2023-01-15 05:09:03 UTC (rev 65542)
+++ trunk/Build/source/texk/web2c/uptexdir/am/uptex.am	2023-01-15 05:09:14 UTC (rev 65543)
@@ -20,9 +20,9 @@
 
 ## upTeX
 ##
-if UPTEX
-bin_PROGRAMS += uptex
-endif UPTEX
+#if UPTEX
+#bin_PROGRAMS += uptex
+#endif UPTEX
 if UPWEB
 bin_PROGRAMS += $(upweb_programs)
 endif UPWEB
@@ -165,7 +165,7 @@
 	uptexdir/ChangeLog
 
 # upTeX Tests
-uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
+#uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test
 uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
 uptexdir/upver.log uptexdir/upkcat.log uptexdir/wcfname.log: uptex$(EXEEXT)
 upweb_tests = \
@@ -198,11 +198,11 @@
 DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \
 	$(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web)
 
-if UPTEX
-TESTS += $(uptex_tests)
-TRIPTRAP += uptrip.diffs
-TRIPTRAP_CLEAN += uptrip-clean
-endif UPTEX
+#if UPTEX
+#TESTS += $(uptex_tests)
+#TRIPTRAP += uptrip.diffs
+#TRIPTRAP_CLEAN += uptrip-clean
+#endif UPTEX
 if UPWEB
 TESTS += $(upweb_tests)
 endif UPWEB



More information about the tex-live-commits mailing list.