diff options
31 files changed, 141 insertions, 9897 deletions
diff --git a/Build/source/m4/kpse-ptexenc-flags.m4 b/Build/source/m4/kpse-ptexenc-flags.m4 index 1ecd0703451..a7532dda44a 100644 --- a/Build/source/m4/kpse-ptexenc-flags.m4 +++ b/Build/source/m4/kpse-ptexenc-flags.m4 @@ -16,9 +16,8 @@ # LIBS required for the `-lptexenc' library in texk/ptexenc/ of the TL tree. AC_DEFUN([KPSE_PTEXENC_FLAGS], [_KPSE_TEXLIB_FLAGS([ptexenc], [ptexenc], [lt], - [-IBLD/texk -ISRC/texk], [BLD/texk/ptexenc/libptexenc.la], [], - [${top_srcdir}/../ptexenc/*.[ch]], - [${top_builddir}/../ptexenc/ptexenc.h])[]dnl + [-IBLD/texk/ptexenc -ISRC/texk/ptexenc], [BLD/texk/ptexenc/libptexenc.la], [], + [${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h])[]dnl ]) # KPSE_PTEXENC_FLAGS # KPSE_PTEXENC_OPTIONS([WITH-SYSTEM]) diff --git a/Build/source/texk/makejvf/Makefile.am b/Build/source/texk/makejvf/Makefile.am index 7fd74864057..628a6580a0c 100644 --- a/Build/source/texk/makejvf/Makefile.am +++ b/Build/source/texk/makejvf/Makefile.am @@ -5,7 +5,7 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) bin_PROGRAMS = makejvf diff --git a/Build/source/texk/makejvf/Makefile.in b/Build/source/texk/makejvf/Makefile.in index 2dc2b9b4844..3e06501b503 100644 --- a/Build/source/texk/makejvf/Makefile.in +++ b/Build/source/texk/makejvf/Makefile.in @@ -228,7 +228,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) makejvf_SOURCES = \ main.c makejvf.h tfmread.c tool.c write.c diff --git a/Build/source/texk/makejvf/configure b/Build/source/texk/makejvf/configure index 39f7f689535..b84af63657d 100755 --- a/Build/source/texk/makejvf/configure +++ b/Build/source/texk/makejvf/configure @@ -13252,7 +13252,7 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ + PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ @@ -13261,9 +13261,7 @@ else PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` PTEXENC_RULE='# Rebuild libptexenc -$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h - cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../ptexenc/ptexenc.h: +$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/mendexk/Makefile.am b/Build/source/texk/mendexk/Makefile.am index 1fc993214f8..bf5fe2dda07 100644 --- a/Build/source/texk/mendexk/Makefile.am +++ b/Build/source/texk/mendexk/Makefile.am @@ -5,7 +5,7 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in index 72f12f9b11d..0114f795a36 100644 --- a/Build/source/texk/mendexk/Makefile.in +++ b/Build/source/texk/mendexk/Makefile.in @@ -251,7 +251,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) +INCLUDES = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 AM_CFLAGS = $(WARNING_CFLAGS) mendex_SOURCES = \ diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 71a873a311b..b53c22232b4 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -13252,7 +13252,7 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ + PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ @@ -13261,9 +13261,7 @@ else PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` PTEXENC_RULE='# Rebuild libptexenc -$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h - cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../ptexenc/ptexenc.h: +$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL index bc6c66bab18..de57a930de3 100644 --- a/Build/source/texk/ptexenc/ChangeLog.TL +++ b/Build/source/texk/ptexenc/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for ptexenc =============================================== +2010-05-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + Moved headers (except jisx0208.h) to ptexenc/, removed patches/. + * Makefile.am, configure.ac: Adjusted. + 2010-04-22 Peter Breitenlohner <peb@mppmu.mpg.de> * ptexenc.[ch] (input_line3): Removed. diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index e691774faa0..cbd9e7765ce 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ../../m4 .PHONY: rebuild rebuild: all -INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/.. +INCLUDES = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la @@ -20,25 +20,24 @@ libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO) # Note: jisx0208.h is a copy of ../../libs/gd/gd-2.0.35/jisx0208.h. # -libptexenc_la_SOURCES = jisx0208.h kanjicnv.c ptexenc.c unicode-jp.c unicode.c +libptexenc_la_SOURCES = \ + jisx0208.h \ + kanjicnv.c \ + ptexenc.c \ + unicode-jp.c \ + unicode.c ## Rebuild libkpathsea @KPATHSEA_RULE@ -ptexencincludedir = ${includedir}/ptexenc +nobase_nodist_include_HEADERS = \ + ptexenc/c-auto.h -nodist_ptexencinclude_HEADERS = c-auto.h - -ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h +nobase_include_HEADERS = \ + ptexenc/kanjicnv.h \ + ptexenc/ptexenc.h \ + ptexenc/unicode-jp.h \ + ptexenc/unicode.h EXTRA_DIST = COPYRIGHT ChangeLog.TL -## Eventually delete these files -## -EXTRA_DIST += \ - patches/jmpost-0.04b-ptexenc.patch \ - patches/makejvf-1.1a-ptexenc.patch \ - patches/mendexk2.6f-ptexenc.patch \ - patches/ptex-src-3.1.11-ptexenc.patch \ - patches/texlive2009-ptexenc.patch \ - patches/texlive2009.sh diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 7a4d9029af8..531b8e4d5ff 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -36,7 +36,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(ptexencinclude_HEADERS) \ +DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ $(srcdir)/../../build-aux/depcomp \ @@ -64,7 +64,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = c-auto.h +CONFIG_HEADER = $(top_builddir)/ptexenc/c-auto.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -88,9 +88,8 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(ptexencincludedir)" \ - "$(DESTDIR)$(ptexencincludedir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libptexenc_la_LIBADD = am_libptexenc_la_OBJECTS = libptexenc_la-kanjicnv.lo \ @@ -100,7 +99,7 @@ libptexenc_la_OBJECTS = $(am_libptexenc_la_OBJECTS) libptexenc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libptexenc_la_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ptexenc depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -115,7 +114,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libptexenc_la_SOURCES) DIST_SOURCES = $(libptexenc_la_SOURCES) -HEADERS = $(nodist_ptexencinclude_HEADERS) $(ptexencinclude_HEADERS) +HEADERS = $(nobase_include_HEADERS) $(nobase_nodist_include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -250,7 +249,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/.. +INCLUDES = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libptexenc.la libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL @@ -258,17 +257,24 @@ libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO) # Note: jisx0208.h is a copy of ../../libs/gd/gd-2.0.35/jisx0208.h. # -libptexenc_la_SOURCES = jisx0208.h kanjicnv.c ptexenc.c unicode-jp.c unicode.c -ptexencincludedir = ${includedir}/ptexenc -nodist_ptexencinclude_HEADERS = c-auto.h -ptexencinclude_HEADERS = kanjicnv.h ptexenc.h unicode-jp.h unicode.h -EXTRA_DIST = COPYRIGHT ChangeLog.TL patches/jmpost-0.04b-ptexenc.patch \ - patches/makejvf-1.1a-ptexenc.patch \ - patches/mendexk2.6f-ptexenc.patch \ - patches/ptex-src-3.1.11-ptexenc.patch \ - patches/texlive2009-ptexenc.patch patches/texlive2009.sh -all: c-auto.h - $(MAKE) $(AM_MAKEFLAGS) all-am +libptexenc_la_SOURCES = \ + jisx0208.h \ + kanjicnv.c \ + ptexenc.c \ + unicode-jp.c \ + unicode.c + +nobase_nodist_include_HEADERS = \ + ptexenc/c-auto.h + +nobase_include_HEADERS = \ + ptexenc/kanjicnv.h \ + ptexenc/ptexenc.h \ + ptexenc/unicode-jp.h \ + ptexenc/unicode.h + +EXTRA_DIST = COPYRIGHT ChangeLog.TL +all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -307,22 +313,22 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -c-auto.h: stamp-h1 +ptexenc/c-auto.h: ptexenc/stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + rm -f ptexenc/stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) ptexenc/stamp-h1; \ else :; fi -stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status c-auto.h +ptexenc/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status + @rm -f ptexenc/stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status ptexenc/c-auto.h $(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) - rm -f stamp-h1 + rm -f ptexenc/stamp-h1 touch $@ distclean-hdr: - -rm -f c-auto.h stamp-h1 + -rm -f ptexenc/c-auto.h ptexenc/stamp-h1 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -425,46 +431,52 @@ clean-libtool: distclean-libtool: -rm -f libtool config.lt -install-nodist_ptexencincludeHEADERS: $(nodist_ptexencinclude_HEADERS) +install-nobase_includeHEADERS: $(nobase_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(ptexencincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ptexencincludedir)" - @list='$(nodist_ptexencinclude_HEADERS)'; test -n "$(ptexencincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(ptexencincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(ptexencincludedir)" || exit $$?; \ + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ + $(am__nobase_list) | while read dir files; do \ + xfiles=; for file in $$files; do \ + if test -f "$$file"; then xfiles="$$xfiles $$file"; \ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ + echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ + $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ done -uninstall-nodist_ptexencincludeHEADERS: +uninstall-nobase_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_ptexencinclude_HEADERS)'; test -n "$(ptexencincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ + $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(ptexencincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(ptexencincludedir)" && rm -f $$files -install-ptexencincludeHEADERS: $(ptexencinclude_HEADERS) + echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(includedir)" && rm -f $$files +install-nobase_nodist_includeHEADERS: $(nobase_nodist_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(ptexencincludedir)" || $(MKDIR_P) "$(DESTDIR)$(ptexencincludedir)" - @list='$(ptexencinclude_HEADERS)'; test -n "$(ptexencincludedir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(ptexencincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(ptexencincludedir)" || exit $$?; \ + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" + @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + $(am__nobase_list) | while read dir files; do \ + xfiles=; for file in $$files; do \ + if test -f "$$file"; then xfiles="$$xfiles $$file"; \ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ + echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ + $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ done -uninstall-ptexencincludeHEADERS: +uninstall-nobase_nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(ptexencinclude_HEADERS)'; test -n "$(ptexencincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + @list='$(nobase_nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(ptexencincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(ptexencincludedir)" && rm -f $$files + echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(includedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -667,9 +679,9 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) c-auto.h +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ptexencincludedir)" "$(DESTDIR)$(ptexencincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -721,8 +733,8 @@ info: info-am info-am: -install-data-am: install-nodist_ptexencincludeHEADERS \ - install-ptexencincludeHEADERS +install-data-am: install-nobase_includeHEADERS \ + install-nobase_nodist_includeHEADERS install-dvi: install-dvi-am @@ -770,11 +782,10 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES \ - uninstall-nodist_ptexencincludeHEADERS \ - uninstall-ptexencincludeHEADERS +uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS \ + uninstall-nobase_nodist_includeHEADERS -.MAKE: all install-am install-strip +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \ @@ -786,15 +797,15 @@ uninstall-am: uninstall-libLTLIBRARIES \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libLTLIBRARIES \ - install-man install-nodist_ptexencincludeHEADERS install-pdf \ - install-pdf-am install-ps install-ps-am \ - install-ptexencincludeHEADERS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-man install-nobase_includeHEADERS \ + install-nobase_nodist_includeHEADERS install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-nodist_ptexencincludeHEADERS \ - uninstall-ptexencincludeHEADERS + uninstall-nobase_includeHEADERS \ + uninstall-nobase_nodist_includeHEADERS # Rebuild diff --git a/Build/source/texk/ptexenc/c-auto.in b/Build/source/texk/ptexenc/c-auto.in index 22de8f48e28..6aa188dee0a 100644 --- a/Build/source/texk/ptexenc/c-auto.in +++ b/Build/source/texk/ptexenc/c-auto.in @@ -1,6 +1,6 @@ /* c-auto.in. Generated from configure.ac by autoheader. */ -/* c-auto.h: defines for ptexenc, as determined by configure. */ +/* ptexenc/c-auto.h: defines for ptexenc, as determined by configure. */ /* Guard against double inclusion. */ #ifndef PTEXENC_C_AUTO_H #define PTEXENC_C_AUTO_H diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 39e2d0b3c0c..2da610406c6 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -13387,7 +13387,7 @@ done fi -ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" +ac_config_headers="$ac_config_headers ptexenc/c-auto.h:c-auto.in" @@ -14369,7 +14369,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; + "ptexenc/c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS ptexenc/c-auto.h:c-auto.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -15691,8 +15691,9 @@ _LT_EOF chmod +x "$ofile" ;; - "c-auto.h":H) sed -e 's/^#define PACKAGE/#define PTEXENC_PACKAGE/' \ - -e 's/^#define VERSION/#define PTEXENC_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h ;; + "ptexenc/c-auto.h":H) sed -e 's/^#define PACKAGE/#define PTEXENC_PACKAGE/' \ + -e 's/^#define VERSION/#define PTEXENC_VERSION/' ptexenc/c-auto.h >c-auto.tmp \ + && mv -f c-auto.tmp ptexenc/c-auto.h ;; esac done # for ac_tag diff --git a/Build/source/texk/ptexenc/configure.ac b/Build/source/texk/ptexenc/configure.ac index 2c84aeacbec..49081f51bfe 100644 --- a/Build/source/texk/ptexenc/configure.ac +++ b/Build/source/texk/ptexenc/configure.ac @@ -74,11 +74,12 @@ AC_CHECK_FUNCS([atexit on_exit], [break]) fi dnl Write output here, instead of putting a zillion -D's on the command line. -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], +AC_CONFIG_HEADERS([ptexenc/c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define PTEXENC_PACKAGE/' \ - -e 's/^#define VERSION/#define PTEXENC_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h]) + -e 's/^#define VERSION/#define PTEXENC_VERSION/' ptexenc/c-auto.h >c-auto.tmp \ + && mv -f c-auto.tmp ptexenc/c-auto.h]) -AH_TOP([/* c-auto.h: defines for ptexenc, as determined by configure. */ +AH_TOP([/* ptexenc/c-auto.h: defines for ptexenc, as determined by configure. */ /* Guard against double inclusion. */ #ifndef PTEXENC_C_AUTO_H #define PTEXENC_C_AUTO_H diff --git a/Build/source/texk/ptexenc/patches/jmpost-0.04b-ptexenc.patch b/Build/source/texk/ptexenc/patches/jmpost-0.04b-ptexenc.patch deleted file mode 100644 index 0790abba8ca..00000000000 --- a/Build/source/texk/ptexenc/patches/jmpost-0.04b-ptexenc.patch +++ /dev/null @@ -1,636 +0,0 @@ -Index: kanjiencoding.c -=================================================================== ---- jmpost-0.04b.orig/kanjiencoding.c -+++ jmpost-0.04b/kanjiencoding.c 1970-01-01 09:00:00 +0900 -@@ -1,9 +0,0 @@ --#include "../kanji.h" -- --#if TERM_CODE == JIS --char prockanjicode = JIS; --#elif TERM_CODE == SJIS --char prockanjicode = SJIS; --#else --char prockanjicode = EUC; --#endif -Index: ext.defines -=================================================================== ---- jmpost-0.04b.orig/ext.defines -+++ jmpost-0.04b/ext.defines 1970-01-01 09:00:00 +0900 -@@ -1 +0,0 @@ --@define const PDVITOMPHELP; -Index: prockanji.defines -=================================================================== ---- jmpost-0.04b.orig/prockanji.defines -+++ jmpost-0.04b/prockanji.defines 1970-01-01 09:00:00 +0900 -@@ -1 +0,0 @@ --@define var prockanjicode; -Index: jmp.ch -=================================================================== ---- jmpost-0.04b.orig/jmp.ch -+++ jmpost-0.04b/jmp.ch -@@ -18,12 +18,9 @@ - wterm (version_string); - @y - wterm (banner); --case proc_kanji_code of -- 0: wterm(' (JIS)'); -- 1: wterm(' (EUC)'); -- 2: wterm(' (SJIS)'); -- othercases wterm(' (?)'); --endcases; -+wterm(' ('); -+wterm(stringcast(get_enc_string)); -+wterm(')'); - wterm (version_string); - @z - -@@ -90,9 +87,9 @@ - wlog (version_string); - @y - begin wlog(banner); --ifdef('OUTJIS') wlog(' (JIS)'); endif('OUTJIS')@/ --ifdef('OUTSJIS') wlog(' (SJIS)'); endif('OUTSJIS')@/ --ifdef('OUTEUC') wlog(' (EUC)'); endif('OUTEUC')@/ -+wlog(' ('); -+wlog(stringcast(get_enc_string)); -+wlog(')'); - wlog (version_string); - @z - -@@ -257,8 +254,8 @@ - lost_warning(f,k) - else begin - if (not font_jfm_p(f)) then cc:=char_info(f)(str_pool[k]) -- else begin incr(k); -- cc:=char_info(f)(lookup_ctype(f,str_pool[k-1]*256+str_pool[k])) -+ else begin -+ cc:=char_info(f)(lookup_ctype(f,fromBUFF(str_pool,limit,k))); incr(k) - end; - @z - -@@ -291,19 +288,12 @@ - print("<"); - while i<str_stop(s) do - begin if ps_offset+5>max_print_line then print_ln; -- k:=so(str_pool[i]);@/ -- incr(i); -- if (proc_kanji_code=1) then -- c:=EUCtoJIS(k*@'400+so(str_pool[i])) -- else if(proc_kanji_code=2) then -- c:=SJIStoJIS(k*@'400+so(str_pool[i])); -- k:=(c div @'400); -- hex_digit_out(k div 16); -- hex_digit_out(k mod 16); -- k:=c mod @'400; -- hex_digit_out(k div 16); -- hex_digit_out(k mod 16); -- incr(i); -+ c:=toDVI(fromBUFF(str_pool, i+2, i)); -+ i:=i+2; -+ hex_digit_out(Hi(c) div 16); -+ hex_digit_out(Hi(c) mod 16); -+ hex_digit_out(Lo(c) div 16); -+ hex_digit_out(Lo(c) mod 16); - end; - print(">"); - end; -Index: configure -=================================================================== ---- jmpost-0.04b.orig/configure -+++ jmpost-0.04b/configure -@@ -6,11 +6,7 @@ - echo "please make orignal Web2c programs before make jMetaPost." - exit 1 - fi --if [ ! -f ../kanji.o ]; then -- echo "../kanji.o not found." -- echo "please do configure Ascii pTeX before make jMetaPost." -- exit 1 --fi -+ - CONFIG_FILES=Makefile - CONFIG_HEADERS=.. - export CONFIG_FILES CONFIG_HEADERS -Index: Makefile.in -=================================================================== ---- jmpost-0.04b.orig/Makefile.in -+++ jmpost-0.04b/Makefile.in -@@ -5,7 +5,7 @@ - - version = @WEB2CVERSION@ - --default: programs formats -+default all: programs fmtutil.cnf - - programs=jmpost pdvitomp - -@@ -14,6 +14,7 @@ - .SUFFIXES: # get rid of .p.o - ac_include ../../../make/common.mk - ac_include ../../../make/programs.mk -+ac_include ../../../ptexenc/programs.mk - - @MAINT@ifeq ($(CC), gcc) - @MAINT@XDEFS = -Wimplicit -Wreturn-type -Wcomment -Wformat -@@ -28,13 +29,12 @@ - $(makevars) $(common_makeargs) - - proglib = ../../lib/lib.a --XCFLAGS = -I.. - - # The sh script that does the conversion: - web2c = srcdir=$(thisdir) $(SHELL) $(thisdir)/jconvert - # Additional dependencies: - web2c_aux = $(thisdir)/jconvert $(cwebdir)/common.defines \ -- ../kanji.defines ./ext.defines -+ $(thisdir)/kanji.defines - web2c_programs = $(cwebdir)/fixwrites $(cwebdir)/splitup $(cwebdir)/web2c - - # Unfortunately, suffix rules can't have dependencies, or multiple -@@ -44,8 +44,11 @@ - $(web2c) $* - ### .ch.p: # really depends on $(srcdir)/tangle; for ptex, also generates .pool - ### $(srcdir)/tangle $(thisdir)/$*.web $< --plib_o = ../kanji.o version.o kanjiencoding.o - -+jmp_c = mpini.c mp0.c mp1.c mp2.c -+jmp_o = mpini.o mp0.o mp1.o mp2.o jmpextra.o version.o -+plib_o = version.o -+ - # Prevent Make from deleting the intermediate forms. - .PRECIOUS: %.p %.c - -@@ -60,17 +63,11 @@ - kpathsea_parent = $(top_srcdir) - kpathsea_srcdir_parent = $(kpathsea_parent) - --jmp_c = mpini.c mp0.c mp1.c mp2.c --jmp_o = mpini.o mp0.o mp1.o mp2.o jmpextra.o ../kanji.o version.o kanjiencoding.o -- - programs: $(programs) --all_mems = jmpost.mem --formats: mems --mems: $(all_mems) - - ### jMetaPost --jmpost: $(jmp_o) -- $(kpathsea_link) $(jmp_o) $(LOADLIBES) -+jmpost: $(jmp_o) $(kpathsea) $(ptexenc) -+ $(kpathsea_link) $(jmp_o) $(ptexenc) $(LOADLIBES) - $(jmp_c) mpcoerce.h mpd.h: jmp.p $(web2c_aux) $(web2c_programs) $(cwebdir)/cvtmf1.sed $(cwebdir)/cvtmf2.sed - $(web2c) jmp - ###mpextra.c: ../../lib/texmfmp.c -@@ -81,10 +78,9 @@ - $(srcdir)/tie -m jmp.web $(srcdir)/mp.web $(srcdir)/mp.ch jmp.ch - - ### pDVItoMP --pdvitomp: pdvitomp.o $(plib_o) $(kpathsea) $(proglib) -- $(kpathsea_link) pdvitomp.o $(plib_o) $(LOADLIBES) --kanjiencoding.o: kanjiencoding.c --pdvitomp.o: pdvitomp.c ../kanji.h -+pdvitomp: pdvitomp.o $(plib_o) $(ptexenc) $(kpathsea) $(proglib) -+ $(kpathsea_link) pdvitomp.o $(plib_o) $(ptexenc) $(LOADLIBES) -+pdvitomp.o: pdvitomp.c kanji.h - pdvitomp.c: pdvitomp.p $(web2c_aux) - pdvitomp.p: pdvitomp.web $(srcdir)/tangle - $(srcdir)/tangle pdvitomp.web -@@ -92,9 +88,7 @@ - $(srcdir)/tie -m pdvitomp.web $(srcdir)/dvitomp.web \ - $(srcdir)/dvitomp.ch pdvitomp.ch - --../kanji.o: ../kanji.c ../kanji.h -- cd .. && $(MAKE) kanji.o --version.o: version.c ../kanji.h -+version.o: version.c kanji.h - - # Additional dependencies for recompiling the C code are generated - # automatically, included at the end. -@@ -109,19 +103,36 @@ - $(proglib): - cd $(srcdir)/lib && $(MAKE) lib.a - $(kpathsea): -- cd $(kpathsea_dir) && $(MAKE) libkpathsea.a -+ cd $(kpathsea_dir) && $(MAKE) libkpathsea.la -+$(ptexenc): -+ cd $(ptexenc_dir) && $(MAKE) libptexenc.la - -+# -+# Making formats and bases. -+all_mems = jmpost.mem -+formats: mems -+mems: $(all_mems) -+ -+fmtutil.cnf: ../fmtutil.cnf -+ cat ../fmtutil.cnf > $@ -+ echo 'jmpost jmpost - mpost.mp' >> $@ -+ -+dumpenv = TEXMFCNF=$(thisdir) -+ -+jmpost.mem: jmpost -+ $(dumpenv) $(MAKE) $(makeargs) progname=jmpost files=plain.mp prereq-check -+ $(dumpenv) ./jmpost --ini --jobname=jmpost \\input plain dump </dev/null -+ - # This is meant to be called recursively, with $(files) set. - prereq-check: $(kpathsea_dir)/kpsewhich -- $(dumpenv) $(kpathsea_dir)/kpsewhich --progname=$(progname) $(files) >/dev/null \ -- || $(MAKE) prereq-lose >/dev/null -+ $(dumpenv) $(kpathsea_dir)/kpsewhich --progname=$(progname) $(files) >/dev/null || $(MAKE) prereq-lose >/dev/null - - prereq-lose: - @echo "You seem to be missing input files necessary to make the" >&2 - @echo "basic formats (some or all of: $(files))." >&2 - @echo "Perhaps you've defined the default paths incorrectly, or" >&2 - @echo "perhaps you have environment variables set pointing" >&2 -- @echo "to an incorrect location. See ../kpathsea/BUGS." >&2 -+ @echo "to an incorrect location. See $(srcdir)/kpathsea/BUGS." >&2 - @echo >&2 - @echo "If you simply do not have the files, you can" >&2 - @echo "retrieve a minimal set of input files from" >&2 -@@ -134,7 +145,6 @@ - # - install: install-exec install-data - install-exec:: install-links --install-data:: install-formats - - # Installation directories. - $(bindir):: -@@ -144,25 +154,26 @@ - - # The actual binary executables and pool files. - install-programs: $(programs) pmakempx $(bindir) -- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -- $(INSTALL_PROGRAM) pmakempx $(bindir)/pmakempx -+ for p in $(programs) pmakempx; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - - install-links: install-programs $(bindir) - cd $(bindir) && (rm -f inijmpost virjmpost) - --install-formats: install-fmts --install-fmts: $(all_mems) $(web2cdir) -- for f in $(all_mems); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done --# -+install-formats: install-data -+ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ $(scriptdir)/fmtutil-sys --byfmt jmpost -+ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ $(scriptdir)/mktexlsr -+ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ -+ $(scriptdir)/texlinks -+ - # Auxiliary files. --install-data:: -- $(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir) -+install-data:: $(web2cdir) fmtutil.cnf - $(INSTALL_DATA) jmp.pool $(web2cdir)/jmp.pool -- --jmpost.mem: jmpost -- $(dumpenv) $(MAKE) $(makeargs) progname=jmpost files=plain.mp prereq-check -- $(dumpenv) ./jmpost --ini --jobname=jmpost \\input plain dump </dev/null -- -+ if [ -f $(web2cdir)/fmtutil.cnf ]; then \ -+ mv -f $(web2cdir)/fmtutil.cnf $(web2cdir)/fmtutil.cnf.jmpost ;\ -+ else true; fi -+ $(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf - # - # Cleaning. - mostlyclean:: -@@ -171,16 +182,16 @@ - clean:: mostlyclean - rm -f mp.h mpd.h mpcoerce.h mp0.c mp1.c mp2.c mpextra.c mpini.c - rm -f $(programs) *.exe version.o -- rm -f pdvitomp.h pdvitomp.c pdvitomp.o version.c -+ rm -f pdvitomp.h pdvitomp.c pdvitomp.o - distclean:: clean - rm -fr failure - rm -f jmp.web jmp.p jmp.pool jmpost.mem - rm -f pdvitomp.web pdvitomp.p -- rm -f Makefile -+ rm -f Makefile fmtutil.cnf - extraclean:: distclean - rm -f *.aux *.dvi *.log *~ - rm -f CONTENTS.tex a.out core texput.* - - # Makefile. --Makefile: configure Makefile.in -+Makefile: configure $(srcdir)/config.status $(thisdir)/Makefile.in - $(SHELL) configure -Index: jmpost.h -=================================================================== ---- jmpost-0.04b.orig/jmpost.h -+++ jmpost-0.04b/jmpost.h -@@ -34,7 +34,7 @@ - "-interaction=STRING set interaction mode (STRING=batchmode/nonstopmode/", - " scrollmode/errorstopmode)", - "-jobname=STRING set the job name to STRING", --"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis)", -+"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)", - "-kpathsea-debug=NUMBER set path searching debugging flags according to", - " the bits of NUMBER", - "-mem=MEMNAME use MEMNAME instead of program name or a %& line", -@@ -63,7 +63,8 @@ - "", - "-help display this help and exit", - "-version output version information and exit", --"-kanji={jis|euc|sjis} set Japanese encoding", -+"-kanji={jis|euc|sjis|utf8}", -+" set Japanese encoding", - NULL - }; - #endif /* PDVITOMP */ -Index: kanji.h -=================================================================== ---- jmpost-0.04b.orig/kanji.h -+++ jmpost-0.04b/kanji.h -@@ -0,0 +1,34 @@ -+/* -+ kanji.h: Handling 2byte char, and so on. -+*/ -+#ifndef KANJI_H -+#define KANJI_H -+#include "cpascal.h" -+#include <ptexenc/ptexenc.h> -+ -+#define KANJI -+ -+/* functions */ -+#define Hi(x) (((x) >> 8) & 0xff) -+#define Lo(x) ((x) & 0xff) -+ -+#ifndef PRESERVE_PUTC -+#undef putc -+#define putc(c,fp) putc2(c,fp) -+#endif /* !PRESERVE_PUTC */ -+ -+#ifdef TeX -+#undef TEXMFPOOLNAME -+#undef TEXMFENGINENAME -+#define TEXMFPOOLNAME "ptex.pool" -+#define TEXMFENGINENAME "ptex" -+#endif /* TeX */ -+ -+#ifdef MP -+#undef TEXMFPOOLNAME -+#undef TEXMFENGINENAME -+#define TEXMFPOOLNAME "jmp.pool" -+#define TEXMFENGINENAME "jmpost" -+#endif /* MP */ -+ -+#endif /* not KANJI_H */ -Index: version.c -=================================================================== ---- jmpost-0.04b.orig/version.c -+++ jmpost-0.04b/version.c -@@ -30,18 +30,12 @@ - extern const_string local_maintainer; /* from maintain.h */ - extern string versionstring; /* from web2c/lib/version.c */ - extern KPSEDLL string kpathsea_version_string;/* from kpathsea/version.c */ -- string prog_name, term_code; -+ string prog_name; - extern string based_prog_name; - unsigned len; - const_string prog_name_end; - const_string prog_version; - -- switch (prockanjicode) { -- case JIS: term_code=" (JIS)"; break; -- case SJIS: term_code=" (SJIS)"; break; -- default: term_code=" (EUC)"; break; -- } -- - prog_name_end = strchr (banner, ','); - prog_version = prog_name_end + sizeof("Version") + 2; - len = prog_name_end - banner - sizeof ("This is"); -@@ -50,8 +44,8 @@ - prog_name[len] = 0; - - /* The Web2c version string starts with a space. */ -- fprintf (stdout, "%s %s%s%s\n", -- prog_name, prog_version, term_code, versionstring); -+ fprintf (stdout, "%s %s (%s)%s\n", -+ prog_name, prog_version, get_enc_string(), versionstring); - fputs (kpathsea_version_string, stdout); - putc('\n', stdout); - -Index: kanji.defines -=================================================================== ---- jmpost-0.04b.orig/kanji.defines -+++ jmpost-0.04b/kanji.defines -@@ -0,0 +1,17 @@ -+{ defined at kanji.c, kanji.h, ptexenc/ptexenc.h } -+@define function Hi (); -+@define function Lo (); -+ -+@define function getencstring; -+@define function setencstring (); -+ -+@define function multistrlen (); -+@define function fromBUFF (); -+@define function toBUFF (); -+ -+@define function fromDVI (); -+@define function toDVI (); -+@define function putc2 (); -+@define function inputline2 (); -+ -+@define const PDVITOMPHELP; -Index: jconvert -=================================================================== ---- jmpost-0.04b.orig/jconvert -+++ jmpost-0.04b/jconvert -@@ -19,8 +19,7 @@ - - convert_jmp () { - cat $web2cdir/common.defines $web2cdir/texmf.defines \ -- $web2cdir/mfmp.defines ./prockanji.defines \ -- ../kanji.defines ./jmp.p \ -+ $web2cdir/mfmp.defines kanji.defines ./jmp.p \ - | sed -f $web2cdir/cvtmf1.sed \ - | $web2cdir/web2c -h../../texmfmp.h -m -cmpcoerce \ - | sed -f $web2cdir/cvtmf2.sed \ -@@ -34,8 +33,7 @@ - } - - convert_tool () { -- cat $web2cdir/common.defines ./prockanji.defines \ -- ../kanji.defines ext.defines $target.p \ -+ cat $web2cdir/common.defines kanji.defines $target.p \ - | $web2cdir/web2c -hjmpost.h -c$target \ - | $web2cdir/fixwrites > $target.c - } -Index: jmpextra.c -=================================================================== ---- jmpost-0.04b.orig/jmpextra.c -+++ jmpost-0.04b/jmpextra.c -@@ -1030,18 +1030,13 @@ - } else { - WARNING1 ("Ignoring unknown argument `%s' to --interaction", optarg); - } -- -+#ifdef KANJI - } else if (ARGUMENT_IS ("kanji")) { - /* These numbers match @d's in *.ch */ -- if (STREQ (optarg, "jis")) { -- prockanjicode = 0; -- } else if (STREQ (optarg, "euc")) { -- prockanjicode = 1; -- } else if (STREQ (optarg, "sjis")) { -- prockanjicode = 2; -- } else { -+ if (!set_enc_string(optarg,optarg)) { - WARNING1 ("Ignoring unknown argument `%s' to --kanji", optarg); - } -+#endif /* KANJI */ - - } else if (ARGUMENT_IS ("help")) { - usagehelp (PROGRAM_HELP, BUG_ADDRESS); -@@ -1153,7 +1148,7 @@ - if (d_name && kpse_readable_file (d_name)) { - dump_name = xstrdup (part[0]); - kpse_reset_program_name (dump_name); -- /* Tell TeX/MF/MP we have a %&name line... */ -+ /* Tell TeX/MF/MP we have a %&name line... */ - dumpline = true; - } - free (f_name); -@@ -1438,47 +1433,9 @@ - - /* Recognize either LF or CR as a line terminator. */ - last = first; --#if defined(KANJI) -- while (last < bufsize-3 && (i = getc (f)) != EOF && i != '\n' && i != '\r') { -- static int injis=0; -- if (i == '\033') { /* ESC */ -- if ((i = getc(f)) == '$') { /* Kanji-In */ -- i = getc(f); -- if (i == '@' || i == 'B') { -- injis = 1; -- } else { -- buffer[last++] = '\033'; -- buffer[last++] = '$'; -- buffer[last++] = i; -- } -- } else if (i == '(') { /* Kanji-out */ -- i = getc(f); -- if (i == 'J' || i == 'B' || i == 'H') { -- injis = 0; -- } else { -- buffer[last++] = '\033'; -- buffer[last++] = '('; -- buffer[last++] = i; -- } -- } else { -- buffer[last++] = '\033'; -- buffer[last++] = i; -- } -- } else { /* rather than ESC */ -- if (injis == 0) { -- buffer[last++] = i; -- } else { -- /* JIS encoding */ -- if(prockanjicode == 2) -- i = JIStoSJIS(i << 8 | getc(f)); -- else if(prockanjicode == 1) -- i = JIStoEUC(i << 8 | getc(f)); -- buffer[last++] = (i >> 8) & 0xff; -- buffer[last++] = i & 0xff; -- } -- } -- } --#else -+#ifdef KANJI -+ last = input_line2(f, buffer, last, bufsize, &i); -+#else /* KANJI */ - while (last < bufsize && (i = getc (f)) != EOF && i != '\n' && i != '\r') - buffer[last++] = i; - #endif /* KANJI */ -@@ -1793,9 +1750,9 @@ - /* Get the job name to be used, which may have been set from the - command line. */ - strnumber --getjobname(strnumber name) -+getjobname() - { -- strnumber ret = name; -+ strnumber ret = curname; - if (job_name != NULL) - ret = maketexstring(job_name); - return ret; -@@ -1846,7 +1803,6 @@ - boolean - isnewsource P2C(strnumber, srcfilename, int, lineno) - { -- size_t len; - char *name = gettexstring(srcfilename); - return (compare_paths(name, last_source_name) != 0 || lineno != last_lineno); - } -@@ -1855,8 +1811,6 @@ - remembersourceinfo P2C(strnumber, srcfilename, - int, lineno) - { -- size_t len; -- - if (last_source_name) - free(last_source_name); - last_source_name = gettexstring(srcfilename); -Index: pdvitomp.ch -=================================================================== ---- jmpost-0.04b.orig/pdvitomp.ch -+++ jmpost-0.04b/pdvitomp.ch -@@ -334,6 +334,16 @@ - @z - - @x -+@<Define |parse_arguments|@> = -+procedure parse_arguments; -+const n_options = 2; {Pascal won't count array lengths for us.} -+@y -+@<Define |parse_arguments|@> = -+procedure parse_arguments; -+const n_options = 3; {Pascal won't count array lengths for us.} -+@z -+ -+@x - var @!long_options: array[0..n_options] of getopt_struct; - @!getopt_return_val: integer; - @!option_index: c_int_type; -@@ -438,14 +448,9 @@ - next_jfm_char_index:=0; - - @ @<Set process kanji code@>= -- if strcmp(optarg, 'jis') = 0 then -- proc_kanji_code:=0 -- else if strcmp(optarg, 'euc') = 0 then -- proc_kanji_code:=1 -- else if strcmp(optarg, 'sjis') = 0 then -- proc_kanji_code:=2 -- else -- print_ln('Bad kanjicode encoding', optarg, '.'); -+ if (not set_enc_string(optarg,optarg)) then begin -+ write_ln('Bad kanjicode encoding "', stringcast(optarg), '".'); -+ end; - - @ JFM character type table is stored in the array |jfm_char_code| and - |jfm_char_type|. The character code and the character type of $i$-th -@@ -491,7 +496,7 @@ - @ Every Kanji characters are supposed to be printable here, - so that the state always results in normal at the end of the procedure. - Kanji characters need to be converted into output Kanji encoding --from JIS. -+from DVI(JIS). - - @<Declare subroutines for printing strings@>= - procedure print_kanji_char(@!c:integer); -@@ -509,11 +514,8 @@ - print('"'); incr(print_col); - state:=normal; - end; -- if (proc_kanji_code=1) then -- c:=JIStoEUC(c) -- else if (proc_kanji_code=2) then -- c:=JIStoSJIS(c); -- print(xchr[c div 256]); print(xchr[c mod 256]); -+ c:=toBUFF(fromDVI(c)); -+ print(xchr[Hi(c)]); print(xchr[Lo(c)]); - print_col:=print_col+2; - end; - @z diff --git a/Build/source/texk/ptexenc/patches/makejvf-1.1a-ptexenc.patch b/Build/source/texk/ptexenc/patches/makejvf-1.1a-ptexenc.patch deleted file mode 100644 index ba1f3ab26a8..00000000000 --- a/Build/source/texk/ptexenc/patches/makejvf-1.1a-ptexenc.patch +++ /dev/null @@ -1,1311 +0,0 @@ -Index: configure -=================================================================== ---- makejvf-1.1a.orig/configure -+++ makejvf-1.1a/configure -@@ -1,9 +1,7 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for makeindex for TeX Live 2.15. -+# Generated by GNU Autoconf 2.63 for makejvf for TeX Live 1.1a. - # --# Report bugs to <tex-k@tug.org>. --# - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation -@@ -743,13 +741,13 @@ - SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. --PACKAGE_NAME='makeindex for TeX Live' --PACKAGE_TARNAME='makeindex-for-tex-live' --PACKAGE_VERSION='2.15' --PACKAGE_STRING='makeindex for TeX Live 2.15' --PACKAGE_BUGREPORT='tex-k@tug.org' -+PACKAGE_NAME='makejvf for TeX Live' -+PACKAGE_TARNAME='makejvf-for-tex-live' -+PACKAGE_VERSION='1.1a' -+PACKAGE_STRING='makejvf for TeX Live 1.1a' -+PACKAGE_BUGREPORT='' - --ac_unique_file="mkind.c" -+ac_unique_file="main.c" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> -@@ -790,6 +788,10 @@ - am__EXEEXT_TRUE - LTLIBOBJS - LIBOBJS -+PTEXENC_RULE -+PTEXENC_DEPEND -+PTEXENC_LIBS -+PTEXENC_INCLUDES - KPATHSEA_RULE - KPATHSEA_DEPEND - KPATHSEA_LIBS -@@ -1480,7 +1482,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures makeindex for TeX Live 2.15 to adapt to many kinds of systems. -+\`configure' configures makejvf for TeX Live 1.1a to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1529,7 +1531,7 @@ - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root -- [DATAROOTDIR/doc/makeindex-for-tex-live] -+ [DATAROOTDIR/doc/makejvf-for-tex-live] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] -@@ -1551,7 +1553,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of makeindex for TeX Live 2.15:";; -+ short | recursive ) echo "Configuration of makejvf for TeX Live 1.1a:";; - esac - cat <<\_ACEOF - -@@ -1598,7 +1600,6 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --Report bugs to <tex-k@tug.org>. - _ACEOF - ac_status=$? - fi -@@ -1661,7 +1662,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --makeindex for TeX Live configure 2.15 -+makejvf for TeX Live configure 1.1a - generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -@@ -1675,7 +1676,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by makeindex for TeX Live $as_me 2.15, which was -+It was created by makejvf for TeX Live $as_me 1.1a, which was - generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ -@@ -4328,13 +4329,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:4331: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4332: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4334: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4335: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4337: output\"" >&5) -+ (eval echo "\"\$as_me:4338: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -5540,7 +5541,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5543 "configure"' > conftest.$ac_ext -+ echo '#line 5544 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -6934,8 +6935,8 @@ - - - # Define the identity of the package. -- PACKAGE='makeindex-for-tex-live' -- VERSION='2.15' -+ PACKAGE='makejvf-for-tex-live' -+ VERSION='1.1a' - - - # Some tools Automake needs. -@@ -7492,11 +7493,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7495: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7496: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7499: \$? = $ac_status" >&5 -+ echo "$as_me:7500: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7831,11 +7832,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7834: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7835: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7838: \$? = $ac_status" >&5 -+ echo "$as_me:7839: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7936,11 +7937,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7939: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7940: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7943: \$? = $ac_status" >&5 -+ echo "$as_me:7944: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -7991,11 +7992,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7994: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7995: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7998: \$? = $ac_status" >&5 -+ echo "$as_me:7999: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10791,7 +10792,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10794 "configure" -+#line 10795 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10887,7 +10888,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10890 "configure" -+#line 10891 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12237,12 +12238,7 @@ - $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------- ## --## Report this to tex-k@tug.org ## --## ---------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -12934,9 +12930,7 @@ - - - -- -- --for ac_header in ctype.h types.h locale.h -+for ac_header in strings.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -13054,12 +13048,7 @@ - $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------- ## --## Report this to tex-k@tug.org ## --## ---------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -13088,8 +13077,7 @@ - - - -- --for ac_func in strchr strrchr setlocale -+for ac_func in strdup strtol - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -13529,7 +13517,7 @@ - Report bugs to <bug-libtool@gnu.org>." - - lt_cl_version="\ --makeindex for TeX Live config.lt 2.15 -+makejvf for TeX Live config.lt 1.1a - configured by $0, generated by GNU Autoconf 2.63. - - Copyright (C) 2008 Free Software Foundation, Inc. -@@ -14529,7 +14517,22 @@ - cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS)' - fi - -+## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags -+ PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ -+ -e "s,SRC/,$kpse_SRC/,g" \ -+ -e "s,BLD/,$kpse_BLD/,g"` -+ PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e "s,BLD/,$kpse_BLD/,g"` - -+ PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e 's,BLD/,${top_builddir}/../../,g'` -+ PTEXENC_RULE='# Rebuild libptexenc -+$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS) -+${top_builddir}/../ptexenc/ptexenc.h: -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS)' -+ -+ - ac_config_files="$ac_config_files Makefile" - - -@@ -14981,7 +14984,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by makeindex for TeX Live $as_me 2.15, which was -+This file was extended by makejvf for TeX Live $as_me 1.1a, which was - generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -15044,7 +15047,7 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ --makeindex for TeX Live config.status 2.15 -+makejvf for TeX Live config.status 1.1a - configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - - -Property changes on: configure -___________________________________________________________________ -Modified: svn:executable - - - + * - -Index: Makefile.in -=================================================================== ---- makejvf-1.1a.orig/Makefile.in -+++ makejvf-1.1a/Makefile.in -@@ -15,7 +15,6 @@ - - @SET_MAKE@ - -- - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -35,10 +34,10 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = makeindex$(EXEEXT) -+bin_PROGRAMS = makejvf$(EXEEXT) - subdir = . --DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \ -- $(dist_man1_MANS) $(srcdir)/../../build-aux/config.guess \ -+DIST_COMMON = $(am__configure_deps) \ -+ $(srcdir)/../../build-aux/config.guess \ - $(srcdir)/../../build-aux/config.sub \ - $(srcdir)/../../build-aux/depcomp \ - $(srcdir)/../../build-aux/install-sh \ -@@ -50,11 +49,11 @@ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/ltmain.sh \ - ../../build-aux/missing ../../build-aux/mkinstalldirs \ -- ../../build-aux/texinfo.tex ../../build-aux/ylwrap COPYING \ -- ChangeLog INSTALL NEWS -+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/../../m4/libtool.m4 \ - $(top_srcdir)/../../m4/ltoptions.m4 \ -@@ -70,37 +69,13 @@ - CONFIG_HEADER = c-auto.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ -- "$(DESTDIR)$(man1dir)" -+am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) --am_makeindex_OBJECTS = genind.$(OBJEXT) mkind.$(OBJEXT) \ -- qsort.$(OBJEXT) scanid.$(OBJEXT) scanst.$(OBJEXT) \ -- sortid.$(OBJEXT) --makeindex_OBJECTS = $(am_makeindex_OBJECTS) --makeindex_LDADD = $(LDADD) -+am_makejvf_OBJECTS = main.$(OBJEXT) tfmread.$(OBJEXT) tool.$(OBJEXT) \ -+ write.$(OBJEXT) -+makejvf_OBJECTS = $(am_makejvf_OBJECTS) -+makejvf_LDADD = $(LDADD) - am__DEPENDENCIES_1 = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; --am__install_max = 40 --am__nobase_strip_setup = \ -- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` --am__nobase_strip = \ -- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" --am__nobase_list = $(am__nobase_strip_setup); \ -- for p in $$list; do echo "$$p $$p"; done | \ -- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -- if (++n[$$2] == $(am__install_max)) \ -- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -- END { for (dir in files) print dir, files[dir] }' --am__base_list = \ -- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --SCRIPTS = $(dist_bin_SCRIPTS) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp - am__depfiles_maybe = depfiles -@@ -114,11 +89,8 @@ - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(makeindex_SOURCES) --DIST_SOURCES = $(makeindex_SOURCES) --man1dir = $(mandir)/man1 --NROFF = nroff --MANS = $(dist_man1_MANS) -+SOURCES = $(makejvf_SOURCES) -+DIST_SOURCES = $(makejvf_SOURCES) - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -188,6 +160,9 @@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -@@ -248,26 +223,14 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I ../../m4 --INCLUDES = $(KPATHSEA_INCLUDES) --AM_CPPFLAGS = -DUNIX -DKPATHSEA -+INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) - AM_CFLAGS = $(WARNING_CFLAGS) --dist_bin_SCRIPTS = mkindex --makeindex_SOURCES = \ -- genind.c \ -- genind.h \ -- mkind.c \ -- mkind.h \ -- qsort.c \ -- scanid.c \ -- scanid.h \ -- scanst.c \ -- scanst.h \ -- sortid.c -+makejvf_SOURCES = \ -+ main.c makejvf.h tfmread.c tool.c write.c - --makeindex_DEPENDENCIES = $(KPATHSEA_DEPEND) --LDADD = $(KPATHSEA_LIBS) --dist_man1_MANS = makeindex.1 mkindex.1 --EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING -+makejvf_DEPENDENCIES = $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) -+LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) -+EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt - all: c-auto.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -@@ -367,56 +330,20 @@ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --makeindex$(EXEEXT): $(makeindex_OBJECTS) $(makeindex_DEPENDENCIES) -- @rm -f makeindex$(EXEEXT) -- $(LINK) $(makeindex_OBJECTS) $(makeindex_LDADD) $(LIBS) --install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) -- @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" -- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ -- done | \ -- sed -e 'p;s,.*/,,;n' \ -- -e 'h;s|.*|.|' \ -- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ -- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ -- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -- if ($$2 == $$4) { files[d] = files[d] " " $$1; \ -- if (++n[d] == $(am__install_max)) { \ -- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ -- else { print "f", d "/" $$4, $$1 } } \ -- END { for (d in files) print "f", d, files[d] }' | \ -- while read type dir files; do \ -- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -- test -z "$$files" || { \ -- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ -- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ -- } \ -- ; done -+makejvf$(EXEEXT): $(makejvf_OBJECTS) $(makejvf_DEPENDENCIES) -+ @rm -f makejvf$(EXEEXT) -+ $(LINK) $(makejvf_OBJECTS) $(makejvf_LDADD) $(LIBS) - --uninstall-dist_binSCRIPTS: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ -- files=`for p in $$list; do echo "$$p"; done | \ -- sed -e 's,.*/,,;$(transform)'`; \ -- test -n "$$list" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(bindir)" && rm -f $$files -- - mostlyclean-compile: - -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genind.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkind.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsort.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanid.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanst.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortid.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tfmread.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -447,41 +374,7 @@ - - distclean-libtool: - -rm -f libtool config.lt --install-man1: $(dist_man1_MANS) -- @$(NORMAL_INSTALL) -- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" -- @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ -- { for i in $$list; do echo "$$i"; done; \ -- } | while read p; do \ -- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; echo "$$p"; \ -- done | \ -- sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ -- sed 'N;N;s,\n, ,g' | { \ -- list=; while read file base inst; do \ -- if test "$$base" = "$$inst"; then list="$$list $$file"; else \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ -- fi; \ -- done; \ -- for i in $$list; do echo "$$i"; done | $(am__base_list) | \ -- while read files; do \ -- test -z "$$files" || { \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ -- done; } - --uninstall-man1: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ -- files=`{ for i in $$list; do echo "$$i"; done; \ -- } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -- test -z "$$files" || { \ -- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } -- - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -535,19 +428,6 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- @list='$(MANS)'; if test -n "$$list"; then \ -- list=`for p in $$list; do \ -- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -- if test -n "$$list" && \ -- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -- echo " typically \`make maintainer-clean' will remove them" >&2; \ -- exit 1; \ -- else :; fi; \ -- else :; fi - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -@@ -695,9 +575,9 @@ - exit 1; } >&2 - check-am: all-am - check: check-am --all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) c-auto.h -+all-am: Makefile $(PROGRAMS) c-auto.h - installdirs: -- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ -+ for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -748,13 +628,13 @@ - - info-am: - --install-data-am: install-man -+install-data-am: - - install-dvi: install-dvi-am - - install-dvi-am: - --install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS -+install-exec-am: install-binPROGRAMS - - install-html: install-html-am - -@@ -764,7 +644,7 @@ - - install-info-am: - --install-man: install-man1 -+install-man: - - install-pdf: install-pdf-am - -@@ -796,11 +676,8 @@ - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ -- uninstall-man -+uninstall-am: uninstall-binPROGRAMS - --uninstall-man: uninstall-man1 -- - .MAKE: all install-am install-strip - - .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ -@@ -810,20 +687,19 @@ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ -- install-binPROGRAMS install-data install-data-am \ -- install-dist_binSCRIPTS install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -+ install-binPROGRAMS install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-dist_binSCRIPTS uninstall-man \ -- uninstall-man1 -+ uninstall-binPROGRAMS - - - @KPATHSEA_RULE@ -+@PTEXENC_RULE@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: c-auto.in -=================================================================== ---- makejvf-1.1a.orig/c-auto.in -+++ makejvf-1.1a/c-auto.in -@@ -0,0 +1,162 @@ -+/* c-auto.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if the `closedir' function returns void instead of `int'. */ -+#undef CLOSEDIR_VOID -+ -+/* Define to 1 if you have the <assert.h> header file. */ -+#undef HAVE_ASSERT_H -+ -+/* Define to 1 if you have the `bcmp' function. */ -+#undef HAVE_BCMP -+ -+/* Define to 1 if you have the `bcopy' function. */ -+#undef HAVE_BCOPY -+ -+/* Define to 1 if you have the `bzero' function. */ -+#undef HAVE_BZERO -+ -+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_DIRENT_H -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the <float.h> header file. */ -+#undef HAVE_FLOAT_H -+ -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ -+/* Define to 1 if you have the `getcwd' function. */ -+#undef HAVE_GETCWD -+ -+/* Define to 1 if you have the `getwd' function. */ -+#undef HAVE_GETWD -+ -+/* Define to 1 if you have the `index' function. */ -+#undef HAVE_INDEX -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the <limits.h> header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define to 1 if you have the `memcmp' function. */ -+#undef HAVE_MEMCMP -+ -+/* Define to 1 if you have the `memcpy' function. */ -+#undef HAVE_MEMCPY -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+#undef HAVE_NDIR_H -+ -+/* Define to 1 if you are using GNU libc or otherwise have global variables -+ `program_invocation_name' and `program_invocation_short_name'. */ -+#undef HAVE_PROGRAM_INVOCATION_NAME -+ -+/* Define to 1 if you have the `putenv' function. */ -+#undef HAVE_PUTENV -+ -+/* Define to 1 if you have the <pwd.h> header file. */ -+#undef HAVE_PWD_H -+ -+/* Define to 1 if you have the `rindex' function. */ -+#undef HAVE_RINDEX -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#undef HAVE_STRCASECMP -+ -+/* Define to 1 if you have the `strchr' function. */ -+#undef HAVE_STRCHR -+ -+/* Define to 1 if you have the `strdup' function. */ -+#undef HAVE_STRDUP -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the `strrchr' function. */ -+#undef HAVE_STRRCHR -+ -+/* Define to 1 if you have the `strstr' function. */ -+#undef HAVE_STRSTR -+ -+/* Define to 1 if you have the `strtol' function. */ -+#undef HAVE_STRTOL -+ -+/* Define to 1 if `st_mtim' is member of `struct stat'. */ -+#undef HAVE_STRUCT_STAT_ST_MTIM -+ -+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_DIR_H -+ -+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_NDIR_H -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#undef HAVE_SYS_PARAM_H -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+#undef inline -+#endif -Index: tool.c -=================================================================== ---- makejvf-1.1a.orig/tool.c -+++ makejvf-1.1a/tool.c -@@ -2,8 +2,9 @@ - #include <strings.h> - #include <math.h> - --int mquad(p) --unsigned char *p; -+#include <kpathsea/config.h> -+ -+int mquad(unsigned char *p) - { - unsigned int cc; - -@@ -15,8 +16,7 @@ - return(cc); - } - --unsigned int utri(p) --unsigned char *p; -+unsigned int utri(unsigned char *p) - { - unsigned int i,cc; - unsigned char fchar[4]; -@@ -30,8 +30,7 @@ - return cc; - } - --int tri(p) --unsigned char *p; -+int tri(unsigned char *p) - { - int i,cc; - unsigned char fchar[4]; -@@ -46,8 +45,7 @@ - return cc; - } - --unsigned int upair(p) --unsigned char *p; -+unsigned int upair(unsigned char *p) - { - unsigned int i,cc; - unsigned char fchar[4]; -@@ -61,8 +59,7 @@ - return cc; - } - --int pair(p) --unsigned char *p; -+int pair(unsigned char *p) - { - int i,cc; - unsigned char fchar[4]; -@@ -77,9 +74,7 @@ - return cc; - } - --int mget(p,num) --char *p; --int num; -+int mget(char *p, int num) - { - switch (num) { - case 1: -@@ -97,8 +92,7 @@ - } - } - --int fquad(fp) --FILE *fp; -+int fquad(FILE *fp) - { - int i,cc; - unsigned char fchar[4]; -@@ -110,8 +104,7 @@ - return cc; - } - --unsigned int uftri(fp) --FILE *fp; -+unsigned int uftri(FILE *fp) - { - unsigned int i,cc; - unsigned char fchar[4]; -@@ -125,8 +118,7 @@ - return cc; - } - --int ftri(fp) --FILE *fp; -+int ftri(FILE *fp) - { - int i,cc; - unsigned char fchar[4]; -@@ -142,8 +134,7 @@ - return cc; - } - --unsigned int ufpair(fp) --FILE *fp; -+unsigned int ufpair(FILE *fp) - { - unsigned int i,cc; - unsigned char fchar[4]; -@@ -157,8 +148,7 @@ - return cc; - } - --int fpair(fp) --FILE *fp; -+int fpair(FILE *fp) - { - int i,cc; - unsigned char fchar[4]; -@@ -174,16 +164,12 @@ - return cc; - } - --int fskip(fp,num) --FILE *fp; --int num; -+int fskip(FILE *fp, int num) - { - fseek(fp,num,1); - } - --int fputnum(num,byte,fp) --int num,byte; --FILE *fp; -+int fputnum(int num, int byte, FILE *fp) - { - int i,cc; - unsigned char buf[16]; -@@ -212,8 +198,7 @@ - return 0; - } - --int numcount(num) --int num; -+int numcount(int num) - { - if (num >= 0) { - if (num <= 127) { -@@ -245,18 +230,13 @@ - } - } - --int fputnum2(num,fp) --int num; --FILE *fp; -+int fputnum2(int num, FILE *fp) - { - fputnum(num,numcount(num),fp); - return 0; - } - --int fputstr(str,byte,fp) --char *str; --int byte; --FILE *fp; -+int fputstr(char *str, int byte, FILE *fp) - { - int i; - -@@ -266,8 +246,7 @@ - - return 0; - } --int cutspace(fp) --FILE *fp; -+int cutspace(FILE *fp) - { - int cc; - -@@ -287,8 +266,7 @@ - } - } - --int gethex(fp) --FILE *fp; -+int gethex(FILE *fp) - { - int cc,i; - char buf[256]; -@@ -312,8 +290,7 @@ - } - } - --int getdec(fp) --FILE *fp; -+int getdec(FILE *fp) - { - int cc,i; - char buf[256]; -Index: tfmread.c -=================================================================== ---- makejvf-1.1a.orig/tfmread.c -+++ makejvf-1.1a/tfmread.c -@@ -2,13 +2,14 @@ - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include "makejvf.h" -+ - int nt,unit,zh,zw,jfm_id; - int *width,*height,*depth,*italic,*glue_kern,*kern,*glue,*param; - char *header,*char_type,*char_info; --extern int baseshift; - --int jfmread(kcode) --int kcode; -+int jfmread(int kcode) - { - int i,ctype = 0,w_ind,w; - -@@ -26,8 +27,7 @@ - return(w); - } - --int tfmget(name) --char *name; -+int tfmget(char *name) - { - int i,j,cc,tsize; - char nbuff[1024]; -@@ -51,8 +51,7 @@ - return 0; - } - --int tfmidx(fp) --FILE *fp; -+int tfmidx(FILE *fp) - { - int i,cc; - int lh,ec,nw,nh,nd,ni,nl,nk,ng,np; -Index: configure.ac -=================================================================== ---- makejvf-1.1a.orig/configure.ac -+++ makejvf-1.1a/configure.ac -@@ -0,0 +1,28 @@ -+dnl Process this file with autoconf to produce a configure script. -+dnl -+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -+dnl -+dnl This file is free software; the copyright holder -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+AC_INIT([makejvf for TeX Live], [1.1a]) -+AC_PREREQ([2.63]) -+AC_CONFIG_SRCDIR([main.c]) -+AC_CONFIG_AUX_DIR([../../build-aux]) -+AC_CONFIG_MACRO_DIR([../../m4]) -+ -+dnl Common code for all programs using libkpathsea. -+KPSE_COMMON([makejvfk], [no-define]) -+ -+AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) -+ -+AC_CHECK_HEADERS([strings.h]) -+AC_CHECK_FUNCS([strdup strtol]) -+ -+KPSE_KPATHSEA_FLAGS -+KPSE_PTEXENC_FLAGS -+ -+AC_CONFIG_FILES([Makefile]) -+ -+AC_OUTPUT -Index: main.c -=================================================================== ---- makejvf-1.1a.orig/main.c -+++ makejvf-1.1a/main.c -@@ -2,18 +2,19 @@ - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include <ptexenc/ptexenc.h> -+#include "makejvf.h" -+ - FILE *vfp,*afp=NULL; - char *atfmname,*vtfmname,*afmname,*vfname,*kanatfm; - int kanatume=-1,chotai=0,baseshift=0,minute=0; - --FILE *vfopen(); -- --main(argc,argv) --int argc; --char **argv; -+int main(int argc, char ** argv) - { - int i,j; - -+ set_enc_string(NULL, "EUC"); - if (argc < 3) { - usage(); - exit(0); -@@ -121,18 +122,18 @@ - exit(0); - } - --usage() -+void usage(void) - { -- fprintf(stderr,"MAKEJVF ver.1.1a -- make Japanese VF file.\n"); -- fprintf(stderr,"%% makejvf [<options>] <TFMfile> <PSfontTFM>\n"); -- fprintf(stderr,"options:\n"); -- fprintf(stderr,"-C ĹÂΥ⡼¥É\n"); -- fprintf(stderr,"-K <TFMfile> Èó´Á»úÉôÍѤ˺îÀ®¤¹¤ëPS¥Õ¥©¥ó¥ÈTFM̾\n"); -- fprintf(stderr,"-b <¿ôÃÍ> ¥Ù¡¼¥¹¥é¥¤¥óÊäÀµ\n"); -- fprintf(stderr," ʸ»ú¤Î¹â¤µ¤ò1000¤È¤·¤ÆÀ°¿ô¤Ç»ØÄê\n"); -- fprintf(stderr," ¥×¥é¥¹¤Çʸ»ú¤¬²¼¤¬¤ê¡¢¥Þ¥¤¥Ê¥¹¤Çʸ»ú¤¬¾å¤¬¤ë\n"); -- fprintf(stderr,"-m ½Ä½ñ¤»þ¤Ë¥¯¥ª¡¼¥È(¡Ç¡É)¤ÎÂå¤ï¤ê¤Ë¥ß¥Ë¥å¡¼¥È(¡ì¡í)¤ò»ÈÍÑ\n"); -- fprintf(stderr,"-a <AFMfile> AFM¥Õ¥¡¥¤¥ë̾¡Ê¤«¤ÊµÍ¤á»þ¤Ë»ÈÍÑ¡Ë\n"); -- fprintf(stderr,"-k <¿ôÃÍ> ¤«¤ÊµÍ¤á¥Þ¡¼¥¸¥ó»ØÄê\n"); -- fprintf(stderr," ʸ»úÉý¤ò1000¤È¤·¤ÆÀ°¿ô¤Ç»ØÄê¡£-a¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍÑ\n"); -+ fputs2("MAKEJVF ver.1.1a -- make Japanese VF file.\n", stderr); -+ fputs2("%% makejvf [<options>] <TFMfile> <PSfontTFM>\n", stderr); -+ fputs2("options:\n", stderr); -+ fputs2("-C ĹÂΥ⡼¥É\n", stderr); -+ fputs2("-K <TFMfile> Èó´Á»úÉôÍѤ˺îÀ®¤¹¤ëPS¥Õ¥©¥ó¥ÈTFM̾\n", stderr); -+ fputs2("-b <¿ôÃÍ> ¥Ù¡¼¥¹¥é¥¤¥óÊäÀµ\n", stderr); -+ fputs2(" ʸ»ú¤Î¹â¤µ¤ò1000¤È¤·¤ÆÀ°¿ô¤Ç»ØÄê\n", stderr); -+ fputs2(" ¥×¥é¥¹¤Çʸ»ú¤¬²¼¤¬¤ê¡¢¥Þ¥¤¥Ê¥¹¤Çʸ»ú¤¬¾å¤¬¤ë\n", stderr); -+ fputs2("-m ½Ä½ñ¤»þ¤Ë¥¯¥ª¡¼¥È(¡Ç¡É)¤ÎÂå¤ï¤ê¤Ë¥ß¥Ë¥å¡¼¥È(¡ì¡í)¤ò»ÈÍÑ\n", stderr); -+ fputs2("-a <AFMfile> AFM¥Õ¥¡¥¤¥ë̾¡Ê¤«¤ÊµÍ¤á»þ¤Ë»ÈÍÑ¡Ë\n", stderr); -+ fputs2("-k <¿ôÃÍ> ¤«¤ÊµÍ¤á¥Þ¡¼¥¸¥ó»ØÄê\n", stderr); -+ fputs2(" ʸ»úÉý¤ò1000¤È¤·¤ÆÀ°¿ô¤Ç»ØÄê¡£-a¥ª¥×¥·¥ç¥ó¤È¶¦¤Ë»ÈÍÑ\n", stderr); - } -Index: makejvf.h -=================================================================== ---- makejvf-1.1a.orig/makejvf.h -+++ makejvf-1.1a/makejvf.h -@@ -0,0 +1,31 @@ -+ -+ -+extern char *vtfmname,*kanatfm; -+extern int unit,zh,zw,jfm_id; -+extern int kanatume,chotai,baseshift,minute; -+extern FILE *afp; -+ -+/* main.c */ -+void usage(void); -+ -+/* tfmread.c */ -+int jfmread(int kcode); -+int tfmget(char *name); -+int tfmidx(FILE *fp); -+ -+/* tool.c */ -+int mquad(unsigned char *p); -+unsigned int upair(unsigned char *p); -+int fquad(FILE *fp); -+unsigned int ufpair(FILE *fp); -+int fpair(FILE *fp); -+int fputnum(int num, int byte, FILE *fp); -+int numcount(int num); -+int fputnum2(int num, FILE *fp); -+int fputstr(char *str, int byte, FILE *fp); -+ -+/* write.c */ -+FILE *vfopen(char *name); -+void writevf(int code, FILE *fp); -+int vfclose(FILE *fp); -+int maketfm(char *name); -Index: Makefile.am -=================================================================== ---- makejvf-1.1a.orig/Makefile.am -+++ makejvf-1.1a/Makefile.am -@@ -1,38 +1,27 @@ --## Makefile.am for the TeX Live subdirectory texk/makeindexk/ -+## Makefile.am for the TeX Live subdirectory texk/makejvfk/ - ## - ## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> - ## You may freely use, modify and/or distribute this file. - ## - ACLOCAL_AMFLAGS = -I ../../m4 - --INCLUDES = $(KPATHSEA_INCLUDES) --AM_CPPFLAGS = -DUNIX -DKPATHSEA -+INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) - AM_CFLAGS = $(WARNING_CFLAGS) - --dist_bin_SCRIPTS = mkindex - --bin_PROGRAMS = makeindex -+bin_PROGRAMS = makejvf - --makeindex_SOURCES = \ -- genind.c \ -- genind.h \ -- mkind.c \ -- mkind.h \ -- qsort.c \ -- scanid.c \ -- scanid.h \ -- scanst.c \ -- scanst.h \ -- sortid.c -+makejvf_SOURCES = \ -+ main.c makejvf.h tfmread.c tool.c write.c - --makeindex_DEPENDENCIES = $(KPATHSEA_DEPEND) -+makejvf_DEPENDENCIES = $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) - --LDADD = $(KPATHSEA_LIBS) -+LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) - --## Rebuild libkpathsea -+## Rebuild libkpathsea & libptexenc - @KPATHSEA_RULE@ -+@PTEXENC_RULE@ - --dist_man1_MANS = makeindex.1 mkindex.1 - --EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING -+EXTRA_DIST = COPYRIGHT COPYRIGHT.jis Changes.txt README.txt - -Index: write.c -=================================================================== ---- makejvf-1.1a.orig/write.c -+++ makejvf-1.1a/write.c -@@ -1,13 +1,10 @@ - #include <stdio.h> - #include <stdlib.h> - --extern char *vtfmname,*kanatfm; --extern int unit,zh,zw,jfm_id; --extern int kanatume,chotai,baseshift,minute; --extern FILE *afp; -+#include <kpathsea/config.h> -+#include "makejvf.h" - --FILE *vfopen(name) --char *name; -+FILE *vfopen(char *name) - { - FILE *fp; - -@@ -52,9 +49,7 @@ - return fp; - } - --writevf(code,fp) --int code; --FILE *fp; -+void writevf(int code, FILE *fp) - { - int cc,cc2,cc3,cc4,w,skip=0,skip2=0,height; - char buf[256],buf2[256]; -@@ -341,8 +336,7 @@ - fputnum(code,2,fp); /* char code */ - } - --int vfclose(fp) --FILE *fp; -+int vfclose(FILE *fp) - { - int i,cc; - -@@ -353,8 +347,7 @@ - fclose(fp); - } - --int maketfm(name) --char *name; -+int maketfm(char *name) - { - char nbuf[256]; - FILE *fp; -Index: aclocal.m4 -=================================================================== ---- makejvf-1.1a.orig/aclocal.m4 -+++ makejvf-1.1a/aclocal.m4 -@@ -991,6 +991,7 @@ - - m4_include([../../m4/kpse-common.m4]) - m4_include([../../m4/kpse-kpathsea-flags.m4]) -+m4_include([../../m4/kpse-ptexenc-flags.m4]) - m4_include([../../m4/kpse-warnings.m4]) - m4_include([../../m4/libtool.m4]) - m4_include([../../m4/ltoptions.m4]) diff --git a/Build/source/texk/ptexenc/patches/mendexk2.6f-ptexenc.patch b/Build/source/texk/ptexenc/patches/mendexk2.6f-ptexenc.patch deleted file mode 100644 index 00403e545d0..00000000000 --- a/Build/source/texk/ptexenc/patches/mendexk2.6f-ptexenc.patch +++ /dev/null @@ -1,2704 +0,0 @@ -Index: mendex.1 -=================================================================== ---- mendexk2.6e.orig/mendex.1 -+++ mendexk2.6e/mendex.1 -@@ -59,6 +59,9 @@ - .TP 10 - \fB-S\fR - ´Á»ú¥³¡¼¥É¤òShiftJIS¤Ë»ØÄꤷ¤Þ¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤âShiftJIS¤È¤·¤Æ°·¤¤¤Þ¤¹¡£ -+.TP 10 -+\fB-U\fR -+´Á»ú¥³¡¼¥É¤òUTF-8¤Ë»ØÄꤷ¤Þ¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤âUTF-8¤È¤·¤Æ°·¤¤¤Þ¤¹¡£ - - - .SH ¥¹¥¿¥¤¥ë¥Õ¥¡¥¤¥ë -Index: configure -=================================================================== ---- mendexk2.6e.orig/configure -+++ mendexk2.6e/configure -@@ -1,9 +1,7 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.63 for makeindex for TeX Live 2.15. -+# Generated by GNU Autoconf 2.63 for mendex for TeX Live 2.6f. - # --# Report bugs to <tex-k@tug.org>. --# - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, - # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation -@@ -743,13 +741,13 @@ - SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. --PACKAGE_NAME='makeindex for TeX Live' --PACKAGE_TARNAME='makeindex-for-tex-live' --PACKAGE_VERSION='2.15' --PACKAGE_STRING='makeindex for TeX Live 2.15' --PACKAGE_BUGREPORT='tex-k@tug.org' -+PACKAGE_NAME='mendex for TeX Live' -+PACKAGE_TARNAME='mendex-for-tex-live' -+PACKAGE_VERSION='2.6f' -+PACKAGE_STRING='mendex for TeX Live 2.6f' -+PACKAGE_BUGREPORT='' - --ac_unique_file="mkind.c" -+ac_unique_file="main.c" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> -@@ -790,6 +788,10 @@ - am__EXEEXT_TRUE - LTLIBOBJS - LIBOBJS -+PTEXENC_RULE -+PTEXENC_DEPEND -+PTEXENC_LIBS -+PTEXENC_INCLUDES - KPATHSEA_RULE - KPATHSEA_DEPEND - KPATHSEA_LIBS -@@ -1480,7 +1482,7 @@ - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF --\`configure' configures makeindex for TeX Live 2.15 to adapt to many kinds of systems. -+\`configure' configures mendex for TeX Live 2.6f to adapt to many kinds of systems. - - Usage: $0 [OPTION]... [VAR=VALUE]... - -@@ -1529,7 +1531,7 @@ - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root -- [DATAROOTDIR/doc/makeindex-for-tex-live] -+ [DATAROOTDIR/doc/mendex-for-tex-live] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] -@@ -1551,7 +1553,7 @@ - - if test -n "$ac_init_help"; then - case $ac_init_help in -- short | recursive ) echo "Configuration of makeindex for TeX Live 2.15:";; -+ short | recursive ) echo "Configuration of mendex for TeX Live 2.6f:";; - esac - cat <<\_ACEOF - -@@ -1598,7 +1600,6 @@ - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - --Report bugs to <tex-k@tug.org>. - _ACEOF - ac_status=$? - fi -@@ -1661,7 +1662,7 @@ - test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF --makeindex for TeX Live configure 2.15 -+mendex for TeX Live configure 2.6f - generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -@@ -1675,7 +1676,7 @@ - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - --It was created by makeindex for TeX Live $as_me 2.15, which was -+It was created by mendex for TeX Live $as_me 2.6f, which was - generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ -@@ -4328,13 +4329,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:4331: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4332: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4334: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4335: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4337: output\"" >&5) -+ (eval echo "\"\$as_me:4338: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -5540,7 +5541,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5543 "configure"' > conftest.$ac_ext -+ echo '#line 5544 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -6934,8 +6935,8 @@ - - - # Define the identity of the package. -- PACKAGE='makeindex-for-tex-live' -- VERSION='2.15' -+ PACKAGE='mendex-for-tex-live' -+ VERSION='2.6f' - - - # Some tools Automake needs. -@@ -7492,11 +7493,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7495: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7496: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7499: \$? = $ac_status" >&5 -+ echo "$as_me:7500: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7831,11 +7832,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7834: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7835: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7838: \$? = $ac_status" >&5 -+ echo "$as_me:7839: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -7936,11 +7937,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7939: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7940: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7943: \$? = $ac_status" >&5 -+ echo "$as_me:7944: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -7991,11 +7992,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7994: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7995: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7998: \$? = $ac_status" >&5 -+ echo "$as_me:7999: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10791,7 +10792,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10794 "configure" -+#line 10795 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -10887,7 +10888,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 10890 "configure" -+#line 10891 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12237,12 +12238,7 @@ - $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------- ## --## Report this to tex-k@tug.org ## --## ---------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -12934,9 +12930,7 @@ - - - -- -- --for ac_header in ctype.h types.h locale.h -+for ac_header in strings.h - do - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -@@ -13054,12 +13048,7 @@ - $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------- ## --## Report this to tex-k@tug.org ## --## ---------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -@@ -13086,10 +13075,7 @@ - - done - -- -- -- --for ac_func in strchr strrchr setlocale -+for ac_func in - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -13529,7 +13515,7 @@ - Report bugs to <bug-libtool@gnu.org>." - - lt_cl_version="\ --makeindex for TeX Live config.lt 2.15 -+mendex for TeX Live config.lt 2.6f - configured by $0, generated by GNU Autoconf 2.63. - - Copyright (C) 2008 Free Software Foundation, Inc. -@@ -14529,7 +14515,22 @@ - cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS)' - fi - -+## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags -+ PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ -+ -e "s,SRC/,$kpse_SRC/,g" \ -+ -e "s,BLD/,$kpse_BLD/,g"` -+ PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e "s,BLD/,$kpse_BLD/,g"` - -+ PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e 's,BLD/,${top_builddir}/../../,g'` -+ PTEXENC_RULE='# Rebuild libptexenc -+$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS) -+${top_builddir}/../ptexenc/ptexenc.h: -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS)' -+ -+ - ac_config_files="$ac_config_files Makefile" - - -@@ -14981,7 +14982,7 @@ - # report actual input values of CONFIG_FILES etc. instead of their - # values after options handling. - ac_log=" --This file was extended by makeindex for TeX Live $as_me 2.15, which was -+This file was extended by mendex for TeX Live $as_me 2.6f, which was - generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES -@@ -15044,7 +15045,7 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ --makeindex for TeX Live config.status 2.15 -+mendex for TeX Live config.status 2.6f - configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Index: fwrite.c -=================================================================== ---- mendexk2.6e.orig/fwrite.c -+++ mendexk2.6e/fwrite.c -@@ -1,23 +1,79 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <stdarg.h> - -+#include <kpathsea/config.h> -+#include <ptexenc/ptexenc.h> -+#include "mendex.h" -+ - #include "exkana.h" - #include "exvar.h" - - int line_length=0; - --char *convcode(); --int convputs(); -+static void printpage(struct index *ind, FILE *fp, int num, char *lbuff); -+static int range_check(struct index ind, int count, char *lbuff); -+static void linecheck(char *lbuff, char *tmpbuff); -+static void crcheck(char *lbuff, FILE *fp); - --int indwrite(filename,ind,pagenum) -+#define TAIL(x) (x+strlen(x)) -+ -+/* if we don't have vsnprintf() */ -+/* #define vsnprintf(buff,len,format,argptr) vsprintf(buff,format,argptr) */ -+ -+/* fprintf with convert kanji code */ -+int fprintf2(FILE *fp, const char *format, ...) -+{ -+ char print_buff[8000]; -+ va_list argptr; -+ int n; -+ -+ va_start(argptr, format); -+ n = vsnprintf(print_buff, sizeof print_buff, format, argptr); -+ va_end(argptr); -+ -+ fputs(print_buff, fp); -+ return n; -+} -+ -+int warn_printf(FILE *fp, const char *format, ...) -+{ -+ char print_buff[8000]; -+ va_list argptr; -+ int n; -+ -+ va_start(argptr, format); -+ n = vsnprintf(print_buff, sizeof print_buff, format, argptr); -+ va_end(argptr); -+ -+ warn++; -+ fputs(print_buff, stderr); -+ if (fp!=stderr) fputs(print_buff, fp); -+ return n; -+} -+ -+int verb_printf(FILE *fp, const char *format, ...) -+{ -+ char print_buff[8000]; -+ va_list argptr; -+ int n; -+ -+ va_start(argptr, format); -+ n = vsnprintf(print_buff, sizeof print_buff, format, argptr); -+ va_end(argptr); -+ -+ if (verb!=0) fputs(print_buff, stderr); -+ if (fp!=stderr) fputs(print_buff, fp); -+ return n; -+} -+ -+ - /* write ind file */ --char *filename; --struct index *ind; --int pagenum; -+void indwrite(char *filename, struct index *ind, int pagenum) - { -- int i,j,k,cc,hpoint=0; -- unsigned char datama[256],lbuff[4096],tmp[4096]; -+ int i,j,hpoint=0; -+ unsigned char datama[256],lbuff[4096]; - FILE *fp; - - if (filename[0]!='\0') fp=fopen(filename,"w"); -@@ -44,7 +100,7 @@ - fprintf(fp,"%s%s%s",lethead_prefix,symhead_negative,lethead_suffix); - } - } -- sprintf(lbuff,"%s%s",item_0,convcode(ind[i].idx[0])); -+ sprintf(lbuff,"%s%s",item_0,ind[i].idx[0]); - } - else if (alphabet(ind[i].dic[0][0])) { - if (lethead_flag>0) { -@@ -53,26 +109,24 @@ - else if (lethead_flag<0) { - fprintf(fp,"%s%c%s",lethead_prefix,ind[i].dic[0][0]+32,lethead_suffix); - } -- sprintf(lbuff,"%s%s",item_0,convcode(ind[i].idx[0])); -+ sprintf(lbuff,"%s%s",item_0,ind[i].idx[0]); - } - else if (japanese(ind[i].dic[0])) { - if (lethead_flag) { - fputs(lethead_prefix,fp); - for (j=hpoint;j<(strlen(datama)/2);j++) { - if (ind[i].dic[0][1]<datama[j*2+1]) { -- sprintf(tmp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); -- convputs(tmp,fp); -+ fprintf(fp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); - hpoint=j; - break; - } - } - if (j==(strlen(datama)/2)) { -- sprintf(tmp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); -- convputs(tmp,fp); -+ fprintf(fp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); - } - fputs(lethead_suffix,fp); - } -- sprintf(lbuff,"%s%s",item_0,convcode(ind[i].idx[0])); -+ sprintf(lbuff,"%s%s",item_0,ind[i].idx[0]); - for (hpoint=0;hpoint<(strlen(datama)/2);hpoint++) { - if (ind[i].dic[0][1]<datama[hpoint*2+1]) { - break; -@@ -81,18 +135,18 @@ - } - switch (ind[i].words) { - case 1: -- sprintf(&lbuff[strlen(lbuff)],"%s",delim_0); -+ sprintf(TAIL(lbuff),"%s",delim_0); - break; - - case 2: -- sprintf(&lbuff[strlen(lbuff)],"%s%s",item_x1,convcode(ind[i].idx[1])); -- sprintf(&lbuff[strlen(lbuff)],"%s",delim_1); -+ sprintf(TAIL(lbuff),"%s%s",item_x1,ind[i].idx[1]); -+ sprintf(TAIL(lbuff),"%s",delim_1); - break; - - case 3: -- sprintf(&lbuff[strlen(lbuff)],"%s%s",item_x1,convcode(ind[i].idx[1])); -- sprintf(&lbuff[strlen(lbuff)],"%s%s",item_x2,convcode(ind[i].idx[2])); -- sprintf(&lbuff[strlen(lbuff)],"%s",delim_2); -+ sprintf(TAIL(lbuff),"%s%s",item_x1,ind[i].idx[1]); -+ sprintf(TAIL(lbuff),"%s%s",item_x2,ind[i].idx[2]); -+ sprintf(TAIL(lbuff),"%s",delim_2); - break; - - default: -@@ -131,8 +185,7 @@ - fputs(group_skip,fp); - if (lethead_flag!=0) { - fputs(lethead_prefix,fp); -- sprintf(tmp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); -- convputs(tmp,fp); -+ fprintf(fp,"%c%c",atama[(j-1)*2],atama[(j-1)*2+1]); - fputs(lethead_suffix,fp); - } - } -@@ -141,8 +194,7 @@ - fputs(group_skip,fp); - if (lethead_flag!=0) { - fputs(lethead_prefix,fp); -- sprintf(tmp,"%c%c",ind[i].dic[0][0],ind[i].dic[0][1]); -- convputs(tmp,fp); -+ fprintf(fp,"%c%c",ind[i].dic[0][0],ind[i].dic[0][1]); - fputs(lethead_suffix,fp); - } - } -@@ -150,41 +202,41 @@ - - switch (ind[i].words) { - case 1: -- sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_0,convcode(ind[i].idx[0]),delim_0); -+ sprintf(TAIL(lbuff),"%s%s%s",item_0,ind[i].idx[0],delim_0); - break; - - case 2: - if (strcmp(ind[i-1].idx[0],ind[i].idx[0])!=0 || strcmp(ind[i-1].dic[0],ind[i].dic[0])!=0) { -- sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_0,convcode(ind[i].idx[0]),item_x1); -+ sprintf(TAIL(lbuff),"%s%s%s",item_0,ind[i].idx[0],item_x1); - } - else { - if (ind[i-1].words==1) { -- sprintf(&lbuff[strlen(lbuff)],"%s",item_01); -+ sprintf(TAIL(lbuff),"%s",item_01); - } - else { -- sprintf(&lbuff[strlen(lbuff)],"%s",item_1); -+ sprintf(TAIL(lbuff),"%s",item_1); - } - } -- sprintf(&lbuff[strlen(lbuff)],"%s",convcode(ind[i].idx[1])); -- sprintf(&lbuff[strlen(lbuff)],"%s",delim_1); -+ sprintf(TAIL(lbuff),"%s",ind[i].idx[1]); -+ sprintf(TAIL(lbuff),"%s",delim_1); - break; - - case 3: - if (strcmp(ind[i-1].idx[0],ind[i].idx[0])!=0 || strcmp(ind[i-1].dic[0],ind[i].dic[0])!=0) { -- sprintf(&lbuff[strlen(lbuff)],"%s%s",item_0,convcode(ind[i].idx[0])); -- sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_x1,convcode(ind[i].idx[1]),item_x2); -+ sprintf(TAIL(lbuff),"%s%s",item_0,ind[i].idx[0]); -+ sprintf(TAIL(lbuff),"%s%s%s",item_x1,ind[i].idx[1],item_x2); - } - else if (ind[i-1].words==1) { -- sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_01,convcode(ind[i].idx[1]),item_x2); -+ sprintf(TAIL(lbuff),"%s%s%s",item_01,ind[i].idx[1],item_x2); - } - else if (strcmp(ind[i-1].idx[1],ind[i].idx[1])!=0 || strcmp(ind[i-1].dic[1],ind[i].dic[1])!=0) { -- if (ind[i-1].words==2) sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_1,convcode(ind[i].idx[1]),item_12); -- else sprintf(&lbuff[strlen(lbuff)],"%s%s%s",item_1,convcode(ind[i].idx[1]),item_x2); -+ if (ind[i-1].words==2) sprintf(TAIL(lbuff),"%s%s%s",item_1,ind[i].idx[1],item_12); -+ else sprintf(TAIL(lbuff),"%s%s%s",item_1,ind[i].idx[1],item_x2); - } - else { -- sprintf(&lbuff[strlen(lbuff)],"%s",item_2); -+ sprintf(TAIL(lbuff),"%s",item_2); - } -- sprintf(&lbuff[strlen(lbuff)],"%s%s",convcode(ind[i].idx[2]),delim_2); -+ sprintf(TAIL(lbuff),"%s%s",ind[i].idx[2],delim_2); - break; - - default: -@@ -198,15 +250,11 @@ - if (filename[0]!='\0') fclose(fp); - } - --int printpage(ind,fp,num,lbuff) - /* write page block */ --struct index *ind; --FILE *fp; --int num; --char *lbuff; -+static void printpage(struct index *ind, FILE *fp, int num, char *lbuff) - { -- int i,j,k,cc,eflg,cflg; -- char buff[4096],tmpbuff[4096],errbuff[4096],tmp[4096]; -+ int i,j,k,cc; -+ char buff[4096],tmpbuff[4096],errbuff[4096]; - - buff[0]=tmpbuff[0]='\0'; - -@@ -225,25 +273,25 @@ - || ind[num].p[j].enc[0]==range_close) - ind[num].p[j].enc++; - if (strlen(ind[num].p[j].enc)>0) { -- sprintf(buff,"%s%s%s",encap_prefix,convcode(ind[num].p[j].enc),encap_infix); -+ sprintf(buff,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); - } - if (strlen(suffix_3p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==2) { -- sprintf(&buff[strlen(buff)],"%s%s",convcode(ind[num].p[j].page),suffix_3p); -+ sprintf(TAIL(buff),"%s%s",ind[num].p[j].page,suffix_3p); - } - else if (strlen(suffix_mp)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))>=2) { -- sprintf(&buff[strlen(buff)],"%s%s",convcode(ind[num].p[j].page),suffix_mp); -+ sprintf(TAIL(buff),"%s%s",ind[num].p[j].page,suffix_mp); - } - else if (strlen(suffix_2p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==1) { -- sprintf(&buff[strlen(buff)],"%s%s",convcode(ind[num].p[j].page),suffix_2p); -+ sprintf(TAIL(buff),"%s%s",ind[num].p[j].page,suffix_2p); - } - else { -- sprintf(&buff[strlen(buff)],"%s%s",convcode(ind[num].p[j].page),delim_r); -- sprintf(&buff[strlen(buff)],"%s",convcode(ind[num].p[cc].page)); -+ sprintf(TAIL(buff),"%s%s",ind[num].p[j].page,delim_r); -+ sprintf(TAIL(buff),"%s",ind[num].p[cc].page); - } -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s",buff); -+ sprintf(TAIL(tmpbuff),"%s",buff); - buff[0]='\0'; - if (strlen(ind[num].p[j].enc)>0) { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s",encap_suffix); -+ sprintf(TAIL(tmpbuff),"%s",encap_suffix); - } - linecheck(lbuff,tmpbuff); - j=cc; -@@ -251,7 +299,7 @@ - goto PRINT; - } - else { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s",delim_n); -+ sprintf(TAIL(tmpbuff),"%s",delim_n); - linecheck(lbuff,tmpbuff); - } - } -@@ -259,51 +307,45 @@ - /* normal encap */ - if (ind[num].p[j].enc[0]==range_close) { - sprintf(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); -- for (i=0;i<ind[num].words;i++) sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind[num].idx[i])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ for (i=0;i<ind[num].words;i++) sprintf(TAIL(errbuff),"%s.",ind[num].idx[i]); -+ warn_printf(efp, "%s\n", errbuff); - ind[num].p[j].enc++; - } - if (strlen(ind[num].p[j].enc)>0) { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s%s",encap_prefix,convcode(ind[num].p[j].enc),encap_infix); -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s%s",convcode(ind[num].p[j].page),encap_suffix,delim_n); -+ sprintf(TAIL(tmpbuff),"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); -+ sprintf(TAIL(tmpbuff),"%s%s%s",ind[num].p[j].page,encap_suffix,delim_n); - linecheck(lbuff,tmpbuff); - } - else { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s",convcode(ind[num].p[j].page),delim_n); -+ sprintf(TAIL(tmpbuff),"%s%s",ind[num].p[j].page,delim_n); - linecheck(lbuff,tmpbuff); - } - } - else { - /* no encap */ -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s",convcode(ind[num].p[j].page),delim_n); -+ sprintf(TAIL(tmpbuff),"%s%s",ind[num].p[j].page,delim_n); - linecheck(lbuff,tmpbuff); - } - } - - if (ind[num].p[j].enc[0]==range_open) { - sprintf(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); -- for (k=0;k<ind[num].words;k++) sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind[num].idx[k])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ for (k=0;k<ind[num].words;k++) sprintf(TAIL(errbuff),"%s.",ind[num].idx[k]); -+ warn_printf(efp, "%s\n", errbuff); - ind[num].p[j].enc++; - } - else if (ind[num].p[j].enc[0]==range_close) { - sprintf(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); -- for (k=0;k<ind[num].words;k++) sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind[num].idx[k])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ for (k=0;k<ind[num].words;k++) sprintf(TAIL(errbuff),"%s.",ind[num].idx[k]); -+ warn_printf(efp, "%s\n", errbuff); - ind[num].p[j].enc++; - } - if (strlen(ind[num].p[j].enc)>0) { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s%s",encap_prefix,convcode(ind[num].p[j].enc),encap_infix); -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s%s",convcode(ind[num].p[j].page),encap_suffix); -+ sprintf(TAIL(tmpbuff),"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix); -+ sprintf(TAIL(tmpbuff),"%s%s",ind[num].p[j].page,encap_suffix); - } - else { -- sprintf(&tmpbuff[strlen(tmpbuff)],"%s",convcode(ind[num].p[j].page)); -+ sprintf(TAIL(tmpbuff),"%s",ind[num].p[j].page); - } - linecheck(lbuff,tmpbuff); - -@@ -313,21 +355,16 @@ - lbuff[0]='\0'; - } - --int range_check(ind,count,lbuff) --struct index ind; --int count; --char *lbuff; -+static int range_check(struct index ind, int count, char *lbuff) - { - int i,j,k,cc1,cc2,start,force=0; -- char buff[4096],tmpbuff[4096],errbuff[4096],tmp[4096]; -+ char tmpbuff[4096],errbuff[4096]; - - for (i=count;i<ind.num+1;i++) { - if (ind.p[i].enc[0]==range_close) { - sprintf(errbuff,"Warning: Unmatched range closing operator \'%c\',",range_close); -- sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind.idx[0])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ sprintf(TAIL(errbuff),"%s.",ind.idx[0]); -+ warn_printf(efp, "%s\n", errbuff); - ind.p[i].enc++; - } - if (ind.p[i].enc[0]==range_open) { -@@ -343,25 +380,21 @@ - } - else if (j!=i && ind.p[j].enc[0]==range_open) { - sprintf(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); -- for (k=0;k<ind.words;k++) sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind.idx[k])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ for (k=0;k<ind.words;k++) sprintf(TAIL(errbuff),"%s.",ind.idx[k]); -+ warn_printf(efp, "%s\n", errbuff); - ind.p[j].enc++; - } - if (strlen(ind.p[j].enc)>0) { -- sprintf(tmpbuff,"%s%s%s",encap_prefix,convcode(ind.p[j].enc),encap_infix); -- sprintf(tmpbuff,"%s%s%s",convcode(ind.p[j].page),encap_suffix,delim_n); -+ sprintf(tmpbuff,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix); -+ sprintf(tmpbuff,"%s%s%s",ind.p[j].page,encap_suffix,delim_n); - linecheck(lbuff,tmpbuff); - } - } - } - if (j==ind.num+1) { - sprintf(errbuff,"Warning: Unmatched range opening operator \'%c\',",range_open); -- for (k=0;k<ind.words;k++) sprintf(&errbuff[strlen(errbuff)],"%s.",convcode(ind.idx[k])); -- fprintf(efp,"%s\n",errbuff); -- if (efp!=stderr) fprintf(stderr,"%s\n",errbuff); -- warn++; -+ for (k=0;k<ind.words;k++) sprintf(TAIL(errbuff),"%s.",ind.idx[k]); -+ warn_printf(efp, "%s\n", errbuff); - } - i=j-1; - } -@@ -388,27 +421,24 @@ - else return count; - } - --int linecheck(lbuff,tmpbuff) - /* check line length */ --char *lbuff,*tmpbuff; -+static void linecheck(char *lbuff, char *tmpbuff) - { - if (line_length+strlen(tmpbuff)>line_max) { -- sprintf(&lbuff[strlen(lbuff)],"\n%s%s",indent_space,tmpbuff); -+ sprintf(TAIL(lbuff),"\n%s%s",indent_space,tmpbuff); - line_length=indent_length+strlen(tmpbuff); - tmpbuff[0]='\0'; - } - else { -- sprintf(&lbuff[strlen(lbuff)],"%s",tmpbuff); -+ sprintf(TAIL(lbuff),"%s",tmpbuff); - line_length+=strlen(tmpbuff); - tmpbuff[0]='\0'; - } - } - --int crcheck(lbuff,fp) --char *lbuff; --FILE *fp; -+static void crcheck(char *lbuff, FILE *fp) - { -- int i,j,cc; -+ int i; - char buff[4096]; - - for (i=strlen(lbuff);i>=0;i--) { -@@ -422,65 +452,3 @@ - } - } - } -- --char *convcode(buff) --/* convert kanji code from EUC to output code */ --unsigned char *buff; --{ -- int i,j,cc,jflag=0; -- static unsigned char buff2[4096]; -- -- for (i=j=0;i<strlen(buff);i++,j++) { -- if (buff[i]=='\0') { -- break; -- } -- else if (buff[i]>=0x80) { -- if (kanji==Jis) { -- if (!jflag) { -- buff2[j++]=0x1b; -- buff2[j++]=0x24; -- buff2[j++]=0x42; -- jflag=1; -- } -- buff2[j++]=buff[i++]-0x80; -- buff2[j]=buff[i]-0x80; -- } -- else if (kanji==Sjis) { -- cc=buff[i]*256+buff[i+1]-0x8080; -- i++; -- cc=JIStoSJIS(cc); -- buff2[j++]=(cc>>8)&0xff; -- buff2[j]=cc&0xff; -- } -- else { -- buff2[j++]=buff[i++]; -- buff2[j]=buff[i]; -- } -- } -- else { -- if (jflag) { -- buff2[j++]=0x1b; -- buff2[j++]=0x28; -- buff2[j++]=0x42; -- jflag=0; -- } -- buff2[j]=buff[i]; -- } -- } -- if (jflag) { -- buff2[j++]=0x1b; -- buff2[j++]=0x28; -- buff2[j++]=0x42; -- jflag=0; -- } -- buff2[j]='\0'; -- return buff2; --} -- --int convputs(buff,fp) --/* fputs width convert kanji code */ --char *buff; --FILE *fp; --{ -- fputs(convcode(buff),fp); --} -Index: Makefile.in -=================================================================== ---- mendexk2.6e.orig/Makefile.in -+++ mendexk2.6e/Makefile.in -@@ -15,7 +15,6 @@ - - @SET_MAKE@ - -- - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -@@ -35,10 +34,10 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --bin_PROGRAMS = makeindex$(EXEEXT) -+bin_PROGRAMS = mendex$(EXEEXT) - subdir = . --DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \ -- $(dist_man1_MANS) $(srcdir)/../../build-aux/config.guess \ -+DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ -+ $(srcdir)/../../build-aux/config.guess \ - $(srcdir)/../../build-aux/config.sub \ - $(srcdir)/../../build-aux/depcomp \ - $(srcdir)/../../build-aux/install-sh \ -@@ -50,11 +49,11 @@ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/ltmain.sh \ - ../../build-aux/missing ../../build-aux/mkinstalldirs \ -- ../../build-aux/texinfo.tex ../../build-aux/ylwrap COPYING \ -- ChangeLog INSTALL NEWS -+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ - $(top_srcdir)/../../m4/libtool.m4 \ - $(top_srcdir)/../../m4/ltoptions.m4 \ -@@ -70,15 +69,29 @@ - CONFIG_HEADER = c-auto.h - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = --am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ -- "$(DESTDIR)$(man1dir)" -+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" - PROGRAMS = $(bin_PROGRAMS) --am_makeindex_OBJECTS = genind.$(OBJEXT) mkind.$(OBJEXT) \ -- qsort.$(OBJEXT) scanid.$(OBJEXT) scanst.$(OBJEXT) \ -- sortid.$(OBJEXT) --makeindex_OBJECTS = $(am_makeindex_OBJECTS) --makeindex_LDADD = $(LDADD) -+am_mendex_OBJECTS = convert.$(OBJEXT) fread.$(OBJEXT) fwrite.$(OBJEXT) \ -+ kp.$(OBJEXT) main.$(OBJEXT) pageread.$(OBJEXT) sort.$(OBJEXT) \ -+ styfile.$(OBJEXT) -+mendex_OBJECTS = $(am_mendex_OBJECTS) -+mendex_LDADD = $(LDADD) - am__DEPENDENCIES_1 = -+DEFAULT_INCLUDES = -I.@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp -+am__depfiles_maybe = depfiles -+am__mv = mv -f -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(mendex_SOURCES) -+DIST_SOURCES = $(mendex_SOURCES) - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -100,22 +113,6 @@ - am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' --SCRIPTS = $(dist_bin_SCRIPTS) --DEFAULT_INCLUDES = -I.@am__isrc@ --depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp --am__depfiles_maybe = depfiles --am__mv = mv -f --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ --SOURCES = $(makeindex_SOURCES) --DIST_SOURCES = $(makeindex_SOURCES) - man1dir = $(mandir)/man1 - NROFF = nroff - MANS = $(dist_man1_MANS) -@@ -188,6 +185,9 @@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -@@ -248,26 +248,30 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I ../../m4 --INCLUDES = $(KPATHSEA_INCLUDES) --AM_CPPFLAGS = -DUNIX -DKPATHSEA -+INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) -+AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 - AM_CFLAGS = $(WARNING_CFLAGS) --dist_bin_SCRIPTS = mkindex --makeindex_SOURCES = \ -- genind.c \ -- genind.h \ -- mkind.c \ -- mkind.h \ -- qsort.c \ -- scanid.c \ -- scanid.h \ -- scanst.c \ -- scanst.h \ -- sortid.c -+mendex_SOURCES = \ -+ convert.c \ -+ exkana.h \ -+ exvar.h \ -+ fread.c \ -+ fwrite.c \ -+ kana.h \ -+ kp.c \ -+ kp.h \ -+ ktable.h \ -+ main.c \ -+ mendex.h \ -+ pageread.c \ -+ sort.c \ -+ styfile.c \ -+ var.h - --makeindex_DEPENDENCIES = $(KPATHSEA_DEPEND) --LDADD = $(KPATHSEA_LIBS) --dist_man1_MANS = makeindex.1 mkindex.1 --EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING -+mendex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) -+LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) -+dist_man1_MANS = mendex.1 -+EXTRA_DIST = COPYRIGHT COPYRIGHT.jis ChangeLog README - all: c-auto.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -@@ -367,56 +371,24 @@ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list --makeindex$(EXEEXT): $(makeindex_OBJECTS) $(makeindex_DEPENDENCIES) -- @rm -f makeindex$(EXEEXT) -- $(LINK) $(makeindex_OBJECTS) $(makeindex_LDADD) $(LIBS) --install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) -- @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" -- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ -- done | \ -- sed -e 'p;s,.*/,,;n' \ -- -e 'h;s|.*|.|' \ -- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ -- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ -- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -- if ($$2 == $$4) { files[d] = files[d] " " $$1; \ -- if (++n[d] == $(am__install_max)) { \ -- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ -- else { print "f", d "/" $$4, $$1 } } \ -- END { for (d in files) print "f", d, files[d] }' | \ -- while read type dir files; do \ -- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -- test -z "$$files" || { \ -- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ -- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ -- } \ -- ; done -+mendex$(EXEEXT): $(mendex_OBJECTS) $(mendex_DEPENDENCIES) -+ @rm -f mendex$(EXEEXT) -+ $(LINK) $(mendex_OBJECTS) $(mendex_LDADD) $(LIBS) - --uninstall-dist_binSCRIPTS: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ -- files=`for p in $$list; do echo "$$p"; done | \ -- sed -e 's,.*/,,;$(transform)'`; \ -- test -n "$$list" || exit 0; \ -- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ -- cd "$(DESTDIR)$(bindir)" && rm -f $$files -- - mostlyclean-compile: - -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genind.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkind.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsort.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanid.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanst.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sortid.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fread.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fwrite.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kp.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pageread.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sort.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/styfile.Po@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -695,9 +667,9 @@ - exit 1; } >&2 - check-am: all-am - check: check-am --all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) c-auto.h -+all-am: Makefile $(PROGRAMS) $(MANS) c-auto.h - installdirs: -- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ -+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -754,7 +726,7 @@ - - install-dvi-am: - --install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS -+install-exec-am: install-binPROGRAMS - - install-html: install-html-am - -@@ -796,8 +768,7 @@ - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ -- uninstall-man -+uninstall-am: uninstall-binPROGRAMS uninstall-man - - uninstall-man: uninstall-man1 - -@@ -810,20 +781,20 @@ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ -- install-binPROGRAMS install-data install-data-am \ -- install-dist_binSCRIPTS install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-dist_binSCRIPTS uninstall-man \ -+ install-binPROGRAMS install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-strip installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 - - - @KPATHSEA_RULE@ -+@PTEXENC_RULE@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -Index: ac/withenable.ac -=================================================================== ---- mendexk2.6e.orig/ac/withenable.ac -+++ mendexk2.6e/ac/withenable.ac -@@ -0,0 +1,7 @@ -+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -+dnl -+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -+dnl You may freely use, modify and/or distribute this file. -+dnl -+## configure options and TL libraries required for makeindexk -+KPSE_ENABLE_PROG([mendexk], [kpathsea ptexenc]) -Index: pageread.c -=================================================================== ---- mendexk2.6e.orig/pageread.c -+++ mendexk2.6e/pageread.c -@@ -2,11 +2,10 @@ - #include <stdlib.h> - #include <string.h> - --int lastpage(filename) - /* checking last page */ --char *filename; -+int lastpage(char *filename) - { -- int i,j,cc,num= -1; -+ int i,cc,num= -1; - char logfile[32],numbuff[16]; - FILE *fp; - -Index: kp.c -=================================================================== ---- mendexk2.6e.orig/kp.c -+++ mendexk2.6e/kp.c -@@ -1,24 +1,10 @@ - /* Written by K.Asayayam Sep. 1995 */ - #ifdef KPATHSEA - -+#include <kpathsea/kpathsea.h> - #include <string.h> - #include "kp.h" - --/* C library functions. */ --extern char *getenv(); -- --/* Functions in kpathsea lib. */ --extern kpse_set_progname(); --extern char *kpse_cnf_get(); --extern char *kpse_path_expand(); --extern char *kpse_expand_default(); --extern char *kpse_path_search(); --extern char *find_suffix(); --extern char *concat3(); --#ifdef KPATHSEA3 --extern char *kpse_var_value(); --#endif -- - int - KP_init(prog) - char *prog; -@@ -42,6 +28,8 @@ - - #else - -+#include <stdlib.h> /* for getenv() */ -+ - /* KP_get_value(char *env,char *cnf,char *def_val) - ARGUMENTS: - char *env: name of environment variable. -Index: c-auto.in -=================================================================== ---- mendexk2.6e.orig/c-auto.in -+++ mendexk2.6e/c-auto.in -@@ -0,0 +1,159 @@ -+/* c-auto.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if the `closedir' function returns void instead of `int'. */ -+#undef CLOSEDIR_VOID -+ -+/* Define to 1 if you have the <assert.h> header file. */ -+#undef HAVE_ASSERT_H -+ -+/* Define to 1 if you have the `bcmp' function. */ -+#undef HAVE_BCMP -+ -+/* Define to 1 if you have the `bcopy' function. */ -+#undef HAVE_BCOPY -+ -+/* Define to 1 if you have the `bzero' function. */ -+#undef HAVE_BZERO -+ -+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_DIRENT_H -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you have the <float.h> header file. */ -+#undef HAVE_FLOAT_H -+ -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ -+/* Define to 1 if you have the `getcwd' function. */ -+#undef HAVE_GETCWD -+ -+/* Define to 1 if you have the `getwd' function. */ -+#undef HAVE_GETWD -+ -+/* Define to 1 if you have the `index' function. */ -+#undef HAVE_INDEX -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the <limits.h> header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define to 1 if you have the `memcmp' function. */ -+#undef HAVE_MEMCMP -+ -+/* Define to 1 if you have the `memcpy' function. */ -+#undef HAVE_MEMCPY -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+#undef HAVE_NDIR_H -+ -+/* Define to 1 if you are using GNU libc or otherwise have global variables -+ `program_invocation_name' and `program_invocation_short_name'. */ -+#undef HAVE_PROGRAM_INVOCATION_NAME -+ -+/* Define to 1 if you have the `putenv' function. */ -+#undef HAVE_PUTENV -+ -+/* Define to 1 if you have the <pwd.h> header file. */ -+#undef HAVE_PWD_H -+ -+/* Define to 1 if you have the `rindex' function. */ -+#undef HAVE_RINDEX -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the `strcasecmp' function. */ -+#undef HAVE_STRCASECMP -+ -+/* Define to 1 if you have the `strchr' function. */ -+#undef HAVE_STRCHR -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the `strrchr' function. */ -+#undef HAVE_STRRCHR -+ -+/* Define to 1 if you have the `strstr' function. */ -+#undef HAVE_STRSTR -+ -+/* Define to 1 if you have the `strtol' function. */ -+#undef HAVE_STRTOL -+ -+/* Define to 1 if `st_mtim' is member of `struct stat'. */ -+#undef HAVE_STRUCT_STAT_ST_MTIM -+ -+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_DIR_H -+ -+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_NDIR_H -+ -+/* Define to 1 if you have the <sys/param.h> header file. */ -+#undef HAVE_SYS_PARAM_H -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `__inline__' or `__inline' if that's what the C compiler -+ calls it, or to nothing if 'inline' is not supported under any name. */ -+#ifndef __cplusplus -+#undef inline -+#endif -Index: styfile.c -=================================================================== ---- mendexk2.6e.orig/styfile.c -+++ mendexk2.6e/styfile.c -@@ -2,6 +2,10 @@ - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include <ptexenc/ptexenc.h> -+#include "mendex.h" -+ - #include "exvar.h" - - #ifdef KPATHSEA -@@ -11,17 +15,24 @@ - - FILE *fp; - --int styread(filename) -+void convline(char *buff1, int start, char *buff2); -+int scompare(char *buff1, char *buff2); -+int getparam(char *buff, char *paraname, char *param); -+int getparachar(char *buff, char *paraname, char *param); -+size_t sstrlen(const char *buff); -+int sstrcmp(const char *s1, const char *s2); -+int sstrncmp(const char *s1, const char *s2, size_t len); -+ - /* read style file */ --char *filename; -+void styread(char *filename) - { -- int i,j,k,cc; -+ int i,cc; - char buff[4096]; - - #ifdef KPATHSEA - filename = KP_find_file(&kp_ist,filename); - #endif -- fp=fopen(filename,"r"); -+ fp=nkf_open(filename,"r"); - if (fp==NULL) { - fprintf(stderr,"%s does not exist.\n",filename); - exit(0); -@@ -112,14 +123,13 @@ - if (getparam(buff,"page_precedence",page_precedence)) continue; - if (getparam(buff,"character_order",character_order)) continue; - } -+ nkf_close(fp); - } - --int convline(buff1,start,buff2) - /* analize string parameter of style file */ --char *buff1,*buff2; --int start; -+void convline(char *buff1, int start, char *buff2) - { -- int i,j,k,cc; -+ int i,j,cc; - - for (i=start,j=cc=0;;i++) { - if (buff1[i]=='\"') { -@@ -161,11 +171,10 @@ - } - } - --int scompare(buff1,buff2) - /* compare strings */ --char *buff1,*buff2; -+int scompare(char *buff1, char *buff2) - { -- int i,j,k,cc; -+ int i; - - if (sstrlen(buff1) == sstrlen(buff2)) { - if (sstrcmp(buff1,buff2) == 0) { -@@ -187,9 +196,8 @@ - return -1; - } - --int getparam(buff,paraname,param) - /* get string of style patameter */ --char *buff,*paraname,*param; -+int getparam(char *buff, char *paraname, char *param) - { - int cc; - -@@ -201,9 +209,8 @@ - return 0; - } - --int getparachar(buff,paraname,param) - /* get character of style parameter */ --char *buff,*paraname,*param; -+int getparachar(char *buff, char *paraname, char *param) - { - int j,cc; - -@@ -226,30 +233,22 @@ - return 0; - } - --int sstrlen(buff) --char *buff; -+size_t sstrlen(const char *s) - { -- int i; -- -- if (buff==NULL) return 0; -- -- for (i=0;;i++) { -- if (buff[i]=='\0') return i; -- } -+ if (s == NULL) return 0; -+ return strlen(s); - } - --int sstrncmp(buff1,buff2,len) --char *buff1,*buff2; --int len; -+int sstrcmp(const char *s1, const char *s2) - { -- int i; -+ if (s1 == NULL) return -1; -+ if (s2 == NULL) return 1; -+ return strcmp(s1, s2); -+} - -- if (buff1==NULL) return -1; -- if (buff2==NULL) return 1; -- -- for (i=0;i<len;i++) { -- if ((buff1[i]=='\0')&&(buff2[i]=='\0')) return 0; -- if (buff1[i]!=buff2[i]) return buff1[i]-buff2[i]; -- } -- return 0; -+int sstrncmp(const char *s1, const char *s2, size_t len) -+{ -+ if (s1 == NULL) return -1; -+ if (s2 == NULL) return 1; -+ return strncmp(s1, s2, len); - } -Index: convert.c -=================================================================== ---- mendexk2.6e.orig/convert.c -+++ mendexk2.6e/convert.c -@@ -1,7 +1,12 @@ -- #include <stdio.h> -+#include <stdio.h> - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include <kpathsea/lib.h> -+#include <ptexenc/ptexenc.h> -+#include "mendex.h" -+ - #include "exkana.h" - #include "ktable.h" - #include "exvar.h" -@@ -11,9 +16,6 @@ - extern KpathseaSupportInfo kp_dict; - #endif - --extern char *mfgets(); --extern int convputs(); -- - struct dictionary{ - unsigned char dic[2][50]; - }; -@@ -21,10 +23,12 @@ - struct dictionary *dictable,*envdic; - int dlines=0,elines=0; - --int initkanatable() -+int dicvalread(char *filename, struct dictionary *dicval, int line); -+ - /* initialize kana table */ -+void initkanatable(void) - { -- int i,j,cc; -+ int i,cc; - - for (i=0xa4a1;i<=0xa4f3;i++) { - cc=i-0xa4a1; -@@ -40,13 +44,13 @@ - } - katakana[(i-0xa5a1)*2]=0; - -- akasatana=strdup(AKASATANA); -+ akasatana=xstrdup(AKASATANA); - for (i=0;;i++) { - if (akasatana[i*2]==0) break; - akasatana[i*2]++; - } - -- aiueo=strdup(AIUEO); -+ aiueo=xstrdup(AIUEO); - for (i=0;;i++) { - if (aiueo[i*2]==0) break; - aiueo[i*2]++; -@@ -55,11 +59,10 @@ - strcpy(atama,akasatana); - } - --int dicread(filename) - /* get dictionary */ --char *filename; -+int dicread(char *filename) - { -- int i,j,k,l,ecount=0; -+ int i,ecount=0; - char *envfile,buff[4096]; - FILE *fp; - -@@ -67,28 +70,24 @@ - #ifdef KPATHSEA - filename = KP_find_file(&kp_dict,filename); - #endif -- fp=fopen(filename,"r"); -+ fp=nkf_open(filename,"r"); - if (fp==NULL) { -- fprintf(stderr,"Warning: Couldn't find dictionary file %s.\n",filename); -- if (efp!=stderr) fprintf(efp,"Warning: Couldn't find dictionary file %s.\n",filename); -- warn++; -+ warn_printf(efp,"Warning: Couldn't find dictionary file %s.\n",filename); - goto ENV; - } -- if (verb!=0) fprintf(stderr,"Scanning dictionary file %s.",filename); -- if (efp!=stderr) fprintf(efp,"Scanning dictionary file %s.",filename); -+ verb_printf(efp,"Scanning dictionary file %s.",filename); - - for (i=0;;i++) { - if (mfgets(buff,4095,fp)==NULL) break; - if ((buff[0]=='\n')||(buff[0]=='\0')) i--; - } -- fclose(fp); -+ nkf_close(fp); - - dictable=(struct dictionary *)malloc(sizeof(struct dictionary)*i); - - dlines=dicvalread(filename,dictable,i); - -- if (verb!=0) fprintf(stderr,"...done.\n"); -- if (efp!=stderr) fprintf(efp,"...done.\n"); -+ verb_printf(efp,"...done.\n"); - } - - ENV: -@@ -105,47 +104,38 @@ - #ifdef KPATHSEA - envfile = KP_find_file(&kp_dict,envfile); - #endif -- fp=fopen(envfile,"r"); -+ fp=nkf_open(envfile,"r"); - if (fp==NULL) { -- fprintf(stderr,"Warning: Couldn't find environment dictionary file %s.\n",envfile); -- if (efp!=stderr) fprintf(efp,"Warning: Couldn't find environment dictionary file %s.\n",envfile); -- warn++; -+ warn_printf(efp,"Warning: Couldn't find environment dictionary file %s.\n",envfile); - return ecount; - } -+ verb_printf(efp,"Scanning environment dictionary file %s.",envfile); - -- if (verb!=0) fprintf(stderr,"Scanning environment dictionary file %s.",envfile); -- if (efp!=stderr) fprintf(efp,"Scanning environment dictionary file %s.",envfile); -- - for (i=0;;i++) { - if (mfgets(buff,255,fp)==NULL) break; - if ((buff[0]=='\n')||(buff[0]=='\0')) i--; - } -- fclose(fp); -+ nkf_close(fp); - - envdic=(struct dictionary *)malloc(sizeof(struct dictionary)*i); - - elines=dicvalread(envfile,envdic,i); - -- if (verb!=0) fprintf(stderr,"...done.\n"); -- if (efp!=stderr) fprintf(efp,"...done.\n"); -+ verb_printf(efp,"...done.\n"); - } - } - --int dicvalread(filename,dicval,line) - /* read dictionary file */ --char *filename; --struct dictionary *dicval; --int line; -+int dicvalread(char *filename, struct dictionary *dicval, int line) - { -- int i,j,k,l,cc; -+ int i,j,k; - unsigned char buff[256]; - FILE *fp; - - int dcomp(); - -- fp=fopen(filename,"r"); -+ fp=nkf_open(filename,"r"); - for (i=0;i<line;i++) { --READING: - if (mfgets(buff,255,fp)==NULL) break; - if ((buff[0]=='\n')||(buff[0]=='\0')) { - i--; -@@ -174,17 +164,16 @@ - strcpy(dicval[i].dic[1],buff); - } - -- fclose(fp); -+ nkf_close(fp); - - qsort(dicval,i,sizeof(struct dictionary),dcomp); - return(i); - } - --int dcomp(buff1,buff2) - /* comp-function of dictionary sorting */ --struct dictionary *buff1,*buff2; -+int dcomp(struct dictionary *buff1, struct dictionary *buff2) - { -- int i,j; -+ int i; - - for (i=0;i<50;i++) { - if (((*buff1).dic[0][i]=='\0')&&((*buff2).dic[0][i]=='\0')) return 0; -@@ -196,12 +185,10 @@ - return 0; - } - --int convert(buff1,buff2) - /* convert to capital-hiragana character */ --unsigned char *buff1,*buff2; -+int convert(unsigned char *buff1, unsigned char *buff2) - { -- int i=0,j=0,k,l,cc; -- unsigned char str[2]; -+ int i=0,j=0,k,l; - char errbuff[4096]; - - while(1) { -@@ -235,8 +222,8 @@ - } - } - sprintf(errbuff,"\nError: %s is bad katakana ",&buff1[i]); -- convputs(errbuff,efp); -- if (efp!=stderr) convputs(errbuff,stderr); -+ fputs(errbuff,efp); -+ if (efp!=stderr) fputs(errbuff,stderr); - return -1; - MATCH1: - i+=2; -@@ -252,8 +239,8 @@ - } - } - sprintf(errbuff,"\nError: %s is bad hiragana ",&buff1[i]); -- convputs(errbuff,efp); -- if (efp!=stderr) convputs(errbuff,stderr); -+ fputs(errbuff,efp); -+ if (efp!=stderr) fputs(errbuff,stderr); - return -1; - MATCH2: - i+=2; -@@ -273,8 +260,8 @@ - } - } - sprintf(errbuff,"\nError: %s is Illegal line ",buff1); -- convputs(errbuff,efp); -- if (efp!=stderr) convputs(errbuff,stderr); -+ fputs(errbuff,efp); -+ if (efp!=stderr) fputs(errbuff,stderr); - return -1; - MATCH3: - i+=2; -@@ -328,8 +315,8 @@ - } - else { - sprintf(errbuff,"\nError: %s is no entry in dictionary file ",&buff1[i]); -- convputs(errbuff,efp); -- if (efp!=stderr) convputs(errbuff,stderr); -+ fputs(errbuff,efp); -+ if (efp!=stderr) fputs(errbuff,stderr); - return -1; - } - } -@@ -340,11 +327,9 @@ - return 0; - } - --int pnumconv(page,attr) --char *page; --int attr; -+int pnumconv(char *page, int attr) - { -- int i,j,cc=0; -+ int i,cc=0; - - switch (page_precedence[attr]) { - case 'a': -@@ -526,52 +511,7 @@ - return cc; - } - --int nbyte(str,n) --unsigned char *str; --int n; -+int nbyte(unsigned char *str, int n) - { - return (unsigned int)str[n]; - } -- --int JIStoSJIS(c) --int c; --{ -- int high,low; -- int nh,nl; -- -- high = (c>>8) & 0xff; -- low = c & 0xff; -- nh = ((high-0x21)>>1) + 0x81; -- if (nh>0x9f) -- nh += 0x40; -- if (high & 1) { -- nl = low + 0x1f; -- if (low>0x5f) -- nl++; -- } -- else -- nl = low + 0x7e; -- if (((nh >= 0x81 && nh <= 0x9f) || (nh >= 0xe0 && nh <= 0xfc)) -- && (nl >= 0x40 && nl <= 0xfc && nl != 0x7f)) -- return (nh<<8) | nl; -- else -- return 0x813f; --} -- --int SJIStoJIS(c) --int c; --{ -- int byte1,byte2; -- -- byte1 = (c>>8) & 0xff; -- byte2 = c & 0xff; -- byte1 -= ( byte1>=0xa0 ) ? 0xc1 : 0x81; -- c = ((byte1<<1) + 0x21)<<8; -- if( byte2>=0x9f ) { -- c += 0x0100; -- c |= (byte2 - 0x7e) & 0xff; -- } else { -- c |= (byte2 - ((byte2<=0x7e) ? 0x1f : 0x20 )) & 0xff; -- } -- return c; --} -Index: fread.c -=================================================================== ---- mendexk2.6e.orig/fread.c -+++ mendexk2.6e/fread.c -@@ -2,21 +2,23 @@ - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include <ptexenc/ptexenc.h> -+#include "mendex.h" -+ - #include "exkana.h" - #include "exvar.h" - - #define BUFSIZE 65535 - --char *mfgets(); --extern char *convcode(); -+int getestr(unsigned char *buff, unsigned char *estr); -+void chkpageattr(struct page *p); - --int idxread(filename,start) - /* read idx file */ --char *filename; --int start; -+int idxread(char *filename, int start) - { -- int i,j,k,l,m,n,cc,indent,wflg,flg,bflg=0,nest,esc,quo,eflg=0,pacc,preject; -- unsigned char buff[BUFSIZE],wbuff[BUFSIZE],estr[256],table[BUFSIZE],tbuff[256],*tmp1,*tmp2; -+ int i,j,k,l,m,n,cc,indent,wflg,flg=0,bflg=0,nest,esc,quo,eflg=0,pacc,preject; -+ unsigned char buff[BUFSIZE],wbuff[BUFSIZE],estr[256],table[BUFSIZE],*tmp1,*tmp2; - FILE *fp; - - pacc=acc; -@@ -24,26 +26,20 @@ - - if (filename==NULL) { - fp=stdin; -- if (verb!=0) fputs("Scanning input file stdin.",stderr); -- if (efp!=stderr) fputs("Scanning input file stdin.",efp); -+ verb_printf(efp, "Scanning input file stdin."); - } - else { -- fp=fopen(filename,"r"); -+ fp=nkf_open(filename,"r"); - if (fp==NULL) { - sprintf(buff,"%s.idx",filename); -- fp=fopen(buff,"r"); -+ fp=nkf_open(buff,"r"); - if (fp==NULL) { -- if (verb!=0) -- fprintf(stderr,"Warning: Couldn't find input file %s.\n",filename); -- if (efp!=stderr) -- fprintf(efp,"Warning: Couldn't find input file %s.\n",filename); -- warn++; -+ warn_printf(efp,"Warning: Couldn't find input file %s.\n",filename); - return 1; - } - else strcpy(filename,buff); - } -- if (verb!=0) fprintf(stderr,"Scanning input file %s.",filename); -- if (efp!=stderr) fprintf(efp,"Scanning input file %s.",filename); -+ verb_printf(efp,"Scanning input file %s.",filename); - } - - for (i=start,n=1;;i++,n++) { -@@ -78,10 +74,7 @@ - - for (;;j++,k++) { - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Incomplete first argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Incomplete first argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Incomplete first argument in %s, line %d.",filename,ind[i].lnum); - warn++; - n++; - goto LOOP; -@@ -185,10 +178,7 @@ - indent--; - } - else { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Illegal null field in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Illegal null field in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Illegal null field in %s, line %d.",filename,ind[i].lnum); - warn++; - n++; - goto LOOP; -@@ -277,10 +267,7 @@ - ind[0].p=(struct page *)malloc(sizeof(struct page)*16); - for (;buff[j]!=arg_open && buff[j]!='\n' && buff[j]!='\0';j++); - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); - acc--; - reject++; - warn++; -@@ -290,10 +277,7 @@ - j++; - for (k=nest=0;;j++,k++) { - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); - acc--; - reject++; - warn++; -@@ -346,10 +330,7 @@ - if (ind[l].org[m]!=NULL) tmp2=ind[l].org[m]; - else tmp2=ind[i].idx[m]; - -- if (verb!=0) -- fprintf(stderr,"\nWarning: Sort key \"%s\" is different from previous key \"%s\" for same index \"%s\" in %s, line %d.",convcode(tmp1),convcode(tmp2),convcode(ind[i].idx[m]),filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Sort key \"%s\" is different from previous key \"%s\" for same index \"%s\" in %s, line %d.",convcode(tmp1),convcode(tmp2),convcode(ind[i].idx[m]),filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Sort key \"%s\" is different from previous key \"%s\" for same index \"%s\" in %s, line %d.",tmp1, tmp2, ind[i].idx[m], filename,ind[i].lnum); - warn++; - flg=0; - break; -@@ -367,10 +348,7 @@ - i--; - for (;buff[j]!=arg_open && buff[j]!='\n' && buff[j]!='\0';j++); - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); - acc--; - reject++; - warn++; -@@ -381,10 +359,7 @@ - j++; - for (k=nest=0;;j++,k++) { - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); - warn++; - n++; - i++; -@@ -429,10 +404,7 @@ - ind[i].p=(struct page *)malloc(sizeof(struct page)*16); - for (;buff[j]!=arg_open && buff[j]!='\n' && buff[j]!='\0';j++); - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Missing second argument in %s, line %d.",filename,ind[i].lnum); - acc--; - reject++; - warn++; -@@ -442,10 +414,7 @@ - j++; - for (k=nest=0;;j++,k++) { - if (buff[j]=='\n' || buff[j]=='\0') { -- if (verb!=0) -- fprintf(stderr,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -- if (efp!=stderr) -- fprintf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); -+ verb_printf(efp,"\nWarning: Incomplete second argument in %s, line %d.",filename,ind[i].lnum); - acc--; - reject++; - warn++; -@@ -477,21 +446,16 @@ - } - } - lines=i; -+ if (filename != NULL) nkf_close(fp); - -- if (verb!=0) { -- fprintf(stderr,"...done (%d entries accepted, %d rejected).\n",acc-pacc, reject-preject); -- } -- if (efp!=stderr) { -- fprintf(efp,"...done (%d entries accepted, %d rejected).\n",acc-pacc, reject-preject); -- } -+ verb_printf(efp,"...done (%d entries accepted, %d rejected).\n",acc-pacc, reject-preject); - return eflg; - } - --int getestr(buff,estr) - /* pic up encap string */ --unsigned char *buff,*estr; -+int getestr(unsigned char *buff, unsigned char *estr) - { -- int i,j,cc,nest=0; -+ int i,nest=0; - - for (i=0;i<strlen(buff);i++) { - if (buff[i]==encap) { -@@ -522,20 +486,8 @@ - return -1; - } - --int sstrcmp(buff1,buff2) --char *buff1,*buff2; -+void chkpageattr(struct page *p) - { -- int i; -- -- for (i=0;;i++) { -- if (buff1[i]=='\0' && buff2[i]=='\0') return 0; -- if (buff1[i]!=buff2[i]) return 1; -- } --} -- --chkpageattr(p) --struct page *p; --{ - int i,j,cc=0; - - for (i=0;i<strlen(p->page);i++) { -@@ -596,53 +548,15 @@ - if (cc<2) p->attr[++cc]= -1; - } - --char *mfgets(buf,byte,fp) --char *buf; --int byte; --FILE *fp; -+char *mfgets(char *buf, int byte, FILE *fp) - { -- int i,cc,cc2,cc3,jflag=0; -+ int c, len; - -- for (i=0;i<byte;i++) { -- cc=fgetc(fp); -- if (cc==EOF) { -- if (i==0) return NULL; -- else break; -- } -- else if (cc=='\n') { -- buf[i++]=cc; -- break; -- } -- else if (cc>=0x80) { -- cc2=fgetc(fp); -- if (kanji==Sjis) { -- cc=SJIStoJIS((cc<<8)+cc2)+0x8080; -- } -- else { -- cc=(cc<<8)+cc2; -- } -- buf[i++]=(cc>>8)&0xff; -- buf[i]=cc&0xff; -- } -- else if (cc==0x1b) { -- cc2=fgetc(fp); -- cc3=fgetc(fp); -- if (cc2==0x24 && (cc3==0x42 || cc3==0x40)) -- jflag++; -- else if (cc2==0x28 && (cc3==0x42 || cc3==0x4a)) -- if (jflag>0) jflag--; -- else { -- buf[i++]=cc; -- buf[i++]=cc2; -- buf[i++]=cc3; -- } -- i--; -- } -- else if (jflag) { -- buf[i]=cc+0x80; -- } -- else buf[i]=cc; -+ if ((len = input_line2(fp, buf, 0, byte, &c)) == 0) return NULL; -+ if (c == '\n' || c == '\r') { -+ if (len+1 < byte) strcat(buf+len, "\n"); -+ else ungetc(c, fp); - } -- buf[i]='\0'; -+ if (c == EOF) return NULL; - return buf; - } -Index: configure.ac -=================================================================== ---- mendexk2.6e.orig/configure.ac -+++ mendexk2.6e/configure.ac -@@ -0,0 +1,28 @@ -+dnl Process this file with autoconf to produce a configure script. -+dnl -+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -+dnl -+dnl This file is free software; the copyright holder -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+AC_INIT([mendex for TeX Live], [2.6f]) -+AC_PREREQ([2.63]) -+AC_CONFIG_SRCDIR([main.c]) -+AC_CONFIG_AUX_DIR([../../build-aux]) -+AC_CONFIG_MACRO_DIR([../../m4]) -+ -+dnl Common code for all programs using libkpathsea. -+KPSE_COMMON([mendexk], [no-define]) -+ -+AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) -+ -+AC_CHECK_HEADERS([strings.h]) -+AC_CHECK_FUNCS([]) -+ -+KPSE_KPATHSEA_FLAGS -+KPSE_PTEXENC_FLAGS -+ -+AC_CONFIG_FILES([Makefile]) -+ -+AC_OUTPUT -Index: main.c -=================================================================== ---- mendexk2.6e.orig/main.c -+++ mendexk2.6e/main.c -@@ -2,6 +2,10 @@ - #include <stdlib.h> - #include <string.h> - -+#include <kpathsea/config.h> -+#include <ptexenc/ptexenc.h> -+#include "mendex.h" -+ - #include "kana.h" - #include "var.h" - -@@ -24,15 +28,12 @@ - - #define VERSION "version 2.6f [14-Aug-2009]" - --main(argc,argv) --int argc; --char **argv; -+int main(int argc, char **argv) - { -- int i,j,k,cc,dd,startpagenum,ecount=0; -- char buff[256],*envbuff; -- FILE *fp; -- char *convcode(); -+ int i,j,cc=0,startpagenum=-1,ecount=0; -+ char *envbuff; - -+ set_enc_string(NULL, "EUC"); - #ifdef KPATHSEA - KP_init(argv[0]); - kp_ist.var_name = "INDEXSTYLE"; -@@ -147,19 +148,23 @@ - break; - - case 'E': -- kanji=Euc; -+ set_enc_string("EUC", NULL); - break; - - case 'J': -- kanji=Jis; -+ set_enc_string("JIS", NULL); - break; - - case 'S': -- kanji=Sjis; -+ set_enc_string("SJIS", NULL); - break; - -+ case 'U': -+ set_enc_string("UTF8", NULL); -+ break; -+ - default: -- fprintf(stderr,"mendex - Japanese index processor, %s.\n",VERSION); -+ fprintf(stderr,"mendex - Japanese index processor, %s (%s).\n",VERSION, get_enc_string()); - fprintf(stderr," Copyright 2009 ASCII MEDIA WORKS.(ptex-staff@ml.asciimw.jp)\n"); - fprintf(stderr,"usage:\n"); - fprintf(stderr,"%% mendex [-ilqrcg] [-s sty] [-d dic] [-o ind] [-t log] [-p no] [idx0 idx1 ...]\n"); -@@ -169,7 +174,7 @@ - fprintf(stderr,"-q quiet mode.\n"); - fprintf(stderr,"-r disable implicit page formation.\n"); - fprintf(stderr,"-c compress blanks. (ignore leading and trailing blanks.)\n"); -- fprintf(stderr,"-g make Japanese index head <%s>.\n",convcode(AKASATANA)); -+ fprintf(stderr,"-g make Japanese index head <%s>.\n", AKASATANA); - fprintf(stderr,"-f force to output kanji.\n"); - fprintf(stderr,"-s sty take sty as style file.\n"); - fprintf(stderr,"-d dic take dic as dictionary file.\n"); -@@ -179,6 +184,7 @@ - fprintf(stderr,"-E EUC mode.\n"); - fprintf(stderr,"-J JIS mode.\n"); - fprintf(stderr,"-S ShiftJIS mode.\n"); -+ fprintf(stderr,"-U UTF-8 mode.\n"); - fprintf(stderr,"idx... input files.\n"); - exit(0); - break; -@@ -247,12 +253,13 @@ - else efp=fopen(logfile,"w"); - - if (strcmp(argv[0],"makeindex")==0) { -- if (verb!=0) fprintf(stderr,"This is Not `MAKEINDEX\', But `MENDEX\' %s.\n",VERSION); -+ verb_printf(efp,"This is Not `MAKEINDEX\', But `MENDEX\' %s (%s).\n", -+ VERSION, get_enc_string()); - } - else { -- if (verb!=0) fprintf(stderr,"This is mendex %s.\n",VERSION); -+ verb_printf(efp,"This is mendex %s (%s).\n", -+ VERSION, get_enc_string()); - } -- if (efp!=stderr) fprintf(efp,"This is mendex %s.\n",VERSION); - - /* init kanatable */ - -@@ -298,64 +305,36 @@ - if (fsti==1) { - ecount+=idxread(NULL,lines); - } -- if (verb!=0) { -- fprintf(stderr,"%d entries accepted, %d rejected.\n",acc,reject); -- } -- if (efp!=stderr) { -- fprintf(efp,"%d entries accepted, %d rejected.\n",acc,reject); -- } -+ verb_printf(efp,"%d entries accepted, %d rejected.\n",acc,reject); - - if (ecount!=0) { -- if (verb!=0) { -- fprintf(stderr,"%d errors, written in %s.\n",ecount,logfile); -- } -- if (efp!=stderr) { -- fprintf(efp,"%d errors.\n",ecount); -- } -+ verb_printf(efp,"%d errors, written in %s.\n",ecount,logfile); - lines=0; - } - if (lines==0) { -- if (verb!=0) { -- fprintf(stderr,"Nothing written in output file.\n"); -- } -- if (efp!=stderr) { -- fprintf(efp,"Nothing written in output file.\n"); -- fclose(efp); -- } -+ verb_printf(efp,"Nothing written in output file.\n"); -+ if (efp!=stderr) fclose(efp); - exit(-1); - } - - /* sort index */ - -- if (verb!=0) fprintf(stderr,"Sorting index."); -- if (efp!=stderr) fprintf(efp,"Sorting index."); -+ verb_printf(efp,"Sorting index."); - - scount=0; - wsort(ind,lines); - -- if (verb!=0) { -- fprintf(stderr,"...done(%d comparisons).\n",scount); -- } -- if (efp!=stderr) { -- fprintf(efp,"...done(%d comparisons).\n",scount); -- } -+ verb_printf(efp,"...done(%d comparisons).\n",scount); - - /* sort pages */ - -- if (verb!=0) fprintf(stderr,"Sorting pages."); -- if (efp!=stderr) fprintf(efp,"Sorting pages."); -+ verb_printf(efp,"Sorting pages."); - - scount=0; - pagesort(ind,lines); - -+ verb_printf(efp,"...done(%d comparisons).\n",scount); - -- if (verb!=0) { -- fprintf(stderr,"...done(%d comparisons).\n",scount); -- } -- if (efp!=stderr) { -- fprintf(efp,"...done(%d comparisons).\n",scount); -- } -- - /* get last page */ - - if ((fpage>1)&&(idxcount-fsti>0)) cc=lastpage(idxfile[0]); -@@ -381,31 +360,17 @@ - - /* write indfile */ - -- if (verb!=0) fprintf(stderr,"Making index file."); -- if (efp!=stderr) fprintf(efp,"Making index file."); -+ verb_printf(efp,"Making index file."); - - indwrite(indfile,ind,startpagenum); - -- if (verb!=0) fprintf(stderr,"...done.\n"); -- if (efp!=stderr) fprintf(efp,"...done.\n"); -+ verb_printf(efp,"...done.\n"); - - if (idxcount-fsti==0) strcpy(indfile,"stdout"); - -- if (verb!=0) { -- fprintf(stderr,"%d warnings, written in %s.\n",warn,logfile); -- fprintf(stderr,"Output written in %s.\n",indfile); -- } -- if (efp!=stderr) { -- fprintf(efp,"%d warnings, written in %s.\n",warn,logfile); -- fprintf(efp,"Output written in %s.\n",indfile); -- fclose(efp); -- } -+ verb_printf(efp,"%d warnings, written in %s.\n",warn,logfile); -+ verb_printf(efp,"Output written in %s.\n",indfile); -+ if (efp!=stderr) fclose(efp); - - exit(0); - } -- --Fprintf(buff) --char *buff; --{ -- if (debug) fprintf(stderr,"CHECK:%s",buff); --} -Index: reautoconf -=================================================================== ---- mendexk2.6e.orig/reautoconf -+++ mendexk2.6e/reautoconf -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+set -x -+LANG=C -+rm -rf autom4te.cache/ -+ -+(cd ../../; ./reautoconf texk/mendexk) -Index: mendex.h -=================================================================== ---- mendexk2.6e.orig/mendex.h -+++ mendexk2.6e/mendex.h -@@ -0,0 +1,58 @@ -+struct page { -+ char *page; -+ char *enc; -+ char attr[3]; -+}; -+ -+struct index { -+ int num; -+ char words; -+ unsigned char *org[3]; -+ unsigned char *dic[3]; -+ unsigned char *idx[3]; -+ struct page *p; -+ int lnum; -+}; -+ -+/* convert.c */ -+void initkanatable(void); -+int convert(unsigned char *buff1, unsigned char *buff2); -+int pnumconv(char *page, int attr); -+int dicread(char *filename); -+ -+/* pageread.c */ -+int lastpage(char *filename); -+ -+/* sort.c */ -+void wsort(struct index *ind, int num); -+void pagesort(struct index *ind, int num); -+int alphanumeric(unsigned char c); -+int alphabet(unsigned char c); -+int numeric(unsigned char c); -+int japanese(unsigned char *buff); -+int chkcontinue(struct page *p, int num); -+ -+/* styfile.c */ -+void styread(char *filename); -+ -+/* fread.c */ -+char *mfgets(char *buf, int byte, FILE *fp); -+int idxread(char *filename, int start); -+ -+/* fwrite.c */ -+int fprintf2 (FILE *fp, const char *format, ...); -+int warn_printf(FILE *fp, const char *format, ...); -+int verb_printf(FILE *fp, const char *format, ...); -+ -+struct index; -+void indwrite(char *filename, struct index *ind, int pagenum); -+ -+#ifdef fprintf -+#undef fprintf -+#endif -+#define fprintf fprintf2 -+ -+#ifdef fputs -+#undef fputs -+#endif -+#define fputs fputs2 -Index: sort.c -=================================================================== ---- mendexk2.6e.orig/sort.c -+++ mendexk2.6e/sort.c -@@ -2,17 +2,21 @@ - #include <stdlib.h> - #include <string.h> - -+#include "mendex.h" -+ - #include "exkana.h" - #include "exvar.h" - - int sym,number,alpha,kana; - --wsort(ind,num) -+static int wcomp(const void *p, const void *q); -+static int pcomp(const void *p, const void *q); -+static int ordering(unsigned char *buff); -+ - /* sort index */ --struct index *ind; --int num; -+void wsort(struct index *ind, int num) - { -- int i,j,order,wcomp(); -+ int i,order; - - for (order=1,i=0;;i++) { - switch (character_order[i]) { -@@ -55,11 +59,11 @@ - qsort(ind,num,sizeof(struct index),wcomp); - } - --int wcomp(index1,index2) - /* compare for sorting index */ --struct index *index1,*index2; -+static int wcomp(const void *p, const void *q) - { -- int i,j,k,cc,prechar,pri1,pri2; -+ int i,j,prechar; -+ const struct index *index1 = p, *index2 = q; - - scount++; - -@@ -142,16 +146,12 @@ - return 0; - } - --int pagesort(ind,num) - /* sort page */ --struct index *ind; --int num; -+void pagesort(struct index *ind, int num) - { -- int i,j,k,cc; -+ int i,j; - struct page *buff; - -- int pcomp(); -- - for (i=0;i<num;i++) { - if (ind[i].num==0) continue; - -@@ -167,12 +167,12 @@ - } - } - --int pcomp(page1,page2) - /* compare for sorting page */ --struct page *page1,*page2; -+static int pcomp(const void *p, const void *q) - { - int i,j,cc=0,num1,num2; - char buff[16]; -+ const struct page *page1 = p, *page2 = q; - - scount++; - -@@ -210,8 +210,7 @@ - return 0; - } - --int ordering(buff) --unsigned char *buff; -+static int ordering(unsigned char *buff) - { - if ((*buff)<0x80) { - if (alphabet(*buff)) return alpha; -@@ -224,38 +223,32 @@ - } - } - --int alphanumeric(c) --unsigned char c; -+int alphanumeric(unsigned char c) - { - if (((c>='A')&&(c<='Z'))||((c>='a')&&(c<='z'))||((c>='0')&&(c<='9'))) - return 1; - else return 0; - } - --int alphabet(c) --unsigned char c; -+int alphabet(unsigned char c) - { - if (((c>='A')&&(c<='Z'))||((c>='a')&&(c<='z'))) return 1; - else return 0; - } - --int numeric(c) --unsigned char c; -+int numeric(unsigned char c) - { - if ((c>='0')&&(c<='9')) return 1; - else return 0; - } - --int japanese(buff) --unsigned char *buff; -+int japanese(unsigned char *buff) - { - if (strncmp(buff,HIRATOP,2)>=0) return 1; - else return 0; - } - --int chkcontinue(p,num) --struct page *p; --int num; -+int chkcontinue(struct page *p, int num) - { - int i,j,cc=0,num1,num2; - char buff[16]; -Index: Makefile.am -=================================================================== ---- mendexk2.6e.orig/Makefile.am -+++ mendexk2.6e/Makefile.am -@@ -1,38 +1,43 @@ --## Makefile.am for the TeX Live subdirectory texk/makeindexk/ -+## Makefile.am for the TeX Live subdirectory texk/mendexk/ - ## - ## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> - ## You may freely use, modify and/or distribute this file. - ## - ACLOCAL_AMFLAGS = -I ../../m4 - --INCLUDES = $(KPATHSEA_INCLUDES) --AM_CPPFLAGS = -DUNIX -DKPATHSEA -+INCLUDES = $(KPATHSEA_INCLUDES) $(PTEXENC_INCLUDES) -+AM_CPPFLAGS = -DKPATHSEA -DKPATHSEA3 - AM_CFLAGS = $(WARNING_CFLAGS) - --dist_bin_SCRIPTS = mkindex - --bin_PROGRAMS = makeindex -+bin_PROGRAMS = mendex - --makeindex_SOURCES = \ -- genind.c \ -- genind.h \ -- mkind.c \ -- mkind.h \ -- qsort.c \ -- scanid.c \ -- scanid.h \ -- scanst.c \ -- scanst.h \ -- sortid.c -+mendex_SOURCES = \ -+ convert.c \ -+ exkana.h \ -+ exvar.h \ -+ fread.c \ -+ fwrite.c \ -+ kana.h \ -+ kp.c \ -+ kp.h \ -+ ktable.h \ -+ main.c \ -+ mendex.h \ -+ pageread.c \ -+ sort.c \ -+ styfile.c \ -+ var.h - --makeindex_DEPENDENCIES = $(KPATHSEA_DEPEND) -+mendex_DEPENDENCIES = $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) - --LDADD = $(KPATHSEA_LIBS) -+LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) - --## Rebuild libkpathsea -+## Rebuild libkpathsea & libptexenc - @KPATHSEA_RULE@ -+@PTEXENC_RULE@ - --dist_man1_MANS = makeindex.1 mkindex.1 -+dist_man1_MANS = mendex.1 - --EXTRA_DIST = ACK CONTRIB FILES NOTES PORTING -+EXTRA_DIST = COPYRIGHT COPYRIGHT.jis ChangeLog README - -Index: exvar.h -=================================================================== ---- mendexk2.6e.orig/exvar.h -+++ mendexk2.6e/exvar.h -@@ -1,26 +1,5 @@ --struct page { -- char *page; -- char *enc; -- char attr[3]; --}; -- --struct index { -- int num; -- char words; -- unsigned char *org[3]; -- unsigned char *dic[3]; -- unsigned char *idx[3]; -- struct page *p; -- int lnum; --}; -- - extern FILE *efp; - --#define Euc 0 --#define Jis 1 --#define Sjis 2 --extern int kanji; -- - extern int lines,idxcount,acc,reject; - extern int prange,fsti,lorder,bcomp,force,fpage,gflg,verb,debug; - extern int warn,scount,pattr[3]; -Index: aclocal.m4 -=================================================================== ---- mendexk2.6e.orig/aclocal.m4 -+++ mendexk2.6e/aclocal.m4 -@@ -991,6 +991,7 @@ - - m4_include([../../m4/kpse-common.m4]) - m4_include([../../m4/kpse-kpathsea-flags.m4]) -+m4_include([../../m4/kpse-ptexenc-flags.m4]) - m4_include([../../m4/kpse-warnings.m4]) - m4_include([../../m4/libtool.m4]) - m4_include([../../m4/ltoptions.m4]) -Index: var.h -=================================================================== ---- mendexk2.6e.orig/var.h -+++ mendexk2.6e/var.h -@@ -1,38 +1,9 @@ --struct page { -- char *page; -- char *enc; -- char attr[3]; --}; -- --struct index { -- int num; -- char words; -- unsigned char *org[3]; -- unsigned char *dic[3]; -- unsigned char *idx[3]; -- struct page *p; -- int lnum; --}; -- - FILE *efp; - --#define Euc 0 --#define Jis 1 --#define Sjis 2 --#ifdef SJIS --int kanji=Sjis; --#else --#ifdef EUC --int kanji=Euc; --#else --int kanji=Jis; --#endif --#endif -- - int lines,idxcount,acc=0,reject=0; - int prange=1,fsti=0,lorder=0,bcomp=0,force=0,fpage=0,gflg=0,verb=1,debug=0; - int warn=0,scount=0,pattr[3]={0,0,0}; --static char roman[]={"ivxlcdm"},Roman[]={"IVXLCDM"}; -+/* static char roman[]={"ivxlcdm"},Roman[]={"IVXLCDM"}; */ - - struct index *ind; - diff --git a/Build/source/texk/ptexenc/patches/ptex-src-3.1.11-ptexenc.patch b/Build/source/texk/ptexenc/patches/ptex-src-3.1.11-ptexenc.patch deleted file mode 100644 index fe9f3e5c0c1..00000000000 --- a/Build/source/texk/ptexenc/patches/ptex-src-3.1.11-ptexenc.patch +++ /dev/null @@ -1,2621 +0,0 @@ -Index: ptexhelp.h -=================================================================== ---- ptex-src-3.1.11.orig/ptexhelp.h -+++ ptex-src-3.1.11/ptexhelp.h -@@ -2,53 +2,50 @@ - */ - #ifndef PTEXHELP_H - #define PTEXHELP_H -+/* block texk/web2c/help.h */ - #define HELP_H - --#ifdef TeX --/* ptexextra.h */ --#undef TEXPOOLNAME --#define TEXPOOLNAME "ptex.pool" --#endif /* TeX */ -- --#ifdef TFTOPL -+#ifdef PTFTOPL - string based_prog_name = "TFtoPL"; - const_string PTEXTFTOPLHELP[] = { --"Usage: tftopl [option] tfmfile [plfile]", -+"Usage: ptftopl [option] tfmfile [plfile]", - "", - " -verbose output progress reports.", - " -version print version information and exit.", - " -help print this message and exit.", --" -kanji={jis|euc|sjis} plfile kanji code.", -+" -kanji={jis|euc|sjis|utf8}", -+" plfile kanji code.", - NULL }; --#endif /* TFTOPL */ -+#endif /* PTFTOPL */ - --#ifdef PLTOTF -+#ifdef PPLTOTF - string based_prog_name = "PLtoTF"; - const_string PTEXPLTOTFHELP[] = { --"Usage: pltotf [option] plfile [tfmfile]", -+"Usage: ppltotf [option] plfile [tfmfile]", - "", - " -verbose output progress reports.", - " -version print version information and exit.", - " -help print this message and exit.", --" -kanji={jis|euc|sjis} plfile kanji code.", -+" -kanji={jis|euc|sjis|utf8}", -+" plfile kanji code.", - NULL }; --#endif /* PLTOTF */ -+#endif /* PPLTOTF */ - --#ifdef BIBTEX -+#ifdef PBIBTEX - string based_prog_name = "BibTeX"; --const_string JBIBTEXHELP[] = { --"Usage: jbibtex [option] auxfile", -+const_string PBIBTEXHELP[] = { -+"Usage: pbibtex [option] auxfile", - "", - " -min-crossrefs=INTEGER minimum number of cross-refs required", - " for automatic cite_list inclusion (default 2).", - " -terse do silently.", - " -version print version information and exit.", - " -help print this message and exit.", --" -kanji={jis|euc|sjis} kanji code for output-file.", -+" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", - NULL }; --#endif /* BIBTEX */ -+#endif /* PBIBTEX */ - --#ifdef DVITYPE -+#ifdef PDVITYPE - string based_prog_name = "DVItype"; - const_string PDVITYPEHELP[] = { - "Usage: pdvitype [option] dvifile", -@@ -64,8 +61,9 @@ - " with \\count0=1, \\count2=4.", - " (see the TeX book chapter 15).", - " -show-opcodes show opcodes in dicimal.", -+" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", - " -version print version information and exit.", - " -help print this message and exit.", - NULL }; --#endif /* DVITYPE */ -+#endif /* PDVITYPE */ - #endif /* PTEXHELP_H */ -Index: ptex-base.ch -=================================================================== ---- ptex-src-3.1.11.orig/ptex-base.ch -+++ ptex-src-3.1.11/ptex-base.ch -@@ -44,11 +44,11 @@ - % (08/17/2009) ST pTeX p3.1.11 - % - @x [1.2] l.195 - pTeX: --@d TeX_banner_k=='This is TeXk, Version 3.141592' {printed when \TeX\ starts} --@d TeX_banner=='This is TeX, Version 3.141592' {printed when \TeX\ starts} -+@d TeX_banner_k=='This is TeXk, Version 3.1415926' {printed when \TeX\ starts} -+@d TeX_banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts} - @y --@d TeX_banner_k=='This is pTeXk, Version 3.141592-p3.1.11' {printed when p\TeX\ starts} --@d TeX_banner=='This is pTeX, Version 3.141592-p3.1.11' {printed when p\TeX\ starts} -+@d TeX_banner_k=='This is pTeXk, Version 3.1415926-p3.1.11' {printed when p\TeX\ starts} -+@d TeX_banner=='This is pTeX, Version 3.1415926-p3.1.11' {printed when p\TeX\ starts} - @z - - @x [2.??] l.586 - pTeX: -@@ -114,13 +114,6 @@ - @ All of the file opening functions are defined in C. - - @ Kanji code handling. -- --@d jis_enc=0 {denotes JIS X 2022 kanji encoding} --@d euc_enc=1 {denotes EUC kanji encoding} --@d sjis_enc=2 {denotes Shift JIS kanji encoding} -- --@<Glob...@>= --@!proc_kanji_code:jis_enc..sjis_enc; - @z - - @x [4.47] l.1325 - pTeX: -@@ -140,7 +133,7 @@ - (k<" ")or(k>"~") - @y - @<Character |k| cannot be printed@>= -- not (iskanji1(k) or iskanji2(k) or xprn[k]) -+ not (ismultiprn(k) or xprn[k]) - @z - - @x [5.54] l.1514 - pTeX: Global variables -@@ -343,14 +336,9 @@ - wterm(banner_k) - else - wterm(banner); --wterm(' ('); --case proc_kanji_code of -- jis_enc: wterm('jis'); -- euc_enc: wterm('euc'); -- sjis_enc: wterm('sjis'); -- othercases wterm('?'); --endcases; --wterm(')'); -+ wterm(' ('); -+ wterm(stringcast(get_enc_string)); -+ wterm(')'); - @z - - @x l.1820 - pTeX -@@ -1183,16 +1171,16 @@ - begin math_code(k):=hi(k+var_code); - auto_xsp_code(k):=3; - end; --kansuji_char(0):=@"213B; --kansuji_char(1):=@"306C; --kansuji_char(2):=@"4673; --kansuji_char(3):=@"3B30; --kansuji_char(4):=@"3B4D; --kansuji_char(5):=@"385E; --kansuji_char(6):=@"4F3B; --kansuji_char(7):=@"3C37; --kansuji_char(8):=@"482C; --kansuji_char(9):=@"3665; -+kansuji_char(0):=toDVI(fromJIS(@"213B)); -+kansuji_char(1):=toDVI(fromJIS(@"306C)); -+kansuji_char(2):=toDVI(fromJIS(@"4673)); -+kansuji_char(3):=toDVI(fromJIS(@"3B30)); -+kansuji_char(4):=toDVI(fromJIS(@"3B4D)); -+kansuji_char(5):=toDVI(fromJIS(@"385E)); -+kansuji_char(6):=toDVI(fromJIS(@"4F3B)); -+kansuji_char(7):=toDVI(fromJIS(@"3C37)); -+kansuji_char(8):=toDVI(fromJIS(@"482C)); -+kansuji_char(9):=toDVI(fromJIS(@"3665)); - for k:="A" to "Z" do - begin cat_code(k):=letter; cat_code(k+"a"-"A"):=letter;@/ - math_code(k):=hi(k+var_code+@"100); -@@ -1202,24 +1190,12 @@ - auto_xsp_code(k):=3; auto_xsp_code(k+"a"-"A"):=3;@/ - sf_code(k):=999; - end; --if (proc_kanji_code=sjis_enc) then begin -- @t\hskip10pt@>kcat_code(129):=other_kchar; -- @t\hskip10pt@>kcat_code(130):=kana; -- @t\hskip10pt@>kcat_code(131):=kana; -- @t\hskip10pt@>kcat_code(132):=other_kchar; -- @+@t\1@>for k:=136 to 159 do kcat_code(k):=kanji; -- @+@t\1@>for k:=224 to 234 do kcat_code(k):=kanji; --end else begin -- @t\hskip10pt@>kcat_code(161):=other_kchar; {1 ku} -- @t\hskip10pt@>kcat_code(162):=other_kchar; {2 ku} -- @t\hskip10pt@>kcat_code(163):=kana; {3 ku} -- @t\hskip10pt@>kcat_code(164):=kana; {4 ku} -- @t\hskip10pt@>kcat_code(165):=kana; {5 ku} -- @t\hskip10pt@>kcat_code(166):=kana; {6 ku} -- @t\hskip10pt@>kcat_code(167):=other_kchar; {7 ku} -- @t\hskip10pt@>kcat_code(168):=other_kchar; {8 ku} -- @+@t\1@>for k:=176 to 244 do kcat_code(k):=kanji; {16 ku ... 84 ku} --end; -+@t\hskip10pt@>kcat_code(@"20+1):=other_kchar; {1 ku} -+@t\hskip10pt@>kcat_code(@"20+2):=other_kchar; {2 ku} -+@+@t\1@>for k:=3 to 6 do kcat_code(@"20+k):=kana; {3 ku ... 6 ku} -+@+@t\1@>for k:=7 to 8 do kcat_code(@"20+k):=other_kchar; {7 ku ... 8 ku} -+@+@t\1@>for k:=16 to 84 do kcat_code(@"20+k):=kanji; {16 ku ... 84 ku} -+{ @"20+k = kcatcodekey(fromKUTEN(HILO(k,1)) } - @z - - @x [17.236] l.5092 - pTeX: cur_jfam_code, jchr_widow_penalty -@@ -1532,9 +1508,9 @@ - if info(p)>=cs_token_flag then print_cs(info(p)-cs_token_flag) {wchar_token} - else begin - if check_kanji(info(p)) then {wchar_token} -- begin m:=kcat_code(Hi(info(p))); c:=info(p); -+ begin m:=kcat_code(kcatcodekey(info(p))); c:=info(p); - end -- else begin m:=info(p) div @'400; c:=info(p) mod @'400; -+ else begin m:=Hi(info(p)); c:=Lo(info(p)); - end; - if (m<kanji)and(c>256) then print_esc("BAD.") - @.BAD@> -@@ -1676,7 +1652,7 @@ - begin if (token_type=backed_up)and(loc<>null) then - begin if (link(start)=null)and(check_kanji(info(start))) then {wchar_token} - begin cur_input:=input_stack[base_ptr-1]; -- s:=get_avail; info(s):=(buffer[loc] mod @'400); -+ s:=get_avail; info(s):=Lo(buffer[loc]); - cur_input:=input_stack[base_ptr]; - link(start):=s; - show_token_list(start,loc,100000); -@@ -1707,7 +1683,7 @@ - @z - - @x [24.341] l.7479 - pTeX: set last_chr --@!cat:0..15; {|cat_code(cur_chr)|, usually} -+@!cat:0..max_char_code; {|cat_code(cur_chr)|, usually} - @y - @!cat:escape..max_char_code; {|cat_code(cur_chr)|, usually} - @!l:0..buf_size; {temporary index into |buffer|} -@@ -1734,8 +1710,9 @@ - @^inner loop@> - begin switch: if loc<=limit then {current line not yet finished} - begin cur_chr:=buffer[loc]; incr(loc); -- if (iskanji1(cur_chr))and(loc<=limit)and(iskanji2(buffer[loc])) then -- begin cur_cmd:=kcat_code(cur_chr); cur_chr:=cur_chr*@'400+buffer[loc]; -+ if (multistrlen(buffer, limit+1, loc-1)=2) then -+ begin cur_chr:=fromBUFF(buffer, limit+1, loc-1); -+ cur_cmd:=kcat_code(kcatcodekey(cur_chr)); - incr(loc); - end - else reswitch: cur_cmd:=cat_code(cur_chr); -@@ -1843,8 +1820,8 @@ - @<Scan a control...@>= - begin if loc>limit then cur_cs:=null_cs {|state| is irrelevant in this case} - else begin k:=loc; cur_chr:=buffer[k]; incr(k); -- if (iskanji1(cur_chr))and(k<=limit)and(iskanji2(buffer[k])) then -- begin cat:=kcat_code(cur_chr); incr(k); -+ if (multistrlen(buffer, limit+1, k-1)=2) then -+ begin cat:=kcat_code(kcatcodekey(fromBUFF(buffer, limit+1, k-1))); incr(k); - end - else cat:=cat_code(cur_chr); - start_cs: -@@ -1958,8 +1935,8 @@ - @y - @ @<Scan ahead in the buffer...@>= - begin repeat cur_chr:=buffer[k]; incr(k); -- if (iskanji1(cur_chr))and(k<=limit)and(iskanji2(buffer[k])) then -- begin cat:=kcat_code(cur_chr); incr(k); -+ if (multistrlen(buffer, limit+1, k-1)=2) then -+ begin cat:=kcat_code(kcatcodekey(fromBUFF(buffer, limit+1, k-1))); incr(k); - end - else cat:=cat_code(cur_chr); - while (buffer[k]=cur_chr)and(cat=sup_mark)and(k<limit) do -@@ -2044,10 +2021,10 @@ - else check_outer_validity; - end - else if check_kanji(t) then {wchar_token} -- begin cur_chr:=t; cur_cmd:=kcat_code(Hi(t)); -+ begin cur_chr:=t; cur_cmd:=kcat_code(kcatcodekey(t)); - end - else -- begin cur_cmd:=t div @'400; cur_chr:=t mod @'400; -+ begin cur_cmd:=Hi(t); cur_chr:=Lo(t); - case cur_cmd of - left_brace: incr(align_state); - right_brace: decr(align_state); -@@ -2133,11 +2110,8 @@ - end; - if check_kanji(info(p)) then {wchar_token} - begin buffer[j]:=Hi(info(p)); incr(j); -- buffer[j]:=Lo(info(p)); incr(j); p:=link(p); -- end -- else -- begin buffer[j]:=info(p) mod @'400; incr(j); p:=link(p); - end; -+ buffer[j]:=Lo(info(p)); incr(j); p:=link(p); - end; - @z - -@@ -2236,9 +2210,9 @@ - else scanned_result(eqtb[m+cur_val].int)(int_val); - @y - if m=math_code_base then scanned_result(ho(math_code(cur_val)))(int_val) --else if m=kcat_code_base then scanned_result(equiv(m+Hi(cur_val)))(int_val) -+else if m=kcat_code_base then scanned_result(equiv(m+kcatcodekey(cur_val)))(int_val) - else if m<math_code_base then -- begin if check_kanji(cur_val)>0 then -+ begin if is_kanji(cur_val) then - scanned_result(equiv(m+Hi(cur_val)))(int_val) - else scanned_result(equiv(m+cur_val))(int_val) - end -@@ -2275,7 +2249,7 @@ - @y - procedure scan_char_num; - begin scan_int; --if ((cur_val<0)or(cur_val>255))and(not check_kanji(cur_val)) then {wchar_token} -+if (not is_char_ascii(cur_val))and(not check_kanji(cur_val)) then {wchar_token} - begin print_err("Bad character code"); - @.Bad character code@> - help2("A character number must be between 0 and 255, or KANJI code.")@/ -@@ -2366,8 +2340,8 @@ - if t=" " then t:=space_token - else t:=other_token+t; - @y -- if (iskanji1(t))and(k+1<pool_ptr)and(iskanji2(str_pool[k+1])) then -- begin t:=t*@'400+str_pool[k+1]; incr(k); -+ if (multistrlen(str_pool, pool_ptr, k)=2) then -+ begin t:=fromBUFF(str_pool, pool_ptr, k); incr(k); - end - else if t=" " then t:=space_token - else t:=other_token+t; -@@ -2465,22 +2439,10 @@ - case c of - number_code: print_int(cur_val); - roman_numeral_code: print_roman_int(cur_val); --jis_code: begin -- if (proc_kanji_code=sjis_enc) then cur_val:=JIStoSJIS(cur_val) -- else cur_val:=JIStoEUC(cur_val); -- print_int(cur_val); end; --euc_code: begin -- if (proc_kanji_code=sjis_enc) then cur_val:=EUCtoSJIS(cur_val) -- else do_nothing; -- print_int(cur_val); end; --sjis_code: begin -- if (proc_kanji_code=sjis_enc) then do_nothing -- else cur_val:=SJIStoEUC(cur_val); -- print_int(cur_val); end; --kuten_code: begin -- if (proc_kanji_code=sjis_enc) then cur_val:=KUTENtoSJIS(cur_val) -- else cur_val:=KUTENtoEUC(cur_val); -- print_int(cur_val); end; -+jis_code: print_int(fromJIS(cur_val)); -+euc_code: print_int(fromEUC(cur_val)); -+sjis_code: print_int(fromSJIS(cur_val)); -+kuten_code: print_int(fromKUTEN(cur_val)); - kansuji_code: print_kansuji(cur_val); - string_code:if cur_cs<>0 then sprint_cs(cur_cs) - else if KANJI(cx)=0 then print_char(cur_chr) -@@ -2613,8 +2575,8 @@ - loop@+begin - if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {is kanji} - begin str_room(2); -- append_char(cur_chr div 256); {kanji upper byte} -- append_char(cur_chr mod 256); {kanji lower byte} -+ append_char(Hi(cur_chr)); {kanji upper byte} -+ append_char(Lo(cur_chr)); {kanji lower byte} - end - else if (cur_cmd>other_char)or(cur_chr>255) then {not a alphabet} - begin back_input; goto done; -@@ -2654,14 +2616,9 @@ - wlog(banner_k) - else - wlog(banner); --wlog(' ('); --case proc_kanji_code of -- jis_enc: wlog('jis'); -- euc_enc: wlog('euc'); -- sjis_enc: wlog('sjis'); -- othercases wterm('?'); --endcases; --wlog(')'); -+ wlog(' ('); -+ wlog(stringcast(get_enc_string)); -+ wlog(')'); - @z - - @x [30.560] l.10968 - pTeX: -@@ -2778,6 +2735,7 @@ - fget; read_sixteen(ne); - fget; read_sixteen(np); - if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort; -+if (nw=0)or(nh=0)or(nd=0)or(ni=0) then abort; - end - @y - @ @<Read the {\.{TFM}} size fields@>= -@@ -2814,7 +2772,8 @@ - end - else - begin if lf<>6+lh+(ec-bc+1)+nw+nh+nd+ni+nl+nk+ne+np then abort -- end -+ end; -+if (nw=0)or(nh=0)or(nd=0)or(ni=0) then abort; - end - @z - -@@ -3110,8 +3069,7 @@ - synch_h; - end; - p:=link(p); -- if (proc_kanji_code=sjis_enc) then jc:=SJIStoJIS(KANJI(info(p))) -- else jc:=EUCtoJIS(KANJI(info(p))); -+ jc:=toDVI(KANJI(info(p))); - dvi_out(set2); dvi_out(Hi(jc)); dvi_out(Lo(jc)); - cur_h:=cur_h+char_width(f)(orig_char_info(f)(c)); {not |jc|} - end; -@@ -4630,9 +4588,9 @@ - hmode+letter,hmode+other_char: goto main_loop; - hmode+kanji,hmode+kana,hmode+other_kchar: goto main_loop_j; - hmode+char_given: -- if (cur_chr>=0)and(cur_chr<256) then goto main_loop else goto main_loop_j; -+ if is_char_ascii(cur_chr) then goto main_loop else goto main_loop_j; - hmode+char_num: begin scan_char_num; cur_chr:=cur_val; -- if (cur_chr>=0)and(cur_chr<256) then goto main_loop else goto main_loop_j; -+ if is_char_ascii(cur_chr) then goto main_loop else goto main_loop_j; - end; - hmode+no_boundary: begin get_x_token; - if (cur_cmd=letter)or(cur_cmd=other_char)or -@@ -4719,7 +4677,7 @@ - @<goto |main_lig_loop|@>; - if cur_cmd=other_char then goto main_loop_lookahead+1; - if cur_cmd=char_given then -- begin if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 -+ begin if is_char_ascii(cur_chr) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; - x_token; {now expand and set |cur_cmd|, |cur_chr|, |cur_tok|} -@@ -4728,12 +4686,12 @@ - @<goto |main_lig_loop|@>; - if cur_cmd=other_char then goto main_loop_lookahead+1; - if cur_cmd=char_given then -- begin if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 -+ begin if is_char_ascii(cur_chr) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; - if cur_cmd=char_num then - begin scan_char_num; cur_chr:=cur_val; -- if (cur_chr>=0)and(cur_chr<256) then goto main_loop_lookahead+1 -+ if is_char_ascii(cur_chr) then goto main_loop_lookahead+1 - else @<goto |main_lig_loop|@>; - end; - if cur_cmd=inhibit_glue then -@@ -5437,7 +5395,7 @@ - begin scan_char_num; f:=cur_font; p:=new_character(f,cur_val); - @y - begin scan_char_num; --if (cur_val<0)or(cur_val>255) then -+if (not is_char_ascii(cur_val)) then - begin KANJI(cx):=cur_val; - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - p:=new_character(f,get_jfm_pos(KANJI(cx),f)); -@@ -5474,14 +5432,14 @@ - cx:=cur_chr; - end - else if cur_cmd=char_given then -- if (cur_chr>=0)and(cur_chr<256)then q:=new_character(f,cur_chr) -+ if is_char_ascii(cur_chr) then q:=new_character(f,cur_chr) - else begin - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - KANJI(cx):=cur_chr - end - else if cur_cmd=char_num then - begin scan_char_num; -- if (cur_chr>=0)and(cur_chr<256)then q:=new_character(f,cur_val) -+ if is_char_ascii(cur_chr) then q:=new_character(f,cur_val) - else begin - if direction=dir_tate then f:=cur_tfont else f:=cur_jfont; - KANJI(cx):=cur_chr -@@ -5604,7 +5562,7 @@ - restart: @<Get the next non-blank non-relax...@>; - reswitch:case cur_cmd of - letter,other_char,char_given: -- if (cur_chr>=0)and(cur_chr<=256) then begin -+ if (is_char_ascii(cur_chr) or (cur_chr=256)) then begin - c:=ho(math_code(cur_chr)); - if c=@'100000 then - begin @<Treat |cur_chr| as an active character@>; -@@ -5654,7 +5612,7 @@ - end; - @y - mmode+letter,mmode+other_char,mmode+char_given: -- if (cur_chr>=0)and(cur_chr<256) then -+ if is_char_ascii(cur_chr) then - if cur_chr<128 then set_math_char(ho(math_code(cur_chr))) - else set_math_char(cur_chr) - else set_math_kchar(cur_chr); -@@ -5662,7 +5620,7 @@ - cx:=cur_chr; set_math_kchar(KANJI(cx)); - end; - mmode+char_num: begin scan_char_num; cur_chr:=cur_val; -- if (cur_chr>=0)and(cur_chr<256) then -+ if is_char_ascii(cur_chr) then - if cur_chr<128 then set_math_char(ho(math_code(cur_chr))) - else set_math_char(cur_chr) - else set_math_kchar(cur_chr); -@@ -6048,7 +6006,7 @@ - @<Let |m| be the minimal legal code value, based on |cur_chr|@>; - @<Let |n| be the largest legal code value, based on |cur_chr|@>; - p:=cur_chr; scan_char_num; -- if p=kcat_code_base then p:=p+Hi(cur_val) else p:=p+cur_val; -+ if p=kcat_code_base then p:=p+kcatcodekey(cur_val) else p:=p+cur_val; - scan_optional_equals; scan_int; - if ((cur_val<m)and(p<del_code_base))or(cur_val>n) then - begin print_err("Invalid code ("); print_int(cur_val); -@@ -6739,8 +6697,7 @@ - var @!jc:KANJI_code; {temporary register for KANJI} - @!sp,@!mp,@!ep:pointer; - begin@/ --if (proc_kanji_code=sjis_enc) then jc:=SJIStoJIS(kcode) --else jc:=EUCtoJIS(kcode); -+jc:=toDVI(kcode); - sp:=1; { start position } - ep:=font_num_ext[f]-1; { end position } - if (kchar_code(f)(sp)<=jc)and(jc<=kchar_code(f)(ep)) then -@@ -6802,14 +6759,7 @@ - error; return; - end - else -- begin -- if (proc_kanji_code=sjis_enc) then -- define(kansuji_base+n,n,tokanji(SJIStoJIS(cur_val))) -- else if (proc_kanji_code=euc_enc) then -- define(kansuji_base+n,n,tokanji(EUCtoJIS(cur_val))) -- else if (proc_kanji_code=jis_enc) then -- define(kansuji_base+n,n,tokanji(cur_val)); -- end; -+ define(kansuji_base+n,n,tokanji(toDVI(cur_val))); - end; - - @ |print_kansuji| procedure converts a number to KANJI number. -@@ -6825,9 +6775,7 @@ - begin while k>0 do - begin decr(k); - cx:=kansuji_char(dig[k]); -- if (proc_kanji_code=sjis_enc) then cx:=JIStoSJIS(cx) -- else if (proc_kanji_code=euc_enc) then cx:=JIStoEUC(cx); -- print_kanji(cx); -+ print_kanji(fromDVI(cx)); - end; - end; - end; -@@ -7007,7 +6955,7 @@ - @ @<Assignments@>= - assign_kinsoku: - begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int; --if check_kanji(n) then -+if (is_char_ascii(n) or check_kanji(n)) then - begin j:=get_kinsoku_pos(tokanji(n),new_pos); - if j=no_entry then - begin print_err("KINSOKU table is full!!"); -@@ -7429,7 +7377,7 @@ - while(p<>null) do - begin if is_char_node(p) then - begin if font_dir[font(p)]<>dir_default then -- begin KANJI(cx):=info(link(p)); i:=kcat_code(Hi(cx)); k:=0; -+ begin KANJI(cx):=info(link(p)); i:=kcat_code(kcatcodekey(cx)); k:=0; - if (i=kanji)or(i=kana) then begin t:=q; s:=p; end; - p:=link(p); q:=p; - end -@@ -7573,13 +7521,13 @@ - kanji,kana,other_kchar: cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); - letter,other_char: begin ins_kp:=true; cur_l:=qi(0); end; - char_given: begin -- if (cur_chr>=0)and(cur_chr<256) then -+ if is_char_ascii(cur_chr) then - begin ins_kp:=true; cur_l:=qi(0); - end - else cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); - end; - char_num: begin scan_char_num; cur_chr:=cur_val; -- if (cur_chr>=0)and(cur_chr<256) then -+ if is_char_ascii(cur_chr) then - begin ins_kp:=true; cur_l:=qi(0); - end - else cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f)); -Index: ppltotf.ch -=================================================================== ---- ptex-src-3.1.11.orig/ppltotf.ch -+++ ptex-src-3.1.11/ppltotf.ch -@@ -15,9 +15,6 @@ - @y - @d banner=='This is Nihongo PLtoTF, Version 3.5-p1.8' - {printed when the program starts} --@d jis_enc==0 --@d euc_enc==1 --@d sjis_enc==2 - @z - - @x [6] l.140 - pTeX: -@@ -25,11 +22,7 @@ - @y - print_ln (version_string); - print ('process kanji code is '); -- case proc_kanji_code of -- jis_enc: print('jis'); -- euc_enc: print('euc'); -- sjis_enc: print('sjis'); -- end; -+ fputs(get_enc_string, stdout); - print_ln ('.'); - @z - -@@ -62,38 +55,12 @@ - {print the characters yet unseen} - @z - --@x [28] l.610 - pTeX: Read JIS kanji code. --@p procedure fill_buffer; --begin left_ln:=right_ln; limit:=0; loc:=0; --@y --@p procedure fill_buffer; --var @!c_a,@!c_b:byte; --@!cx:integer; --@!kmode:0..1; {|1| denotes in JIS kanji strings} --begin left_ln:=right_ln; limit:=0; loc:=0; kmode:=0; --@z -- - @x [28] l.619 - pTeX: - else begin while (limit<buf_size-1)and(not eoln(pl_file)) do - begin incr(limit); read(pl_file,buffer[limit]); - end; - @y --else begin kmode:=0; -- while (limit<buf_size-3)and(not eoln(pl_file)) do -- begin read(pl_file,c_a); -- if c_a=@'33 then @<Store JIS code characters to buffer@> -- else -- begin if kmode=0 then -- begin incr(limit); buffer[limit]:=c_a; -- end -- else begin read(pl_file,c_b); -- if (proc_kanji_code=sjis_enc) then cx:=JIStoSJIS(c_a*@'400+c_b) -- else cx:=JIStoEUC(c_a*@'400+c_b); -- incr(limit); buffer[limit]:=cx div @'400; -- incr(limit); buffer[limit]:=cx mod @'400; -- end; -- end; -- end; -+else begin limit:=input_line2(pl_file,buffer,limit+1,buf_size)-1; - @z - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -@@ -118,28 +85,6 @@ - the buffer, and check the indentation@>; - end; - end; -- --@ @<Store JIS code characters...@>= --begin read(pl_file,c_a); --if c_a='$' then begin read(pl_file,c_a); -- if (c_a='@@')or(c_a='B') then kmode:=1 { Kanji in } -- else begin incr(limit); buffer[limit]:=@'33; -- incr(limit); buffer[limit]:='$'; -- incr(limit); buffer[limit]:=c_a; -- end; -- end --else if c_a='(' then begin read(pl_file,c_a); -- if (c_a='J')or(c_a='B')or(c_a='H') then kmode:=0 { Kanji out } -- else begin incr(limit); buffer[limit]:=@'33; -- incr(limit); buffer[limit]:='('; -- incr(limit); buffer[limit]:=c_a; -- end; -- end --else begin -- incr(limit); buffer[limit]:=@'33; -- incr(limit); buffer[limit]:=c_a; -- end; --end - @z - - @x [36] l.754 - pTeX: May have to increase some numbers to fit new commands -@@ -427,7 +372,7 @@ - @z - @x - end else if argument_is ('version') then begin -- print_version_and_exit (banner, nil, 'D.E. Knuth'); -+ print_version_and_exit (banner, nil, 'D.E. Knuth', nil); - - end; {Else it was a flag; |getopt| has already done the assignment.} - until getopt_return_val = -1; -@@ -441,7 +386,7 @@ - end; {Else it was a flag; |getopt| has already done the assignment.} - until getopt_return_val = -1; - if (version_switch) then -- print_version_and_exit (banner, nil, 'D.E. Knuth'); -+ print_version_and_exit (banner, nil, 'D.E. Knuth', nil); - @z - - @x -@@ -702,7 +647,7 @@ - function get_next_raw:byte; {get next rawdata in buffer} - begin while loc=limit do fill_buffer; - incr(loc); get_next_raw:=buffer[loc]; --if iskanji1(buffer[loc]) then cur_char:=" " -+if multistrlen(buffer,loc+2,loc)=2 then cur_char:=" " - else cur_char:=xord[buffer[loc]]; - end; - @# -@@ -767,14 +712,13 @@ - incr(loc); ch:=xord[buffer[loc]]; cx:=cx+todig(ch)*@"100; - incr(loc); ch:=xord[buffer[loc]]; cx:=cx+todig(ch)*@"10; - incr(loc); ch:=xord[buffer[loc]]; cx:=cx+todig(ch); -- jis_code:=cx; cur_char:=ch; -+ jis_code:=toDVI(fromJIS(cx)); cur_char:=ch; - if not valid_jis_code(jis_code) then - err_print('jis code ', jis_code:1, ' is invalid'); - end --else if iskanji1(ch) then -- begin incr(loc); cx:=Lo(ch)*@'400+Lo(buffer[loc]); cur_char:=" "; -- if (proc_kanji_code=sjis_enc) then jis_code:=SJIStoJIS(cx) -- else jis_code:=EUCtoJIS(cx); -+else if multistrlen(buffer, loc+2, loc)=2 then -+ begin jis_code:=toDVI(fromBUFF(buffer, loc+2, loc)); -+ incr(loc); cur_char:=" "; - if not valid_jis_code(jis_code) then - err_print('jis code ', jis_code:1, ' is invalid'); - end -@@ -782,25 +726,9 @@ - get_kanji:=jis_code; - end; - --@ input kanji code. -- --@<Global...@> = --@!proc_kanji_code:jis_enc..sjis_enc; -- --@ @<Initialize the option...@> = --ifdef('OUTJIS') proc_kanji_code:=jis_enc; endif('OUTJIS'); --ifdef('OUTEUC') proc_kanji_code:=euc_enc; endif('OUTEUC'); --ifdef('OUTSJIS') proc_kanji_code:=sjis_enc; endif('OUTSJIS'); -- - @ @<Set process kanji code@>= -- if strcmp(optarg, 'jis') = 0 then -- proc_kanji_code:=jis_enc -- else if strcmp(optarg, 'euc') = 0 then -- proc_kanji_code:=euc_enc -- else if strcmp(optarg, 'sjis') = 0 then -- proc_kanji_code:=sjis_enc -- else -- print_ln('Bad kanjicode encoding', optarg, '.'); -+ if (not set_enc_string(optarg,optarg)) then -+ print_ln('Bad kanjicode encoding "', stringcast(optarg), '".'); - - @* Index. - @z -Index: ptftopl.ch -=================================================================== ---- ptex-src-3.1.11.orig/ptftopl.ch -+++ ptex-src-3.1.11/ptftopl.ch -@@ -10,13 +10,10 @@ - @z - - @x [2] l.64 - pTeX: --@d banner=='This is TFtoPL, Version 3.1' {printed when the program starts} -+@d banner=='This is TFtoPL, Version 3.2' {printed when the program starts} - @y - @d banner=='This is Nihongo TFtoPL, Version 3.2-p1.7' - {printed when the program starts} --@d jis_enc==0 --@d euc_enc==1 --@d sjis_enc==2 - @z - - @x [2] l.91 - pTeX: -@@ -37,11 +34,7 @@ - @y - print_ln (version_string); - print ('process kanji code is '); -- case proc_kanji_code of -- jis_enc: print('jis'); -- euc_enc: print('euc'); -- sjis_enc: print('sjis'); -- end; -+ print (stringcast(get_enc_string)); - print_ln('.'); - @z - -@@ -374,7 +367,7 @@ - @z - @x - end else if argument_is ('version') then begin -- print_version_and_exit (banner, nil, 'D.E. Knuth'); -+ print_version_and_exit (banner, nil, 'D.E. Knuth', nil); - @y - end else if argument_is ('version') then begin - version_switch := true; -@@ -389,7 +382,7 @@ - end; {Else it was a flag; |getopt| has already done the assignment.} - until getopt_return_val = -1; - if (version_switch) then -- print_version_and_exit (banner, nil, 'D.E. Knuth'); -+ print_version_and_exit (banner, nil, 'D.E. Knuth', nil); - @z - - @x -@@ -509,8 +502,7 @@ - end; - end - else begin -- if (proc_kanji_code=sjis_enc) then cx:=JIStoSJIS(jis_code) -- else cx:=JIStoEUC(jis_code); -+ cx:=toBUFF(fromDVI(jis_code)); - out(xchr[Hi(cx)]); out(xchr[Lo(cx)]); - end; - end; -@@ -549,23 +541,9 @@ - - @ output kanji code. - --@<Global...@> = --@!proc_kanji_code:jis_enc..sjis_enc; -- --@ @<Initialize the option...@> = --ifdef('OUTJIS') proc_kanji_code:=jis_enc; endif('OUTJIS')@/ --ifdef('OUTEUC') proc_kanji_code:=euc_enc; endif('OUTEUC')@/ --ifdef('OUTSJIS') proc_kanji_code:=sjis_enc; endif('OUTSJIS')@/ -- - @ @<Set process kanji code@>= -- if strcmp(optarg, 'jis') = 0 then -- proc_kanji_code:=jis_enc -- else if strcmp(optarg, 'euc') = 0 then -- proc_kanji_code:=euc_enc -- else if strcmp(optarg, 'sjis') = 0 then -- proc_kanji_code:=sjis_enc -- else -- print_ln('Bad kanjicode encoding', optarg, '.'); -+ if (not set_enc_string(optarg,optarg)) then -+ print_ln('Bad kanjicode encoding "', stringcast(optarg), '".'); - - @* Index. - @z -Index: kanji.h -=================================================================== ---- ptex-src-3.1.11.orig/kanji.h -+++ ptex-src-3.1.11/kanji.h -@@ -5,50 +5,31 @@ - #define KANJI_H - #include "cpascal.h" - #include "ptexhelp.h" -+#include <ptexenc/ptexenc.h> - - #define KANJI --#define JIS 0 --#define EUC 1 --#define SJIS 2 - --/* üËö¤Ë½ÐÎϤ¹¤ë´Á»ú¥³¡¼¥É¤ò EUC, JIS, SJIS ¤Î¤¤¤º¤ì¤«¤Ç»ØÄꤹ¤ë¡£*/ --#define TERM_CODE @TERMCODE@ -- --/* OUTJIS, OUTSJIS, OUTEUC ¤ÏüËö¤È¥í¥°¥Õ¥¡¥¤¥ë¤Ø¤Î½ÐÎÏ¥³¡¼¥É¤ò¼¨¤¹¡£*/ --#if TERM_CODE == JIS --#define OUTJIS --#elif TERM_CODE == SJIS --#define OUTSJIS --#else --#define OUTEUC --#endif -- - /* functions */ --#define Hi(X) ((X >> 8) & 0xff) --#define Lo(X) (X & 0xff) --#define PutHi(X,Y) X &= 0xff; (X |= (Y << 8)) --#define PutLo(X,Y) X &= 0xff00; (X |= (Y & 0xff)) -+#define Hi(x) (((x) >> 8) & 0xff) -+#define Lo(x) ((x) & 0xff) - --extern char prockanjicode; --extern boolean iskanji1(unsigned char); --extern boolean iskanji2(unsigned char); --extern boolean checkkanji(integer); --extern integer calcpos(integer); -+extern boolean check_kanji(integer c); -+#define checkkanji check_kanji -+extern boolean is_kanji(integer c); -+#define iskanji is_kanji -+extern boolean is_char_ascii(integer c); -+#define ischarascii is_char_ascii -+extern boolean is_wchar_ascii(integer c); -+#define iswcharascii is_wchar_ascii -+extern boolean ismultiprn(integer c); -+extern integer calc_pos(integer c); -+#define calcpos calc_pos -+extern integer kcatcodekey(integer c); - --extern integer EUCtoJIS(integer); --extern integer JIStoEUC(integer); --extern integer SJIStoJIS(integer); --extern integer JIStoSJIS(integer); --extern integer SJIStoEUC(integer); --extern integer EUCtoSJIS(integer); --extern integer KUTENtoEUC(integer); --extern integer KUTENtoSJIS(integer); -- --/* kanji.c *°Ê³°* ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤È¤¡¢putc ¤ÎÄêµÁ¤òÊѤ¨¤ë */ --#if !defined(KANJI_C) -+#ifndef PRESERVE_PUTC - #undef putc - #define putc(c,fp) putc2(c,fp) --#endif /* *not* KANJI_C */ -+#endif /* !PRESERVE_PUTC */ - - #ifdef TeX - #undef TEXMFPOOLNAME -@@ -64,13 +45,4 @@ - #define TEXMFENGINENAME "jmpost" - #endif /* MP */ - --#ifdef HAVE_SYS_PARAM_H --# include <sys/param.h> --#else --# include <limits.h> --#endif --#ifndef NOFILE --# define NOFILE OPEN_MAX --#endif -- - #endif /* not KANJI_H */ -Index: pbibtex.ch -=================================================================== ---- ptex-src-3.1.11.orig/pbibtex.ch -+++ ptex-src-3.1.11/pbibtex.ch -@@ -53,7 +53,7 @@ - @x - @d banner=='This is BibTeX, Version 0.99c' {printed when the program starts} - @y --@d banner=='This is JBibTeX, Version 0.99c-j0.33' -+@d banner=='This is pBibTeX, Version 0.99c-j0.33' - {printed when the program starts} - @z - -@@ -135,6 +135,9 @@ - initialize; - if verbose then begin - print (banner); -+ print (' ('); -+ print (stringcast(get_enc_string)); -+ print (')'); - print_ln (version_string); - end; - @z -@@ -480,8 +483,8 @@ - end; - get(f); - @y -- if (not input_line(f)) then -- buffer_overflow; -+ last := input_line3(f,buffer,last,buf_size); -+ if (last < 0) then buffer_overflow; - @z - - @x [48] Dynamically allocate str_pool. -@@ -629,10 +632,10 @@ - procedure get_the_top_level_aux_file_name; - label aux_found,@!aux_not_found; - begin -+ if (not set_enc_string (0,'EUC')) then uexit(1); - @<Process a possible command line@> - {Leave room for the \.., the extension, the junk byte at the - beginning, and the null byte at the end.} -- init_kanji; - name_of_file := xmalloc (strlen (cmdline (optind)) + 4 + 2); - strcpy (name_of_file + 1, cmdline (optind)); - aux_name_length := strlen (name_of_file + 1); -@@ -1487,13 +1490,13 @@ - {End of arguments; we exit the loop below.} ; - - end else if getopt_return_val = "?" then begin -- usage ('jbibtex'); -+ usage ('pbibtex'); - - end else if argument_is ('min-crossrefs') then begin - min_crossrefs := atoi (optarg); - - end else if argument_is ('help') then begin -- usage_help (JBIBTEX_HELP, nil); -+ usage_help (PBIBTEX_HELP, nil); - - end else if argument_is ('version') then begin - version_switch := true; -@@ -1504,13 +1507,13 @@ - end; {Else it was a flag; |getopt| has already done the assignment.} - until getopt_return_val = -1; - if (version_switch) then -- print_version_and_exit (banner, 'Oren Patashnik', nil); -+ print_version_and_exit (banner, 'Oren Patashnik', nil, nil); - - {Now |optind| is the index of first non-option on the command line. - We must have one remaining argument.} - if (optind + 1 <> argc) then begin -- write_ln (stderr, 'jbibtex: Need exactly one file argument.'); -- usage ('jbibtex'); -+ write_ln (stderr, 'pbibtex: Need exactly one file argument.'); -+ usage ('pbibtex'); - end; - end; - -@@ -1627,27 +1630,8 @@ - end; - exit:end; - --@ kanji code. -- --@d jis_enc==0 --@d euc_enc==1 --@d sjis_enc==2 -- --@ @<Glob...@>= --@!proc_kanji_code:jis_enc..sjis_enc; -- --@ @<Initialize the option...@> = --ifdef('OUTJIS') proc_kanji_code:=jis_enc; endif('OUTJIS')@/ --ifdef('OUTEUC') proc_kanji_code:=euc_enc; endif('OUTEUC')@/ --ifdef('OUTSJIS') proc_kanji_code:=sjis_enc; endif('OUTSJIS')@/ -- - @ @<Set process kanji code@>= -- if strcmp(optarg, 'jis') = 0 then -- proc_kanji_code:=jis_enc -- else if strcmp(optarg, 'euc') = 0 then -- proc_kanji_code:=euc_enc -- else if strcmp(optarg, 'sjis') = 0 then -- proc_kanji_code:=sjis_enc -- else -- print_ln('Bad kanjicode encoding', optarg, '.'); -+ if (not set_enc_string(optarg,0)) then begin -+ write_ln('Bad kanjicode encoding "', stringcast(optarg), '".'); -+ end; - @z -Index: ptex.mk -=================================================================== ---- ptex-src-3.1.11.orig/ptex.mk -+++ ptex-src-3.1.11/ptex.mk -@@ -1,24 +1,27 @@ --# Makefile fragment for e-TeX and web2c. --infovore@xs4all.nl. Public domain. -+# *ATTENTION* : This file is not used in TeX Live 2009. See am/ptex.am. -+# Makefile fragment for pTeX and web2c. -- tutimura(a)nn.iij4u.or.jp. Public domain. - # This fragment contains the parts of the makefile that are most likely to --# differ between releases of e-TeX. -+# differ between releases of pTeX and derived from e-TeX. - --Makefile: ptexdir/ptex.mk -+Makefile: $(srcdir)/ptexdir/ptex.mk - - # We build ptex. --ptex = @JPTEX@ ptex -+ptex = @JPTEX@ ptex pbibtex ptftopl ppltotf pdvitype - - # Extract ptex version --ptexdir/ptex.version: ptexdir/ptex.ch -- grep '^@d eTeX_version_string==' $(srcdir)/ptexdir/ptex.ch \ -- | sed "s/^.*'-//;s/'.*$$//" >ptexdir/ptex.version -+ptexdir/ptex.version: ptexdir/ptex-base.ch -+ grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \ -+ | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version - - # The C sources. - ptex_c = ptexini.c ptex0.c ptex1.c ptex2.c --ptex_o = ptexini.o ptex0.o ptex1.o ptex2.o ptex-pool.o ptexextra.o -+ptex_o = ptexini.o ptex0.o ptex1.o ptex2.o ptex-pool.o ptexextra.o ptexdir/kanji.o -+plib_o = ptexdir/printversion.o ptexdir/usage.o ptexdir/openclose.o -+plib = ptexdir/plib.a - - # Making ptex. --ptex: $(ptex_o) -- $(kpathsea_link) $(ptex_o) $(socketlibs) $(LOADLIBES) -+ptex: $(ptex_o) $(plib) $(ptexenc) -+ $(kpathsea_link) $(ptex_o) $(plib) $(ptexenc) $(socketlibs) $(LOADLIBES) - - # C file dependencies - $(ptex_c) ptexcoerce.h ptexd.h: ptex.p $(web2c_texmf) -@@ -27,8 +30,8 @@ - sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@ - ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version - test -d ptexdir || mkdir ptexdir -- sed s/ETEX-VERSION/`cat ptexdir/ptex.version`/ \ -- $(srcdir)/ptexdir/ptexextra.in >$@ -+ sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \ -+ $(srcdir)/ptexdir/ptexextra.in >$@ - - # Tangling - ptex.p ptex.pool: tangle ptex.web ptex.ch -@@ -37,17 +40,14 @@ - # Generation of the web and ch file. - # Sources for ptex.web: - ptex_web_srcs = $(srcdir)/tex.web \ -- $(srcdir)/ptexdir/ptex.ch \ -- $(srcdir)/ptexdir/ptex.fix -+ $(srcdir)/tex.ch - # Sources for ptex.ch: - ptex_ch_srcs = ptex.web \ -- $(srcdir)/ptexdir/tex.ch0 \ -- $(srcdir)/tex.ch \ -- $(srcdir)/ptexdir/tex.ch1 \ -- $(srcdir)/ptexdir/tex.ech \ -- $(srcdir)/ptexdir/ptex-binpool.ch -+ $(srcdir)/ptexdir/ptex-base.ch \ -+ $(srcdir)/ptexdir/ptex-include.ch \ -+ $(srcdir)/tex-binpool.ch - # Rules: --ptex.web: tie ptexdir/ptex.mk $(ptex_web_srcs) -+ptex.web: tie $(srcdir)/ptexdir/ptex.mk $(ptex_web_srcs) - $(TIE) -m ptex.web $(ptex_web_srcs) - ptex.ch: $(ptex_ch_srcs) - $(TIE) -c ptex.ch $(ptex_ch_srcs) -@@ -55,6 +55,71 @@ - ptex-pool.c: ptex.pool $(makecpool) tmf-pool.h - $(makecpool) ptex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ - -+$(plib): $(plib_o) -+ rm -f $@ -+ $(AR) $(ARFLAGS) $@ $(plib_o) -+ $(RANLIB) $@ -+ -+### pTFtoPL -+ptftopl: ptftopl.o $(plib) $(kpathsea) $(ptexenc) $(proglib) -+ $(kpathsea_link) ptftopl.o $(plib) $(ptexenc) $(LOADLIBES) -+ptftopl.o: ptftopl.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ptftopl.c: ptftopl.p $(web2c_aux) -+ $(web2c) ptftopl -+ptftopl.p: ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ $(tangle) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ptftopl.web: $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ $(TIE) -m ptftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ -+ -+### pPLtoTF -+ppltotf: ppltotf.o $(plib) $(kpathsea) $(ptexenc) $(proglib) -+ $(kpathsea_link) ppltotf.o $(plib) $(ptexenc) $(LOADLIBES) -+ppltotf.o: ppltotf.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ $(compile) -DPRESERVE_PUTC -c ppltotf.c -+ppltotf.c: ppltotf.p $(web2c_aux) -+ $(web2c) ppltotf -+ppltotf.p: tangle ppltotf.web $(srcdir)/ptexdir/ppltotf.ch -+ $(tangle) ppltotf.web $(srcdir)/ptexdir/ppltotf.ch -+ppltotf.web: $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ $(TIE) -m ppltotf.web $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ -+### pDVItype -+pdvitype: pdvitype.o $(plib) $(kpathsea) $(ptexenc) $(proglib) -+ $(kpathsea_link) pdvitype.o $(plib) $(ptexenc) $(LOADLIBES) -+pdvitype.o: pdvitype.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ $(compile) -DHEX_CHAR_CODE -c pdvitype.c -+pdvitype.c: pdvitype.p $(web2c_aux) -+ $(web2c) pdvitype -+pdvitype.p: tangle pdvitype.web $(srcdir)/ptexdir/pdvitype.ch -+ $(tangle) pdvitype.web $(srcdir)/ptexdir/pdvitype.ch -+pdvitype.web: $(srcdir)/dvitype.web -+ cat $(srcdir)/dvitype.web > $@ -+ -+### pBibTeX -+pbibtex: pbibtex.o $(plib_o) $(kpathsea) $(ptexenc) $(proglib) -+ $(kpathsea_link) pbibtex.o $(plib_o) $(ptexenc) $(LOADLIBES) -+pbibtex.o: pbibtex.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ -+pbibd.h: $(srcdir)/ptexdir/pbibd.sed pbibtex.c -+ sed -f $(srcdir)/ptexdir/pbibd.sed pbibtex.c > $@ -+ -+pbibtex.c pbibtex.h: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed pbibtex.p -+ $(web2c) pbibtex -+pbibtex.p: tangle pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+ $(tangle) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+pbibtex.web: $(srcdir)/bibtex.web -+ cat $(srcdir)/bibtex.web > $@ -+clean:: pbibtex-clean -+pbibtex-clean: -+ $(LIBTOOL) --mode=clean rm -f pbibtex -+ rm -f pbibtex.o pbibtex.c pbibtex.h pbibtex.p pbibd.h pbibtex.web -+ -+ -+# Additional dependencies for relinking. -+$(ptexenc): -+ cd $(ptexenc_dir) && $(MAKE) libptexenc.la -+ - # Tests... - check: @JPTEX@ ptex-check - ptex-check: etrip ptex.fmt -@@ -84,10 +149,14 @@ - # Cleaning up. - clean:: ptex-clean - ptex-clean: etrip-clean -- $(LIBTOOL) --mode=clean $(RM) ptex -+ $(LIBTOOL) --mode=clean $(RM) $(ptex) - rm -f $(ptex_o) $(ptex_c) ptexextra.c ptexcoerce.h ptexd.h - rm -f ptexdir/ptexextra.h ptexdir/ptex.version -- rm -f ptex.p ptex.pool ptex.web ptex.ch -+ rm -f ptexdir/kanji.o $(plib_o) $(plib) -+ rm -f ptex.p ptex.pool ptex.web ptex.ch ptex-pool.c -+ rm -f ptftopl.h ptftopl.c ptftopl.o ptftopl.web ptftopl.p -+ rm -f ppltotf.h ppltotf.c ppltotf.o ppltotf.web ppltotf.p -+ rm -f pdvitype.h pdvitype.c pdvitype.o pdvitype.web pdvitype.p - rm -f ptex.fmt ptex.log - rm -f hello.dvi hello.log xfoo.out openout.log one.two.log uno.log - rm -f just.log batch.log write18.log mltextst.log texput.log -@@ -95,11 +164,11 @@ - rm -rf tfm - - # etrip --etestdir = $(srcdir)/ptexdir/etrip --etestenv = TEXMFCNF=$(etestdir) -+ptestdir = $(srcdir)/ptexdir/etrip -+ptestenv = TEXMFCNF=$(etestdir) - - triptrap: @JPTEX@ etrip --etrip: pltotf tftopl ptex dvitype etrip-clean -+ptrip: pltotf tftopl ptex dvitype etrip-clean - @echo ">>> See $(etestdir)/etrip.diffs for example of acceptable diffs." >&2 - @echo "*** TRIP test for e-TeX in compatibility mode ***." - ./pltotf $(testdir)/trip.pl trip.tfm -@@ -141,7 +210,7 @@ - -$(DIFF) $(DIFFFLAGS) $(etestdir)/etrip.typ etrip.typ - - # Cleaning up for the etrip. --etrip-clean: -+ptrip-clean: - rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log - rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ - rm -f xtripin.fot xtripin.log -@@ -154,30 +223,30 @@ - # Distfiles ... - @MAINT@triptrapdiffs: ptexdir/etrip/etrip.diffs - @MAINT@ptexdir/etrip/etrip.diffs: ptex --@MAINT@ $(MAKE) etrip | tail +1 >ptexdir/etrip/etrip.diffs -+@MAINT@ $(MAKE) ptrip | tail +1 >ptexdir/etrip/etrip.diffs - - - # Dumps --all_efmts = ptex.fmt $(efmts) -+all_pfmts = ptex.fmt platex.fmt $(pfmts) - --dumps: @JPTEX@ efmts --efmts: $(all_efmts) -+dumps: @JPTEX@ pfmts -+pfmts: $(all_pfmts) - --efmtdir = $(web2cdir)/ptex --$(efmtdir):: -- $(SHELL) $(top_srcdir)/../mkinstalldirs $(efmtdir) -+pfmtdir = $(web2cdir)/ptex -+$(pfmtdir):: -+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(pfmtdir) - - ptex.fmt: ptex - $(dumpenv) $(MAKE) progname=ptex files="ptex.src plain.tex cmr10.tfm" prereq-check - $(dumpenv) ./ptex --progname=ptex --jobname=ptex --ini \*\\input ptex.src \\dump </dev/null - --elatex.fmt: ptex -- $(dumpenv) $(MAKE) progname=elatex files="latex.ltx" prereq-check -- $(dumpenv) ./ptex --progname=elatex --jobname=elatex --ini \*\\input latex.ltx </dev/null -+#pelatex.fmt: ptex -+# $(dumpenv) $(MAKE) progname=elatex files="latex.ltx" prereq-check -+# $(dumpenv) ./ptex --progname=elatex --jobname=elatex --ini \*\\input latex.ltx </dev/null - --latex.fmt: ptex -- $(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check -- $(dumpenv) ./ptex --progname=latex --jobname=latex --ini \*\\input latex.ltx </dev/null -+platex.fmt: ptex -+ $(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check -+ $(dumpenv) ./ptex --progname=platex --jobname=platex --ini \*\\input latex.ltx </dev/null - - #ctex.fmt: ptex - # $(dumpenv) $(MAKE) progname=ctex files="plain.tex cmr10.tfm" prereq-check -@@ -188,13 +257,18 @@ - # $(dumpenv) ./ptex --progname=olatex --progname=olatex --ini \\input latex.ltx </dev/null - - # --# Installation -- nothing by default, that is, we omit the --# install-programs target. We want to make ptex a symlink to pdftex, --# via texlinks. Leave this unused install-ptex* targets just to show --# that the real binary does get built and can be used if desired. -- -+# Installation. - install-ptex: install-ptex-exec --install-ptex-exec: ptex $(bindir) -- for p in ptex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -+install-programs: @JPTEX@ install-ptex-exec -+install-ptex-exec: $(ptex) $(bindir) -+ for p in $(ptex); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - -+install-fmts: @JPTEX@ install-ptex-fmts -+install-ptex-fmts: pfmts $(pfmtdir) -+ pfmts="$(all_pfmts)"; \ -+ for f in $$pfmts; do $(INSTALL_DATA) $$f $(pfmtdir)/$$f; done -+ pfmts="$(pfmts)"; \ -+ for f in $$pfmts; do base=`basename $$f .fmt`; \ -+ (cd $(bindir) && (rm -f $$base; $(LN) ptex $$base)); done -+ - # end of ptex.mk -Index: ptexextra.in -=================================================================== ---- ptex-src-3.1.11.orig/ptexextra.in -+++ ptex-src-3.1.11/ptexextra.in -@@ -1,4 +1,4 @@ --/* ptexextra.h: banner etc. for pTeX. -+/* ptexextra.in: banner etc. for pTeX. - - This is included by pTeX, from ptexextra.c - */ -@@ -20,7 +20,7 @@ - "-ipc-start as -ipc, and also start the server at the other end", - #endif /* IPC */ - "-jobname=STRING set the job name to STRING", -- "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis)", -+ "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)", - "-kpathsea-debug=NUMBER set path searching debugging flags according to", - " the bits of NUMBER", - "[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)", -@@ -42,7 +42,7 @@ - NULL - }; - --#define BANNER "This is pTeX, Version 3.141592-p3.1.11" -+#define BANNER "This is pTeX, Version 3.1415926-PTEX-VERSION" - #define COPYRIGHT_HOLDER "D.E. Knuth" - #define AUTHOR NULL - #define PROGRAM_HELP PTEXHELP -Index: ptex-include.ch -=================================================================== ---- ptex-src-3.1.11.orig/ptex-include.ch -+++ ptex-src-3.1.11/ptex-include.ch -@@ -0,0 +1,6 @@ -+@x [???] l.2600 - pTeX: -+@=#include "texmfmem.h";@> -+@y -+@=#include "texmfmem.h";@> -+@=#include "ptexdir/kanji.h";@> -+@z -Index: ptex.defines -=================================================================== ---- ptex-src-3.1.11.orig/ptex.defines -+++ ptex-src-3.1.11/ptex.defines -@@ -1,22 +1,32 @@ --{ defined at kanji.c, kanji.h } -+{ defined at kanji.c, kanji.h, ptexenc/ptexenc.h } - @define function Hi (); - @define function Lo (); --@define procedure PutHi (); --@define procedure PutLo (); - -+@define function getencstring; -+@define function setencstring (); -+ - @define function iskanji1 (); --@define function iskanji2 (); -+@define function multistrlen (); -+@define function fromBUFF (); -+@define function toBUFF (); -+ -+@define function fromDVI (); -+@define function toDVI (); -+@define function putc2 (); -+@define function inputline2 (); -+ -+@define function fromJIS (); -+@define function fromEUC (); -+@define function fromSJIS (); -+@define function fromKUTEN (); -+ - @define function checkkanji (); -+@define function iskanji (); -+@define function ischarascii (); -+@define function iswcharascii (); -+@define function ismultiprn (); - @define function calcpos (); --@define function EUCtoJIS (); --@define function JIStoEUC (); --@define function SJIStoEUC (); --@define function KUTENtoEUC (); --@define function SJIStoJIS (); --@define function JIStoSJIS (); --@define function EUCtoSJIS (); --@define function KUTENtoSJIS (); --@define function putc2 (); -+@define function kcatcodekey (); - - @define const PTEXTFTOPLHELP; - @define const PTEXPLTOTFHELP; -Index: pdvitype.ch -=================================================================== ---- ptex-src-3.1.11.orig/pdvitype.ch -+++ ptex-src-3.1.11/pdvitype.ch -@@ -613,31 +613,12 @@ - if c>=177 then text_buf[text_ptr]:=@'77 else text_buf[text_ptr]:=c; - end; - --@ declare kanji conversion function -- --@d jis_enc==0 --@d euc_enc==1 --@d sjis_enc==2 -- --@ @<Global...@> = --@!proc_kanji_code:jis_enc..sjis_enc; -- --@ @<Set init...@> = --ifdef('OUTJIS') proc_kanji_code:=jis_enc; endif('OUTJIS'); --ifdef('OUTEUC') proc_kanji_code:=euc_enc; endif('OUTEUC'); --ifdef('OUTSJIS') proc_kanji_code:=sjis_enc; endif('OUTSJIS'); -- - @ @p procedure out_kanji(c:integer); - begin - if text_ptr>=line_length-3 then flush_text; -- if (proc_kanji_code=sjis_enc) then begin -- c := JIStoSJIS(c); -- incr(text_ptr); text_buf[text_ptr]:= c div 256; -- incr(text_ptr); text_buf[text_ptr]:= c mod 256; -- end else begin -- incr(text_ptr); text_buf[text_ptr]:= c div 256 + 128; -- incr(text_ptr); text_buf[text_ptr]:= c mod 256 + 128; -- end; -+ c:=toBUFF(fromDVI(c)); -+ incr(text_ptr); text_buf[text_ptr]:= Hi(c); -+ incr(text_ptr); text_buf[text_ptr]:= Lo(c); - end; - - @ output hexdecimal / octal character code. -@@ -1021,7 +1002,7 @@ - usage_help (PDVITYPE_HELP, nil); - - end else if argument_is ('version') then begin -- print_version_and_exit (banner, nil, 'D.E. Knuth'); -+ print_version_and_exit (banner, nil, 'D.E. Knuth', nil); - - end else if argument_is ('output-level') then begin - out_mode := atou (optarg); -@@ -1042,6 +1023,11 @@ - end else if argument_is ('magnification') then begin - new_mag := atou (optarg); - -+ end else if argument_is ('kanji') then begin -+ if (not set_enc_string(optarg,optarg)) then begin -+ write_ln('Bad kanjicode encoding "', stringcast(optarg), '".'); -+ end; -+ - end; {Else it was a flag; |getopt| has already done the assignment.} - until getopt_return_val = -1; - -@@ -1168,6 +1154,16 @@ - incr (current_option); - new_mag := 0; {default is to keep the old one} - -+@ Decide kanji encode -+@.-kanji@> -+ -+@<Define the option...@> = -+long_options[current_option].name := 'kanji'; -+long_options[current_option].has_arg := 1; -+long_options[current_option].flag := 0; -+long_options[current_option].val := 0; -+incr (current_option); -+ - @ @<Glob...@> = - @!show_opcodes: c_int_type; - -Index: am/ptex.am -=================================================================== ---- ptex-src-3.1.11.orig/am/ptex.am -+++ ptex-src-3.1.11/am/ptex.am -@@ -5,24 +5,34 @@ - - ## pTeX - ## --if ETEX --bin_PROGRAMS += ptex --endif ETEX -+if PTEX -+bin_PROGRAMS += ptex pbibtex pdvitype ptftopl ppltotf -+endif PTEX - EXTRA_PROGRAMS += ptex - --ptex_CPPFLAGS = -+ptex_CPPFLAGS = $(PTEXENC_INCLUDES) - - # With --enable-ipc, pTeX may need to link with -lsocket. --ptex_LDADD = $(LDADD) $(ipc_socketlibs) -+ptex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs) -+pbibtex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+ptftopl_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+ppltotf_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+pdvitype_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) - -+SUBDIRS += ptexdir/lib -+pproglib = ptexdir/lib/lib.a -+# Rebuild $(pproglib) -+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c -+ cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS) -+ - # pTeX C sources - ptex_c_h = ptexini.c ptex0.c ptex1.c ptex2.c ptexcoerce.h ptexd.h --nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h -+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h ptexdir/kanji.c ptexdir/kanji.h - - $(ptex_c_h): ptex-web2c - ptex-web2c: ptex.p $(web2c_texmf) - $(web2c) ptex -- : $(synctex_convert_ptex) -+# : $(synctex_convert_ptex) - echo timestamp >$@ - touch $(ptex_c_h) - -@@ -33,7 +43,7 @@ - sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@ - - ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version -- sed s/ETEX-VERSION/`cat ptexdir/ptex.version`/ \ -+ sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \ - $(srcdir)/ptexdir/ptexextra.in >$@ - - # Tangling pTeX -@@ -44,30 +54,81 @@ - touch ptex.p ptex.pool - - # Extract ptex version --ptexdir/ptex.version: ptexdir/ptex.ch -- $(mkdir_p) ptexdir -- grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex.ch \ -- | sed "s/^.*'-//;s/'.*$$//" >ptexdir/ptex.version -+ptexdir/ptex.version: ptexdir/ptex-base.ch -+ $(mkdir_p) ptexdir/lib -+ grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \ -+ | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version - - # Generate ptex.web - ptex.web: tie$(EXEEXT) $(ptex_web_srcs) - $(tie) -m ptex.web $(ptex_web_srcs) - ptex_web_srcs = \ - tex.web \ -- ptexdir/ptex.ch \ -- ptexdir/ptex.fix -+ tex.ch - - # Generate ptex.ch - ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs) - $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs) - ptex_ch_srcs = \ -- ptexdir/tex.ch0 \ -- tex.ch \ - $(ptex_ch_synctex) \ -- ptexdir/tex.ch1 \ -- ptexdir/tex.ech \ -- ptexdir/ptex-binpool.ch --## -+ ptexdir/ptex-base.ch \ -+ ptexdir/ptex-include.ch \ -+ tex-binpool.ch -+ -+### pBibTeX -+nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h -+pbibtex.c pbibtex.h: pbibtex-web2c -+pbibtex.o: pbibtex.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+pbibtex-web2c: $(web2c_depend) web2c/cvtbib.sed pbibtex.p -+ $(web2c) pbibtex -+ echo timestamp >$@ -+ touch pbibtex.c pbibtex.h -+pbibtex.p: tangle$(EXEEXT) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+ $(tangle) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+pbibtex.web: $(srcdir)/bibtex.web -+ cat $(srcdir)/bibtex.web > $@ -+ -+### pDVItype -+nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h -+pdvitype_CPPFLAGS = -DDHEX_CHAR_CODE -+pdvitype.c pdvitype.h: pdvitype-web2c -+pdvitype.o: pdvitype.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+pdvitype-web2c: $(web2c_depend) pdvitype.p -+ $(web2c) pdvitype -+ echo timestamp >$@ -+ touch pdvitype.c pdvitype.h -+pdvitype.p: tangle$(EXEEXT) pdvitype.web $(srcdir)/ptexdir/pdvitype.ch -+ $(tangle) pdvitype $(srcdir)/ptexdir/pdvitype -+pdvitype.web: $(srcdir)/dvitype.web -+ cat $(srcdir)/dvitype.web > $@ -+ -+### pTFtoPL -+nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h -+ptftopl.c ptftopl.h: ptftopl-web2c -+ptftopl.o: ptftopl.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ptftopl-web2c: $(web2c_depend) ptftopl.p -+ $(web2c) ptftopl -+ echo timestamp >$@ -+ touch ptftopl.c ptftopl.h -+ptftopl.p: tangle$(EXEEXT) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ $(tangle) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ptftopl.web: tie$(EXEEXT) $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ $(tie) -m ptftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ -+### pPLtoTF -+nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h -+ppltotf_CPPFLAGS = -DPRESERVE_PUTC -+ppltotf.c ppltotf.h: ppltotf-web2c -+pppltotf.o: pppltotf.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ppltotf-web2c: $(web2c_depend) ppltotf.p -+ $(web2c) ppltotf -+ echo timestamp >$@ -+ touch ppltotf.c ppltotf.h -+ppltotf.p: tangle$(EXEEXT) ppltotf.web $(srcdir)/ptexdir/ppltotf.ch -+ $(tangle) ppltotf.web $(srcdir)/ptexdir/ppltotf -+ppltotf.web: tie$(EXEEXT) $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ $(tie) -m ppltotf.web $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ - EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptexextra.in \ - lib/texmfmp.c tmf-pool.h - -@@ -86,10 +147,10 @@ - - EXTRA_DIST += $(ptex_tests) - --if ETEX -+if PTEX - TESTS += $(ptex_tests) --check_PROGRAMS += dvitype pltotf tftopl --endif ETEX -+check_PROGRAMS += pdvitype ppltotf ptftopl -+endif PTEX - - .PHONY: ptrip-clean - clean-local:: ptrip-clean -Index: reautoconf -=================================================================== ---- ptex-src-3.1.11.orig/reautoconf -+++ ptex-src-3.1.11/reautoconf -@@ -0,0 +1,7 @@ -+#!/bin/sh -+ -+set -x -+LANG=C -+rm -rf ../autom4te.cache/ -+ -+(cd ../../../; ./reautoconf texk/web2c) - -Property changes on: reautoconf -___________________________________________________________________ -Added: svn:executable - + * - -Index: lib/Makefile.in -=================================================================== ---- ptex-src-3.1.11.orig/lib/Makefile.in -+++ ptex-src-3.1.11/lib/Makefile.in -@@ -0,0 +1,568 @@ -+# Makefile.in generated by automake 1.11 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+subdir = ptexdir/lib -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ -+ $(top_srcdir)/../../m4/kpse-common.m4 \ -+ $(top_srcdir)/../../m4/kpse-cross.m4 \ -+ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ -+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-graphite-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-lex.m4 \ -+ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ -+ $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ -+ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-warnings.m4 \ -+ $(top_srcdir)/../../m4/kpse-web2c.m4 \ -+ $(top_srcdir)/../../m4/kpse-win32.m4 \ -+ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \ -+ $(top_srcdir)/../../m4/libtool.m4 \ -+ $(top_srcdir)/../../m4/ltoptions.m4 \ -+ $(top_srcdir)/../../m4/ltsugar.m4 \ -+ $(top_srcdir)/../../m4/ltversion.m4 \ -+ $(top_srcdir)/../../m4/lt~obsolete.m4 \ -+ $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/../../build-aux/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/c-auto.h $(top_builddir)/ff-config.h -+CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = -+LIBRARIES = $(noinst_LIBRARIES) -+ARFLAGS = cru -+lib_a_AR = $(AR) $(ARFLAGS) -+lib_a_LIBADD = -+am_lib_a_OBJECTS = openclose.$(OBJEXT) printversion.$(OBJEXT) \ -+ usage.$(OBJEXT) -+lib_a_OBJECTS = $(am_lib_a_OBJECTS) -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp -+am__depfiles_maybe = depfiles -+am__mv = mv -f -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(lib_a_SOURCES) -+DIST_SOURCES = $(lib_a_SOURCES) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CTANGLE = @CTANGLE@ -+CTANGLEBOOT = @CTANGLEBOOT@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CXXLD = @CXXLD@ -+CXX_HACK_DEPS = @CXX_HACK_DEPS@ -+CXX_HACK_LIBS = @CXX_HACK_LIBS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ -+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@ -+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ -+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ -+FREETYPE2_LIBS = @FREETYPE2_LIBS@ -+FT2_CONFIG = @FT2_CONFIG@ -+GRAPHITE_DEPEND = @GRAPHITE_DEPEND@ -+GRAPHITE_INCLUDES = @GRAPHITE_INCLUDES@ -+GRAPHITE_LIBS = @GRAPHITE_LIBS@ -+GREP = @GREP@ -+ICU_DEPEND = @ICU_DEPEND@ -+ICU_INCLUDES = @ICU_INCLUDES@ -+ICU_LIBS = @ICU_LIBS@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@ -+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@ -+KPATHSEA_LIBS = @KPATHSEA_LIBS@ -+KPATHSEA_PATHS_H = @KPATHSEA_PATHS_H@ -+KPSEWHICH = @KPSEWHICH@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LEX = @LEX@ -+LEXLIB = @LEXLIB@ -+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -+LIBOBJS = @LIBOBJS@ -+LIBPNG_DEPEND = @LIBPNG_DEPEND@ -+LIBPNG_INCLUDES = @LIBPNG_INCLUDES@ -+LIBPNG_LIBS = @LIBPNG_LIBS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIPO = @LIPO@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+LUATANGLE = @LUATANGLE@ -+MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+OBSDCOMPAT_DEPEND = @OBSDCOMPAT_DEPEND@ -+OBSDCOMPAT_INCLUDES = @OBSDCOMPAT_INCLUDES@ -+OBSDCOMPAT_LIBS = @OBSDCOMPAT_LIBS@ -+OTANGLE = @OTANGLE@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ -+RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TANGLE = @TANGLE@ -+TANGLEBOOT = @TANGLEBOOT@ -+TECKIT_DEPEND = @TECKIT_DEPEND@ -+TECKIT_INCLUDES = @TECKIT_INCLUDES@ -+TECKIT_LIBS = @TECKIT_LIBS@ -+TIE = @TIE@ -+VERSION = @VERSION@ -+WARNING_CFLAGS = @WARNING_CFLAGS@ -+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@ -+WEB2CVERSION = @WEB2CVERSION@ -+XMKMF = @XMKMF@ -+XPDF_DEPEND = @XPDF_DEPEND@ -+XPDF_INCLUDES = @XPDF_INCLUDES@ -+XPDF_LIBS = @XPDF_LIBS@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+YACC = @YACC@ -+YFLAGS = @YFLAGS@ -+ZLIB_DEPEND = @ZLIB_DEPEND@ -+ZLIB_INCLUDES = @ZLIB_INCLUDES@ -+ZLIB_LIBS = @ZLIB_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+ipc_socketlibs = @ipc_socketlibs@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+lt_ECHO = @lt_ECHO@ -+lua_socketlibs = @lua_socketlibs@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+subdirs = @subdirs@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+wlibs = @wlibs@ -+x_ext_lib = @x_ext_lib@ -+x_tool_libs = @x_tool_libs@ -+INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -+AM_CFLAGS = $(WARNING_CFLAGS) -+noinst_LIBRARIES = lib.a -+lib_a_SOURCES = \ -+ openclose.c \ -+ printversion.c \ -+ usage.c -+ -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ptexdir/lib/Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign ptexdir/lib/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(am__aclocal_m4_deps): -+ -+clean-noinstLIBRARIES: -+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) -+ -rm -f lib.a -+ $(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD) -+ $(RANLIB) lib.a -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openclose.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printversion.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usage.Po@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ set x; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ else \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(LIBRARIES) -+installdirs: -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-am -+ -+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ -+ mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+html-am: -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: -+ -+install-dvi: install-dvi-am -+ -+install-dvi-am: -+ -+install-exec-am: -+ -+install-html: install-html-am -+ -+install-html-am: -+ -+install-info: install-info-am -+ -+install-info-am: -+ -+install-man: -+ -+install-pdf: install-pdf-am -+ -+install-pdf-am: -+ -+install-ps: install-ps-am -+ -+install-ps-am: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: -+ -+.MAKE: install-am install-strip -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-noinstLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am -+ -+ -+@KPATHSEA_RULE@ -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -Index: lib/printversion.c -=================================================================== ---- ptex-src-3.1.11.orig/lib/printversion.c -+++ ptex-src-3.1.11/lib/printversion.c -@@ -1,9 +1,11 @@ - /* printversion.c: Output for the standard GNU option --version. -+ Derived from ../../lib/printversion.c. - - Written in 1996 by Karl Berry. Public domain. */ - - #include "config.h" --#include "lib.h" -+#include "../../lib/lib.h" -+#include "../kanji.h" - - /* We're passed in the original WEB banner string, which has the form - This is PROGRAM, Version VERSION-NUMBER -@@ -32,14 +34,17 @@ - assert (prog_name_end && prog_version); - prog_version++; - -+ /* attention: strlen(s)+1 = sizeof(s) */ - len = prog_name_end - banner - sizeof ("This is"); - prog_name = (string)xmalloc (len + 1); - strncpy (prog_name, banner + sizeof ("This is"), len); - prog_name[len] = 0; - - /* The Web2c version string starts with a space. */ -- printf ("%s %s%s\n", prog_name, prog_version, versionstring); -+ printf ("%s %s (%s)%s\n", prog_name, prog_version, get_enc_string(), -+ versionstring); - puts (kpathsea_version_string); -+ puts (ptexenc_version_string); - - if (copyright_holder) { - printf ("Copyright 2009 %s.\n", copyright_holder); -@@ -59,5 +64,6 @@ - puts (extra_info); - } - -+ free (prog_name); /* lost in lib/printversion.c */ - uexit (0); - } -Index: lib/usage.c -=================================================================== ---- ptex-src-3.1.11.orig/lib/usage.c -+++ ptex-src-3.1.11/lib/usage.c -@@ -1,4 +1,5 @@ - /* usage.c: Output a help message (from help.h). -+ Derived from ../../lib/usage.c. - - Modified in 2001 by O. Weber. - Written in 1995 by K. Berry. Public domain. */ -@@ -25,7 +26,7 @@ - usagehelp (const_string *message, const_string bug_email) - { - if (!bug_email) -- bug_email = "tex-k@mail.tug.org"; -+ bug_email = "ptex-staff@ml.asciimw.jp"; - while (*message) { - printf("%s\n", *message); - ++message; -Index: lib/openclose.c -=================================================================== ---- ptex-src-3.1.11.orig/lib/openclose.c -+++ ptex-src-3.1.11/lib/openclose.c -@@ -1,18 +1,20 @@ - /* openclose.c: open and close files for TeX, Metafont, and BibTeX. -+ Derived from ../../lib/openclose.c. - - Written 1995, 96 Karl Berry. Public domain. */ - - #include "config.h" --#include "lib.h" -+#include "../../lib/lib.h" - #include <kpathsea/c-pathch.h> - #include <kpathsea/tex-file.h> - #include <kpathsea/variable.h> - #include <kpathsea/absolute.h> -+#include <ptexenc/ptexenc.h> - - /* The globals we use to communicate. */ - extern string nameoffile; - extern unsigned namelength; --/* For "file:line:error style error messages. */ -+/* For "file:line:error" style error messages. */ - extern string fullnameoffile; - /* For the filename recorder. */ - extern boolean recorder_enabled; -@@ -186,7 +188,12 @@ - free (fname); - - /* This fopen is not allowed to fail. */ -+ if (filefmt == kpse_tex_format || -+ filefmt == kpse_bib_format) { -+ *f_ptr = nkf_open (nameoffile + 1, fopen_mode); -+ } else { - *f_ptr = xfopen (nameoffile + 1, fopen_mode); -+ } - } - } - } -@@ -270,7 +277,7 @@ - if (!f) - return; - -- if (fclose (f) == EOF) { -+ if (nkf_close (f) == EOF) { - /* It's not always nameoffile, we might have opened something else - in the meantime. And it's not easy to extract the filenames out - of the pool array. So just punt on the filename. Sigh. This -Index: lib/Makefile.am -=================================================================== ---- ptex-src-3.1.11.orig/lib/Makefile.am -+++ ptex-src-3.1.11/lib/Makefile.am -@@ -0,0 +1,19 @@ -+## Makefile.am for the TeX Live subdirectory texk/web2c/ptexdir/lib/ -+## -+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -+## You may freely use, modify and/or distribute this file. -+## -+INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -+AM_CFLAGS = $(WARNING_CFLAGS) -+ -+## Rebuild libkpathsea -+@KPATHSEA_RULE@ -+ -+noinst_LIBRARIES = lib.a -+ -+## We don't compile `texmfmp.c'; this file is converted into 'texextra.c' -+## for TeX, 'mfextra.c' for Metafont, 'mfextra.c' for MetaPost, ... -+lib_a_SOURCES = \ -+ openclose.c \ -+ printversion.c \ -+ usage.c -Index: pbibtex.defines -=================================================================== ---- ptex-src-3.1.11.orig/pbibtex.defines -+++ ptex-src-3.1.11/pbibtex.defines -@@ -1,3 +1,4 @@ --@define function inputline(); --@define procedure initkanji; --@define const JBIBTEXHELP; -+@define function inputline3(); -+@define const PBIBTEXHELP; -+@define function getencstring; -+@define function setencstring (); -Index: kanji.c -=================================================================== ---- ptex-src-3.1.11.orig/kanji.c -+++ ptex-src-3.1.11/kanji.c -@@ -1,48 +1,50 @@ - /* - * KANJI Code conversion routines. -+ * (for ptex only) - */ - --#define KANJI_C - #include "kanji.h" - --boolean iskanji1(c) -- unsigned char c; -+/* FIXME: why not boolean value */ -+boolean check_kanji(integer c) - { -- c &= 0xff; -- if (prockanjicode == SJIS) -- return((c>=0x81 && c<=0x9f) || (c>=0xe0 && c<=0xfc)); -- else -- return(c>=0xa1 && c<=0xfe); -+ /* FIXME: why not 255 (0xff) */ -+ if (0 <= c && c <= 256) return -1; /* ascii without catcode */ -+ if (iskanji1(Hi(c)) && iskanji2(Lo(c))) return 1; -+ return 0; /* ascii with catcode */ - } - --boolean iskanji2(c) -- unsigned char c; -+boolean is_kanji(integer c) - { -- c &= 0xff; -- if (prockanjicode == SJIS) -- return(c>=0x40 && c<=0xfc && c!=0x7f); -- else -- return(c>=0xa1 && c<=0xfe); -+ return (iskanji1(Hi(c)) && iskanji2(Lo(c))); - } - --boolean checkkanji(c) -- integer c; -+boolean is_char_ascii(integer c) - { -- if(c<0 || c>256) -- return(iskanji1(c>>8) && iskanji2(c & 0xff)); -- return(-1); -+ return (0 <= c && c < 0x100); - } - -+boolean is_wchar_ascii(integer c) -+{ -+ return (!is_char_ascii(c) && !is_kanji(c)); -+} -+ -+boolean ismultiprn(integer c) -+{ -+ if (iskanji1(c) || iskanji2(c)) return true; -+ return false; -+} -+ - #ifdef OLDSTYLE --integer calcpos(c) -+integer calc_pos(integer c) - { -- register int c1, c2; -+ int c1, c2; - - if(c<256) return(c<<1); - c1 = c>>8; - c2 = c & 0xff; - if(c1) { -- if (prockanjicode == SJIS) -+ if (is_internalSJIS()) - return((c2+(c2<<(c1-0x81)) & 0xff)<<1); - else - return((c2+(c2<<(c1-0xa1)) & 0xff)<<1); -@@ -50,17 +52,15 @@ - return(((c2+c2+1) & 0xff)<<1); - } - #else /* OLDSTYLE */ --integer calcpos(c) -- integer c; -+integer calc_pos(integer c) - { -- register unsigned char c1, c2; -- integer ret; -+ unsigned char c1, c2; - - if(c>=0 && c<=255) return(c); - c1 = (c >> 8) & 0xff; - c2 = c & 0xff; - if(iskanji1(c1)) { -- if (prockanjicode == SJIS) { -+ if (is_internalSJIS()) { - c1 = ((c1 - 0x81) % 4) * 64; /* c1 = 0, 64, 128, 192 */ - c2 = c2 % 64; /* c2 = 0..63 */ - } else { -@@ -73,161 +73,7 @@ - } - #endif /* OLDSTYLE */ - --/* -- * EUC to JIS X0208 code conversion -- */ --integer EUCtoJIS(kcode) -- integer kcode; -+integer kcatcodekey(integer c) - { -- return(kcode & 0x7f7f); -+ return Hi(toDVI(c)); - } -- --/* -- * JIS X0208 to EUC code conversion -- */ --integer JIStoEUC(kcode) -- integer kcode; --{ -- return(kcode | 0x8080); --} -- --/* -- * SJIStoJIS : Shift JIS to JIS Kanji code conversion -- */ --integer SJIStoJIS(kcode) -- integer kcode; --{ -- register short byte1, byte2; -- -- byte1 = (kcode>>8) & 0xff; -- byte2 = kcode & 0xff; -- byte1 -= ( byte1>=0xa0 ) ? 0xc1 : 0x81; -- kcode = ((byte1<<1) + 0x21)<<8; -- if( byte2>=0x9f ) { -- kcode += 0x0100; -- kcode |= (byte2 - 0x7e) & 0xff; -- } else { -- kcode |= (byte2 - ((byte2<=0x7e) ? 0x1f : 0x20 )) & 0xff; -- } -- return(kcode); --} -- --/* -- * JIS X0208 to Shift JIS code conversion -- */ --integer JIStoSJIS(kcode) -- integer kcode; --{ -- register integer high, low; -- register integer nh, nl; -- -- high = (kcode>>8) & 0xff; -- low = kcode & 0xff; -- nh = ((high-0x21)>>1) + 0x81; -- if (nh>0x9f) nh += 0x40; -- if (high & 1) { -- nl = low + 0x1f; -- if (low>0x5f) nl++; -- } else -- nl = low + 0x7e; -- if(iskanji1(nh) && iskanji2(nl)) -- return((nh<<8) | nl); -- else -- return(0x813f); --} -- --/* -- * Shift JIS to EUC Kanji code conversion -- */ --integer SJIStoEUC(kcode) -- integer kcode; --{ -- return(SJIStoJIS(kcode) | 0x8080 ); --} -- --/* -- * EUC to SJIS Kanji code conversion -- */ --integer EUCtoSJIS(kcode) -- integer kcode; --{ -- return(JIStoSJIS(kcode & 0x7f7f)); --} -- --/* -- * KUTEN to JIS kanji code conversion -- */ --integer kuten2jis(kcode) -- integer kcode; --{ -- register short byte1, byte2; -- -- byte1 = (kcode>>8) & 0xff; -- byte2 = kcode & 0xff; -- -- /* in case of undefined in kuten code table */ -- if (byte1 == 0 || byte1 > 95 || byte2 == 0 || byte2 > 95) -- return(-1); -- -- byte1 += 0x20; -- byte2 += 0x20; -- -- return (byte1<<8 | byte2); --} -- --/* -- * KUTEN to EUC Kanji code conversion -- */ --integer KUTENtoEUC(kcode) -- integer kcode; --{ -- return(JIStoEUC(kuten2jis(kcode))); --} -- --/* -- * KUTENtoSJIS Kanji code conversion -- */ --integer KUTENtoSJIS(kcode) -- integer kcode; --{ -- return(JIStoSJIS(kuten2jis(kcode))); --} -- --void putc2(c, fp) -- unsigned char c; -- FILE *fp; --{ -- static integer kanji[NOFILE]; -- static unsigned char c1[NOFILE]; -- integer jc; -- register fd; -- -- fd = fileno(fp); -- if (kanji[fd] == 1) { -- jc = (c1[fd] << 8) | c; -- if (prockanjicode == JIS) jc = EUCtoJIS(jc); -- (void) putc(jc >> 8, fp); -- (void) putc(jc & 0xff, fp); -- kanji[fd] = 2; -- } else if (iskanji1(c)) { -- if (kanji[fd] == 0) { -- if (prockanjicode == JIS) { -- (void) putc('\033', fp); -- (void) putc('$', fp); -- (void) putc('B', fp); -- } -- } -- c1[fd] = c; -- kanji[fd] = 1; -- } else { -- if (kanji[fd] == 2) { -- if (prockanjicode == JIS) { -- (void) putc('\033', fp); -- (void) putc('(', fp); -- (void) putc('B', fp); -- } -- kanji[fd] = 0; -- } -- (void) putc(c, fp); -- } --} diff --git a/Build/source/texk/ptexenc/patches/texlive2009-ptexenc.patch b/Build/source/texk/ptexenc/patches/texlive2009-ptexenc.patch deleted file mode 100644 index 6b24f037d15..00000000000 --- a/Build/source/texk/ptexenc/patches/texlive2009-ptexenc.patch +++ /dev/null @@ -1,2428 +0,0 @@ -Index: m4/kpse-ptexenc-flags.m4 -=================================================================== ---- texlive-20091011-source.orig/m4/kpse-ptexenc-flags.m4 -+++ texlive-20091011-source/m4/kpse-ptexenc-flags.m4 -@@ -0,0 +1,30 @@ -+# Public macros for the TeX Live (TL) tree. -+# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -+# -+# This file is free software; the copyright holder -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 0 -+ -+# KPSE_PTEXENC_FLAGS -+# ------------------- -+# Provide the configure options '--with-system-ptexenc' (if in the TL tree), -+# '--with-ptexenc-includes', and '--with-ptexenc-libdir'. -+# -+# Set the make variables PTEXENC_INCLUDES and PTEXENC_LIBS to the CPPFLAGS and -+# LIBS required for the `-lptexenc' library in texk/ptexenc/ of the TL tree. -+AC_DEFUN([KPSE_PTEXENC_FLAGS], -+[_KPSE_LIB_FLAGS([ptexenc], [ptexenc], [tree], -+ [-IBLD/texk -ISRC/texk], [BLD/texk/ptexenc/libptexenc.la], [], -+ [${top_srcdir}/../ptexenc/*.[ch]], -+ [${top_builddir}/../ptexenc/ptexenc.h])[]dnl -+]) # KPSE_PTEXENC_FLAGS -+ -+# KPSE_PTEXENC_OPTIONS([WITH-SYSTEM]) -+# ------------------------------------ -+AC_DEFUN([KPSE_PTEXENC_OPTIONS], [_KPSE_LIB_OPTIONS([ptexenc], [$1])]) -+ -+# KPSE_PTEXENC_SYSTEM_FLAGS -+# -------------------------- -+AC_DEFUN([KPSE_PTEXENC_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([ptexenc], [ptexenc])]) -Index: m4/kpse-pkgs.m4 -=================================================================== ---- texlive-20091011-source.orig/m4/kpse-pkgs.m4 -+++ texlive-20091011-source/m4/kpse-pkgs.m4 -@@ -72,6 +72,7 @@ - # excluding 'texk/kpathsea'. - AC_DEFUN([KPSE_TEXK_PKGS], - [m4_define([kpse_texk_pkgs], [ -+ptexenc - web2c - afm2pl - bibtex8 -@@ -90,8 +91,12 @@ - lacheck - lcdf-typetools - makeindexk -+makejvf -+mendexk - musixflx -+pdvipsk - ps2pkm -+pxdvik - seetexk - tex4htk - ttf2pk -Index: configure -=================================================================== ---- texlive-20091011-source.orig/configure -+++ texlive-20091011-source/configure -@@ -945,6 +945,7 @@ - enable_omfonts - enable_tex - enable_etex -+enable_ptex - enable_aleph - enable_pdftex - enable_luatex -@@ -994,6 +995,8 @@ - enable_ttftotype42 - enable_updmap - enable_makeindexk -+enable_makejvf -+enable_mendexk - enable_musixflx - enable_ps2pkm - enable_seetexk -@@ -1729,6 +1732,7 @@ - versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX -+ --disable-ptex do not compile and install pTeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX -@@ -1780,6 +1784,8 @@ - --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm - --disable-auto-updmap disable running updmap from otftotfm - --disable-makeindexk do not build the makeindexk package -+ --disable-makejvf do not build the makejvf package -+ --disable-mendexk do not build the mendexk package - --disable-musixflx do not build the musixflx package - --disable-ps2pkm do not build the ps2pkm package - --disable-seetexk do not build the seetexk package -@@ -2691,6 +2697,10 @@ - - - -+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ -+## configure options and TL libraries required for ptexenc -+ -+ - ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ - ## configure options and TL libraries required for web2c - # Check whether --enable-web2c was given. -@@ -2755,6 +2765,18 @@ - yes|no) : ;; - *) enable_etex=no ;; - esac -+# Check whether --enable-ptex was given. -+if test "${enable_ptex+set}" = set; then -+ enableval=$enable_ptex; -+fi -+case $enable_ptex in -+ yes|no) : ;; -+ *) enable_ptex=yes ;; -+esac -+ -+test "x$enable_web2c:$enable_ptex" = xyes:yes && { -+ need_ptexenc=yes -+} - # Check whether --enable-aleph was given. - if test "${enable_aleph+set}" = set; then - enableval=$enable_aleph; -@@ -3269,6 +3291,46 @@ - } - - -+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-makejvf was given. -+if test "${enable_makejvf+set}" = set; then -+ enableval=$enable_makejvf; -+fi -+case $enable_makejvf in #( -+ yes|no);; #( -+ *) enable_makejvf=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-makejvf=$enable_makejvf'" >&5 -+$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'";; -+esac -+ -+test "x$enable_makejvf" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ -+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-mendexk was given. -+if test "${enable_mendexk+set}" = set; then -+ enableval=$enable_mendexk; -+fi -+case $enable_mendexk in #( -+ yes|no);; #( -+ *) enable_mendexk=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-mendexk=$enable_mendexk'" >&5 -+$as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'";; -+esac -+ -+test "x$enable_mendexk" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ - ## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ - ## configure options and TL libraries required for musixflx - # Check whether --enable-musixflx was given. -@@ -3284,6 +3346,7 @@ - esac - - -+ - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ - ## configure options and TL libraries required for ps2pkm - # Check whether --enable-ps2pkm was given. -@@ -3303,6 +3366,7 @@ - } - - -+ - ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ - ## configure options and TL libraries required for seetexk - # Check whether --enable-seetexk was given. -@@ -6203,13 +6267,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6206: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6270: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6209: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6273: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6212: output\"" >&5) -+ (eval echo "\"\$as_me:6276: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -7415,7 +7479,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 7418 "configure"' > conftest.$ac_ext -+ echo '#line 7482 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -9376,11 +9440,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9379: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9443: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9383: \$? = $ac_status" >&5 -+ echo "$as_me:9447: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9715,11 +9779,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9718: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9782: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9722: \$? = $ac_status" >&5 -+ echo "$as_me:9786: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -9820,11 +9884,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9823: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9887: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9827: \$? = $ac_status" >&5 -+ echo "$as_me:9891: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -9875,11 +9939,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9878: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9942: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9882: \$? = $ac_status" >&5 -+ echo "$as_me:9946: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12675,7 +12739,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12678 "configure" -+#line 12742 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -12771,7 +12835,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12774 "configure" -+#line 12838 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -19271,11 +19335,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:19274: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19338: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:19278: \$? = $ac_status" >&5 -+ echo "$as_me:19342: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -19370,11 +19434,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:19373: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19437: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:19377: \$? = $ac_status" >&5 -+ echo "$as_me:19441: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -19422,11 +19486,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:19425: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19489: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:19429: \$? = $ac_status" >&5 -+ echo "$as_me:19493: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -Index: Makefile.in -=================================================================== ---- texlive-20091011-source.orig/Makefile.in -+++ texlive-20091011-source/Makefile.in -@@ -68,6 +68,7 @@ - $(top_srcdir)/utils/vlna/ac/withenable.ac \ - $(top_srcdir)/utils/xindy/ac/withenable.ac \ - $(top_srcdir)/utils/xindy/ac/xindy.ac \ -+ $(top_srcdir)/texk/ptexenc/ac/withenable.ac \ - $(top_srcdir)/texk/web2c/ac/withenable.ac \ - $(top_srcdir)/texk/web2c/ac/web2c.ac \ - $(top_srcdir)/texk/afm2pl/ac/withenable.ac \ -@@ -89,6 +90,8 @@ - $(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \ - $(top_srcdir)/texk/lcdf-typetools/ac/lcdf-typetools.ac \ - $(top_srcdir)/texk/makeindexk/ac/withenable.ac \ -+ $(top_srcdir)/texk/makejvf/ac/withenable.ac \ -+ $(top_srcdir)/texk/mendexk/ac/withenable.ac \ - $(top_srcdir)/texk/musixflx/ac/withenable.ac \ - $(top_srcdir)/texk/ps2pkm/ac/withenable.ac \ - $(top_srcdir)/texk/seetexk/ac/withenable.ac \ -Index: libs/configure -=================================================================== ---- texlive-20091011-source.orig/libs/configure -+++ texlive-20091011-source/libs/configure -@@ -706,6 +706,7 @@ - enable_omfonts - enable_tex - enable_etex -+enable_ptex - enable_aleph - enable_pdftex - enable_luatex -@@ -755,6 +756,8 @@ - enable_ttftotype42 - enable_updmap - enable_makeindexk -+enable_makejvf -+enable_mendexk - enable_musixflx - enable_ps2pkm - enable_seetexk -@@ -1475,6 +1478,7 @@ - versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX -+ --disable-ptex do not compile and install pTeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX -@@ -1526,6 +1530,8 @@ - --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm - --disable-auto-updmap disable running updmap from otftotfm - --disable-makeindexk do not build the makeindexk package -+ --disable-makejvf do not build the makejvf package -+ --disable-mendexk do not build the mendexk package - --disable-musixflx do not build the musixflx package - --disable-ps2pkm do not build the ps2pkm package - --disable-seetexk do not build the seetexk package -@@ -2404,6 +2410,10 @@ - - - -+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ -+## configure options and TL libraries required for ptexenc -+ -+ - ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ - ## configure options and TL libraries required for web2c - # Check whether --enable-web2c was given. -@@ -2468,6 +2478,18 @@ - yes|no) : ;; - *) enable_etex=no ;; - esac -+# Check whether --enable-ptex was given. -+if test "${enable_ptex+set}" = set; then -+ enableval=$enable_ptex; -+fi -+case $enable_ptex in -+ yes|no) : ;; -+ *) enable_ptex=yes ;; -+esac -+ -+test "x$enable_web2c:$enable_ptex" = xyes:yes && { -+ need_ptexenc=yes -+} - # Check whether --enable-aleph was given. - if test "${enable_aleph+set}" = set; then - enableval=$enable_aleph; -@@ -2982,6 +3004,46 @@ - } - - -+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-makejvf was given. -+if test "${enable_makejvf+set}" = set; then -+ enableval=$enable_makejvf; -+fi -+case $enable_makejvf in #( -+ yes|no);; #( -+ *) enable_makejvf=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-makejvf=$enable_makejvf'" >&5 -+$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'";; -+esac -+ -+test "x$enable_makejvf" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ -+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-mendexk was given. -+if test "${enable_mendexk+set}" = set; then -+ enableval=$enable_mendexk; -+fi -+case $enable_mendexk in #( -+ yes|no);; #( -+ *) enable_mendexk=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-mendexk=$enable_mendexk'" >&5 -+$as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'";; -+esac -+ -+test "x$enable_mendexk" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ - ## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ - ## configure options and TL libraries required for musixflx - # Check whether --enable-musixflx was given. -@@ -2997,6 +3059,7 @@ - esac - - -+ - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ - ## configure options and TL libraries required for ps2pkm - # Check whether --enable-ps2pkm was given. -@@ -3016,6 +3079,7 @@ - } - - -+ - ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ - ## configure options and TL libraries required for seetexk - # Check whether --enable-seetexk was given. -Index: libs/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/libs/Makefile.in -+++ texlive-20091011-source/libs/Makefile.in -@@ -73,6 +73,7 @@ - $(top_srcdir)/../utils/vlna/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/xindy.ac \ -+ $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/web2c.ac \ - $(top_srcdir)/../texk/afm2pl/ac/withenable.ac \ -@@ -94,6 +95,8 @@ - $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ - $(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \ - $(top_srcdir)/../texk/makeindexk/ac/withenable.ac \ -+ $(top_srcdir)/../texk/makejvf/ac/withenable.ac \ -+ $(top_srcdir)/../texk/mendexk/ac/withenable.ac \ - $(top_srcdir)/../texk/musixflx/ac/withenable.ac \ - $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \ - $(top_srcdir)/../texk/seetexk/ac/withenable.ac \ -Index: utils/configure -=================================================================== ---- texlive-20091011-source.orig/utils/configure -+++ texlive-20091011-source/utils/configure -@@ -706,6 +706,7 @@ - enable_omfonts - enable_tex - enable_etex -+enable_ptex - enable_aleph - enable_pdftex - enable_luatex -@@ -755,6 +756,8 @@ - enable_ttftotype42 - enable_updmap - enable_makeindexk -+enable_makejvf -+enable_mendexk - enable_musixflx - enable_ps2pkm - enable_seetexk -@@ -1472,6 +1475,7 @@ - versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX -+ --disable-ptex do not compile and install pTeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX -@@ -1523,6 +1527,8 @@ - --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm - --disable-auto-updmap disable running updmap from otftotfm - --disable-makeindexk do not build the makeindexk package -+ --disable-makejvf do not build the makejvf package -+ --disable-mendexk do not build the mendexk package - --disable-musixflx do not build the musixflx package - --disable-ps2pkm do not build the ps2pkm package - --disable-seetexk do not build the seetexk package -@@ -2401,6 +2407,10 @@ - - - -+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ -+## configure options and TL libraries required for ptexenc -+ -+ - ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ - ## configure options and TL libraries required for web2c - # Check whether --enable-web2c was given. -@@ -2465,6 +2475,18 @@ - yes|no) : ;; - *) enable_etex=no ;; - esac -+# Check whether --enable-ptex was given. -+if test "${enable_ptex+set}" = set; then -+ enableval=$enable_ptex; -+fi -+case $enable_ptex in -+ yes|no) : ;; -+ *) enable_ptex=yes ;; -+esac -+ -+test "x$enable_web2c:$enable_ptex" = xyes:yes && { -+ need_ptexenc=yes -+} - # Check whether --enable-aleph was given. - if test "${enable_aleph+set}" = set; then - enableval=$enable_aleph; -@@ -2979,6 +3001,46 @@ - } - - -+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-makejvf was given. -+if test "${enable_makejvf+set}" = set; then -+ enableval=$enable_makejvf; -+fi -+case $enable_makejvf in #( -+ yes|no);; #( -+ *) enable_makejvf=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-makejvf=$enable_makejvf'" >&5 -+$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'";; -+esac -+ -+test "x$enable_makejvf" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ -+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-mendexk was given. -+if test "${enable_mendexk+set}" = set; then -+ enableval=$enable_mendexk; -+fi -+case $enable_mendexk in #( -+ yes|no);; #( -+ *) enable_mendexk=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-mendexk=$enable_mendexk'" >&5 -+$as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'";; -+esac -+ -+test "x$enable_mendexk" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ - ## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ - ## configure options and TL libraries required for musixflx - # Check whether --enable-musixflx was given. -@@ -2994,6 +3056,7 @@ - esac - - -+ - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ - ## configure options and TL libraries required for ps2pkm - # Check whether --enable-ps2pkm was given. -@@ -3013,6 +3076,7 @@ - } - - -+ - ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ - ## configure options and TL libraries required for seetexk - # Check whether --enable-seetexk was given. -Index: utils/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/utils/Makefile.in -+++ texlive-20091011-source/utils/Makefile.in -@@ -73,6 +73,7 @@ - $(top_srcdir)/../utils/vlna/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/xindy.ac \ -+ $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/web2c.ac \ - $(top_srcdir)/../texk/afm2pl/ac/withenable.ac \ -@@ -94,6 +95,8 @@ - $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ - $(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \ - $(top_srcdir)/../texk/makeindexk/ac/withenable.ac \ -+ $(top_srcdir)/../texk/makejvf/ac/withenable.ac \ -+ $(top_srcdir)/../texk/mendexk/ac/withenable.ac \ - $(top_srcdir)/../texk/musixflx/ac/withenable.ac \ - $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \ - $(top_srcdir)/../texk/seetexk/ac/withenable.ac \ -Index: texk/configure -=================================================================== ---- texlive-20091011-source.orig/texk/configure -+++ texlive-20091011-source/texk/configure -@@ -706,6 +706,7 @@ - enable_omfonts - enable_tex - enable_etex -+enable_ptex - enable_aleph - enable_pdftex - enable_luatex -@@ -755,6 +756,8 @@ - enable_ttftotype42 - enable_updmap - enable_makeindexk -+enable_makejvf -+enable_mendexk - enable_musixflx - enable_ps2pkm - enable_seetexk -@@ -807,6 +810,7 @@ - host_alias - target_alias' - ac_subdirs_all='dummy -+ptexenc - web2c - afm2pl - bibtex8 -@@ -825,8 +829,12 @@ - lacheck - lcdf-typetools - makeindexk -+makejvf -+mendexk - musixflx -+pdvipsk - ps2pkm -+pxdvik - seetexk - tex4htk - ttf2pk -@@ -1493,6 +1501,7 @@ - versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX -+ --disable-ptex do not compile and install pTeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX -@@ -1544,6 +1553,8 @@ - --disable-auto-t1dotlessj disable running t1dotlessj from otftotfm - --disable-auto-updmap disable running updmap from otftotfm - --disable-makeindexk do not build the makeindexk package -+ --disable-makejvf do not build the makejvf package -+ --disable-mendexk do not build the mendexk package - --disable-musixflx do not build the musixflx package - --disable-ps2pkm do not build the ps2pkm package - --disable-seetexk do not build the seetexk package -@@ -2422,6 +2433,10 @@ - - - -+## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/ -+## configure options and TL libraries required for ptexenc -+ -+ - ## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/ - ## configure options and TL libraries required for web2c - # Check whether --enable-web2c was given. -@@ -2486,6 +2501,18 @@ - yes|no) : ;; - *) enable_etex=no ;; - esac -+# Check whether --enable-ptex was given. -+if test "${enable_ptex+set}" = set; then -+ enableval=$enable_ptex; -+fi -+case $enable_ptex in -+ yes|no) : ;; -+ *) enable_ptex=yes ;; -+esac -+ -+test "x$enable_web2c:$enable_ptex" = xyes:yes && { -+ need_ptexenc=yes -+} - # Check whether --enable-aleph was given. - if test "${enable_aleph+set}" = set; then - enableval=$enable_aleph; -@@ -3000,6 +3027,46 @@ - } - - -+## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-makejvf was given. -+if test "${enable_makejvf+set}" = set; then -+ enableval=$enable_makejvf; -+fi -+case $enable_makejvf in #( -+ yes|no);; #( -+ *) enable_makejvf=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-makejvf=$enable_makejvf'" >&5 -+$as_echo "$as_me: Assuming \`--enable-makejvf=$enable_makejvf'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-makejvf=$enable_makejvf'";; -+esac -+ -+test "x$enable_makejvf" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ -+## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/ -+## configure options and TL libraries required for makeindexk -+# Check whether --enable-mendexk was given. -+if test "${enable_mendexk+set}" = set; then -+ enableval=$enable_mendexk; -+fi -+case $enable_mendexk in #( -+ yes|no);; #( -+ *) enable_mendexk=$enable_all_pkgs -+ { $as_echo "$as_me:$LINENO: Assuming \`--enable-mendexk=$enable_mendexk'" >&5 -+$as_echo "$as_me: Assuming \`--enable-mendexk=$enable_mendexk'" >&6;} -+ ac_configure_args="$ac_configure_args '--enable-mendexk=$enable_mendexk'";; -+esac -+ -+test "x$enable_mendexk" = xno || { -+ need_kpathsea=yes -+ need_ptexenc=yes -+} -+ -+ - ## texk/musixflx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/musixflx/ - ## configure options and TL libraries required for musixflx - # Check whether --enable-musixflx was given. -@@ -3015,6 +3082,7 @@ - esac - - -+ - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ - ## configure options and TL libraries required for ps2pkm - # Check whether --enable-ps2pkm was given. -@@ -3034,6 +3102,7 @@ - } - - -+ - ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ - ## configure options and TL libraries required for seetexk - # Check whether --enable-seetexk was given. -@@ -4234,6 +4303,16 @@ - SUBTEXK= - DIST_SUBTEXK= - -+if test -x $srcdir/ptexenc/configure; then -+ test "x$enable_ptexenc" = xno || SUBTEXK="$SUBTEXK ptexenc" -+ DIST_SUBTEXK="$DIST_SUBTEXK ptexenc" -+ if false; then -+ subdirs="$subdirs ptexenc" -+ -+ fi -+fi -+ -+ - if test -x $srcdir/web2c/configure; then - test "x$enable_web2c" = xno || SUBTEXK="$SUBTEXK web2c" - DIST_SUBTEXK="$DIST_SUBTEXK web2c" -@@ -4414,6 +4493,26 @@ - fi - - -+if test -x $srcdir/makejvf/configure; then -+ test "x$enable_makejvf" = xno || SUBTEXK="$SUBTEXK makejvf" -+ DIST_SUBTEXK="$DIST_SUBTEXK makejvf" -+ if false; then -+ subdirs="$subdirs makejvf" -+ -+ fi -+fi -+ -+ -+if test -x $srcdir/mendexk/configure; then -+ test "x$enable_mendexk" = xno || SUBTEXK="$SUBTEXK mendexk" -+ DIST_SUBTEXK="$DIST_SUBTEXK mendexk" -+ if false; then -+ subdirs="$subdirs mendexk" -+ -+ fi -+fi -+ -+ - if test -x $srcdir/musixflx/configure; then - test "x$enable_musixflx" = xno || SUBTEXK="$SUBTEXK musixflx" - DIST_SUBTEXK="$DIST_SUBTEXK musixflx" -@@ -4424,6 +4523,16 @@ - fi - - -+if test -x $srcdir/pdvipsk/configure; then -+ test "x$enable_pdvipsk" = xno || SUBTEXK="$SUBTEXK pdvipsk" -+ DIST_SUBTEXK="$DIST_SUBTEXK pdvipsk" -+ if false; then -+ subdirs="$subdirs pdvipsk" -+ -+ fi -+fi -+ -+ - if test -x $srcdir/ps2pkm/configure; then - test "x$enable_ps2pkm" = xno || SUBTEXK="$SUBTEXK ps2pkm" - DIST_SUBTEXK="$DIST_SUBTEXK ps2pkm" -@@ -4434,6 +4543,16 @@ - fi - - -+if test -x $srcdir/pxdvik/configure; then -+ test "x$enable_pxdvik" = xno || SUBTEXK="$SUBTEXK pxdvik" -+ DIST_SUBTEXK="$DIST_SUBTEXK pxdvik" -+ if false; then -+ subdirs="$subdirs pxdvik" -+ -+ fi -+fi -+ -+ - if test -x $srcdir/seetexk/configure; then - test "x$enable_seetexk" = xno || SUBTEXK="$SUBTEXK seetexk" - DIST_SUBTEXK="$DIST_SUBTEXK seetexk" -Index: texk/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/Makefile.in -+++ texlive-20091011-source/texk/Makefile.in -@@ -73,6 +73,7 @@ - $(top_srcdir)/../utils/vlna/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/withenable.ac \ - $(top_srcdir)/../utils/xindy/ac/xindy.ac \ -+ $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/withenable.ac \ - $(top_srcdir)/../texk/web2c/ac/web2c.ac \ - $(top_srcdir)/../texk/afm2pl/ac/withenable.ac \ -@@ -94,6 +95,8 @@ - $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ - $(top_srcdir)/../texk/lcdf-typetools/ac/lcdf-typetools.ac \ - $(top_srcdir)/../texk/makeindexk/ac/withenable.ac \ -+ $(top_srcdir)/../texk/makejvf/ac/withenable.ac \ -+ $(top_srcdir)/../texk/mendexk/ac/withenable.ac \ - $(top_srcdir)/../texk/musixflx/ac/withenable.ac \ - $(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \ - $(top_srcdir)/../texk/seetexk/ac/withenable.ac \ -Index: texk/tetex/fmtutil.cnf -=================================================================== ---- texlive-20091011-source.orig/texk/tetex/fmtutil.cnf -+++ texlive-20091011-source/texk/tetex/fmtutil.cnf -@@ -104,6 +104,10 @@ - # from phyzzx: - phyzzx pdftex - physe.ini - # -+# For pTeX (by hand): -+ptex ptex - --kanji=default ptex.ini -+platex ptex language.dat --kanji=default platex.ini -+# - # from t2: - #! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini - #! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini -Index: texk/kpathsea/texmf.cnf -=================================================================== ---- texlive-20091011-source.orig/texk/kpathsea/texmf.cnf -+++ texlive-20091011-source/texk/kpathsea/texmf.cnf -@@ -234,6 +234,14 @@ - TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// - TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// - -+% pTeX -+TEXINPUTS.ptex = .;$TEXMF/{ptex/{plain,generic},tex/{plain,generic,}}// -+TEXINPUTS.platex = .;$TEXMF/{ptex/platex,{p,}tex/latex,{p,}tex/generic,{p,}tex}// -+ -+% pBibTeX bibliographies and style files -+BIBINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bib// -+BSTINPUTS.pbibtex = .;$TEXMF/{pbibtex,bibtex}/bst// -+ - % ConTeXt. - TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// - -Index: texk/web2c/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/Makefile.in -+++ texlive-20091011-source/texk/web2c/Makefile.in -@@ -35,24 +35,25 @@ - build_triplet = @build@ - host_triplet = @host@ - EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ -- mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) pdftex$(EXEEXT) \ -- ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \ -- luatangle$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \ -- aleph$(EXEEXT) -+ mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \ -+ pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \ -+ luatex$(EXEEXT) luatangle$(EXEEXT) xetex$(EXEEXT) \ -+ $(am__EXEEXT_4) aleph$(EXEEXT) - bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ - ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ - $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ - $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \ -- $(am__EXEEXT_16) synctex$(EXEEXT) -+ $(am__EXEEXT_16) $(am__EXEEXT_17) synctex$(EXEEXT) - noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) --check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ -- $(am__EXEEXT_20) $(am__EXEEXT_21) md5main$(EXEEXT) --TESTS = tangle.test $(am__EXEEXT_24) ctiedir/ctie.test \ -+check_PROGRAMS = $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \ -+ $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \ -+ md5main$(EXEEXT) -+TESTS = tangle.test $(am__EXEEXT_26) ctiedir/ctie.test \ - cwebdir/cweave.test tiedir/tie.test $(am__append_4) \ - $(am__append_8) $(am__append_11) $(am__append_14) \ -- $(am__append_19) $(am__append_35) $(am__append_36) \ -- libmd5/md5.test -+ $(am__append_17) $(am__append_22) $(am__append_38) \ -+ $(am__append_39) libmd5/md5.test - DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ - $(srcdir)/../../build-aux/config.guess \ - $(srcdir)/../../build-aux/config.sub \ -@@ -79,7 +80,7 @@ - $(srcdir)/pdftexdir/am/libpdftex.am \ - $(srcdir)/pdftexdir/am/pdftex.am \ - $(srcdir)/pdftexdir/am/pdftosrc.am \ -- $(srcdir)/pdftexdir/am/ttf2afm.am \ -+ $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/ptexdir/am/ptex.am \ - $(srcdir)/synctexdir/am/synctex.am \ - $(srcdir)/xetexdir/am/xetex.am $(top_srcdir)/configure \ - $(top_srcdir)/luatexdir/luafontloader/ff-config.in \ -@@ -103,30 +104,33 @@ - @ETEX_TRUE@am__append_13 = etex - @ETEX_TRUE@am__append_14 = $(etex_tests) - @ETEX_TRUE@am__append_15 = dvitype pltotf tftopl --@PDFTEX_TRUE@am__append_16 = pdftex ttf2afm pdftosrc --@MINGW32_TRUE@am__append_17 = \ -+@PTEX_TRUE@am__append_16 = ptex pbibtex pdvitype ptftopl ppltotf -+@PTEX_TRUE@am__append_17 = $(ptex_tests) -+@PTEX_TRUE@am__append_18 = pdvitype ppltotf ptftopl -+@PDFTEX_TRUE@am__append_19 = pdftex ttf2afm pdftosrc -+@MINGW32_TRUE@am__append_20 = \ - @MINGW32_TRUE@ pdftexdir/regex/regex.c \ - @MINGW32_TRUE@ pdftexdir/regex/regex.h - --@LUATEX_TRUE@am__append_18 = luatex luatangle --@LUATEX_TRUE@am__append_19 = luatexdir/luatangle.test --@MINGW32_FALSE@am__append_20 = -DLUA_USE_POSIX --@XETEX_TRUE@am__append_21 = xetex --@XETEX_MACOSX_TRUE@am__append_22 = -DXETEX_MAC --@XETEX_MACOSX_TRUE@am__append_23 = libxetexmm.a --@XETEX_MACOSX_FALSE@am__append_24 = -DXETEX_OTHER $(XPDF_INCLUDES) \ -+@LUATEX_TRUE@am__append_21 = luatex luatangle -+@LUATEX_TRUE@am__append_22 = luatexdir/luatangle.test -+@MINGW32_FALSE@am__append_23 = -DLUA_USE_POSIX -+@XETEX_TRUE@am__append_24 = xetex -+@XETEX_MACOSX_TRUE@am__append_25 = -DXETEX_MAC -+@XETEX_MACOSX_TRUE@am__append_26 = libxetexmm.a -+@XETEX_MACOSX_FALSE@am__append_27 = -DXETEX_OTHER $(XPDF_INCLUDES) \ - @XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) --@XETEX_MACOSX_FALSE@am__append_25 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) --@XETEX_MACOSX_FALSE@am__append_26 = $(XPDF_DEPEND) $(LIBPNG_DEPEND) --@XETEX_GRAPHITE_TRUE@am__append_27 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) --@XETEX_GRAPHITE_TRUE@am__append_28 = $(GRAPHITE_LIBS) --@XETEX_GRAPHITE_TRUE@am__append_29 = $(GRAPHITE_DEPEND) --@XETEX_MACOSX_TRUE@am__append_30 = \ -+@XETEX_MACOSX_FALSE@am__append_28 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) -+@XETEX_MACOSX_FALSE@am__append_29 = $(XPDF_DEPEND) $(LIBPNG_DEPEND) -+@XETEX_GRAPHITE_TRUE@am__append_30 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) -+@XETEX_GRAPHITE_TRUE@am__append_31 = $(GRAPHITE_LIBS) -+@XETEX_GRAPHITE_TRUE@am__append_32 = $(GRAPHITE_DEPEND) -+@XETEX_MACOSX_TRUE@am__append_33 = \ - @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \ - @XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \ - @XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c - --@XETEX_MACOSX_FALSE@am__append_31 = \ -+@XETEX_MACOSX_FALSE@am__append_34 = \ - @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ - @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \ - @XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \ -@@ -143,32 +147,32 @@ - @XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \ - @XETEX_MACOSX_FALSE@ xetexdir/pngimage.h - --@XETEX_GRAPHITE_TRUE@am__append_32 = \ -+@XETEX_GRAPHITE_TRUE@am__append_35 = \ - @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \ - @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h - --@OTANGLE_TRUE@am__append_33 = $(omegaware_tools) --@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_34 = $(omegaware_font_tools) --@OTANGLE_TRUE@am__append_35 = omegaware/otangle.test --@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = omegaware/level1.test omegaware/omfonts.test omegaware/specialhex.test --@OTANGLE_TRUE@am__append_37 = pltotf tftopl --@ALEPH_TRUE@am__append_38 = aleph --@TEX_SYNCTEX_TRUE@am__append_39 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) --@TEX_SYNCTEX_TRUE@am__append_40 = $(ZLIB_LIBS) --@TEX_SYNCTEX_TRUE@am__append_41 = \ -+@OTANGLE_TRUE@am__append_36 = $(omegaware_tools) -+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_37 = $(omegaware_font_tools) -+@OTANGLE_TRUE@am__append_38 = omegaware/otangle.test -+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_39 = omegaware/level1.test omegaware/omfonts.test omegaware/specialhex.test -+@OTANGLE_TRUE@am__append_40 = pltotf tftopl -+@ALEPH_TRUE@am__append_41 = aleph -+@TEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -+@TEX_SYNCTEX_TRUE@am__append_43 = $(ZLIB_LIBS) -+@TEX_SYNCTEX_TRUE@am__append_44 = \ - @TEX_SYNCTEX_TRUE@ synctex.c - --@ETEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) --@ETEX_SYNCTEX_TRUE@am__append_43 = $(ZLIB_LIBS) --@ETEX_SYNCTEX_TRUE@am__append_44 = \ -+@ETEX_SYNCTEX_TRUE@am__append_45 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -+@ETEX_SYNCTEX_TRUE@am__append_46 = $(ZLIB_LIBS) -+@ETEX_SYNCTEX_TRUE@am__append_47 = \ - @ETEX_SYNCTEX_TRUE@ synctex-e.c - --@PDFTEX_SYNCTEX_TRUE@am__append_45 = -I$(srcdir)/synctexdir --@PDFTEX_SYNCTEX_TRUE@am__append_46 = \ -+@PDFTEX_SYNCTEX_TRUE@am__append_48 = -I$(srcdir)/synctexdir -+@PDFTEX_SYNCTEX_TRUE@am__append_49 = \ - @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c - --@XETEX_SYNCTEX_TRUE@am__append_47 = -I$(srcdir)/synctexdir --@XETEX_SYNCTEX_TRUE@am__append_48 = \ -+@XETEX_SYNCTEX_TRUE@am__append_50 = -I$(srcdir)/synctexdir -+@XETEX_SYNCTEX_TRUE@am__append_51 = \ - @XETEX_SYNCTEX_TRUE@ synctex-xe.c - - subdir = . -@@ -186,6 +190,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -453,22 +458,26 @@ - @MFN_TRUE@@MF_TRUE@am__EXEEXT_8 = mf-nowin$(EXEEXT) - @MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT) - @ETEX_TRUE@am__EXEEXT_10 = etex$(EXEEXT) --@PDFTEX_TRUE@am__EXEEXT_11 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ -+@PTEX_TRUE@am__EXEEXT_11 = ptex$(EXEEXT) pbibtex$(EXEEXT) \ -+@PTEX_TRUE@ pdvitype$(EXEEXT) ptftopl$(EXEEXT) ppltotf$(EXEEXT) -+@PDFTEX_TRUE@am__EXEEXT_12 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ - @PDFTEX_TRUE@ pdftosrc$(EXEEXT) --@LUATEX_TRUE@am__EXEEXT_12 = luatex$(EXEEXT) luatangle$(EXEEXT) --@XETEX_TRUE@am__EXEEXT_13 = xetex$(EXEEXT) --@OTANGLE_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2) --@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_15 = $(am__EXEEXT_3) --@ALEPH_TRUE@am__EXEEXT_16 = aleph$(EXEEXT) -+@LUATEX_TRUE@am__EXEEXT_13 = luatex$(EXEEXT) luatangle$(EXEEXT) -+@XETEX_TRUE@am__EXEEXT_14 = xetex$(EXEEXT) -+@OTANGLE_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2) -+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_16 = $(am__EXEEXT_3) -+@ALEPH_TRUE@am__EXEEXT_17 = aleph$(EXEEXT) - am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ - "$(DESTDIR)$(man5dir)" --@TEX_TRUE@am__EXEEXT_17 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ -+@TEX_TRUE@am__EXEEXT_18 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ - @TEX_TRUE@ tftopl$(EXEEXT) --@MF_TRUE@am__EXEEXT_18 = gftype$(EXEEXT) tftopl$(EXEEXT) --@MP_TRUE@am__EXEEXT_19 = pltotf$(EXEEXT) tftopl$(EXEEXT) --@ETEX_TRUE@am__EXEEXT_20 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ -+@MF_TRUE@am__EXEEXT_19 = gftype$(EXEEXT) tftopl$(EXEEXT) -+@MP_TRUE@am__EXEEXT_20 = pltotf$(EXEEXT) tftopl$(EXEEXT) -+@ETEX_TRUE@am__EXEEXT_21 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ - @ETEX_TRUE@ tftopl$(EXEEXT) --@OTANGLE_TRUE@am__EXEEXT_21 = pltotf$(EXEEXT) tftopl$(EXEEXT) -+@PTEX_TRUE@am__EXEEXT_22 = pdvitype$(EXEEXT) ppltotf$(EXEEXT) \ -+@PTEX_TRUE@ ptftopl$(EXEEXT) -+@OTANGLE_TRUE@am__EXEEXT_23 = pltotf$(EXEEXT) tftopl$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) - am__objects_9 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \ -@@ -598,6 +607,10 @@ - patgen_OBJECTS = $(nodist_patgen_OBJECTS) - patgen_LDADD = $(LDADD) - patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -+nodist_pbibtex_OBJECTS = pbibtex.$(OBJEXT) -+pbibtex_OBJECTS = $(nodist_pbibtex_OBJECTS) -+pbibtex_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) - am__dist_pdftex_SOURCES_DIST = synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-pdftex.h - dist_pdftex_OBJECTS = -@@ -612,6 +625,10 @@ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a - am_pdftosrc_OBJECTS = pdftosrc-pdftosrc.$(OBJEXT) - pdftosrc_OBJECTS = $(am_pdftosrc_OBJECTS) -+nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT) -+pdvitype_OBJECTS = $(nodist_pdvitype_OBJECTS) -+pdvitype_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) - nodist_pktogf_OBJECTS = pktogf.$(OBJEXT) - pktogf_OBJECTS = $(nodist_pktogf_OBJECTS) - pktogf_LDADD = $(LDADD) -@@ -628,6 +645,21 @@ - pooltype_OBJECTS = $(nodist_pooltype_OBJECTS) - pooltype_LDADD = $(LDADD) - pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -+nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT) -+ppltotf_OBJECTS = $(nodist_ppltotf_OBJECTS) -+ppltotf_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) -+am__objects_16 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT) \ -+ ptex-ptex1.$(OBJEXT) ptex-ptex2.$(OBJEXT) -+nodist_ptex_OBJECTS = $(am__objects_16) ptex-ptex-pool.$(OBJEXT) \ -+ ptex-ptexextra.$(OBJEXT) ptex-kanji.$(OBJEXT) -+ptex_OBJECTS = $(nodist_ptex_OBJECTS) -+ptex_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) -+nodist_ptftopl_OBJECTS = ptftopl.$(OBJEXT) -+ptftopl_OBJECTS = $(nodist_ptftopl_OBJECTS) -+ptftopl_DEPENDENCIES = $(pproglib) $(am__DEPENDENCIES_1) \ -+ $(am__DEPENDENCIES_2) - am_synctex_OBJECTS = synctex-synctex_main.$(OBJEXT) \ - synctex-synctex_parser.$(OBJEXT) \ - synctex-synctex_parser_utils.$(OBJEXT) -@@ -643,11 +675,11 @@ - am__dist_tex_SOURCES_DIST = synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-tex.h - dist_tex_OBJECTS = --am__objects_16 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \ -+am__objects_17 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \ - tex-tex1.$(OBJEXT) tex-tex2.$(OBJEXT) --@TEX_SYNCTEX_TRUE@am__objects_17 = tex-synctex.$(OBJEXT) --nodist_tex_OBJECTS = $(am__objects_16) tex-tex-pool.$(OBJEXT) \ -- tex-texextra.$(OBJEXT) $(am__objects_17) -+@TEX_SYNCTEX_TRUE@am__objects_18 = tex-synctex.$(OBJEXT) -+nodist_tex_OBJECTS = $(am__objects_17) tex-tex-pool.$(OBJEXT) \ -+ tex-texextra.$(OBJEXT) $(am__objects_18) - tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS) - @TEX_SYNCTEX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) - tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ -@@ -679,11 +711,11 @@ - am__dist_xetex_SOURCES_DIST = synctexdir/synctex.h \ - synctexdir/synctex-common.h synctexdir/synctex-xetex.h - dist_xetex_OBJECTS = --am__objects_18 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) \ -+am__objects_19 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) \ - xetex-xetex1.$(OBJEXT) xetex-xetex2.$(OBJEXT) --@XETEX_SYNCTEX_TRUE@am__objects_19 = xetex-synctex-xe.$(OBJEXT) --nodist_xetex_OBJECTS = $(am__objects_18) xetex-xetex_pool.$(OBJEXT) \ -- xetex-xetexextra.$(OBJEXT) $(am__objects_19) -+@XETEX_SYNCTEX_TRUE@am__objects_20 = xetex-synctex-xe.$(OBJEXT) -+nodist_xetex_OBJECTS = $(am__objects_19) xetex-xetex_pool.$(OBJEXT) \ -+ xetex-xetexextra.$(OBJEXT) $(am__objects_20) - xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS) - @XETEX_MACOSX_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \ - @XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \ -@@ -739,19 +771,21 @@ - $(nodist_odvitype_SOURCES) $(nodist_ofm2opl_SOURCES) \ - $(nodist_opl2ofm_SOURCES) $(nodist_otangle_SOURCES) \ - $(nodist_ovf2ovp_SOURCES) $(nodist_ovp2ovf_SOURCES) \ -- $(nodist_patgen_SOURCES) $(dist_pdftex_SOURCES) \ -- $(nodist_pdftex_SOURCES) $(nodist_EXTRA_pdftex_SOURCES) \ -- $(pdftosrc_SOURCES) $(nodist_EXTRA_pdftosrc_SOURCES) \ -+ $(nodist_patgen_SOURCES) $(nodist_pbibtex_SOURCES) \ -+ $(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \ -+ $(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \ -+ $(nodist_EXTRA_pdftosrc_SOURCES) $(nodist_pdvitype_SOURCES) \ - $(nodist_pktogf_SOURCES) $(nodist_pktype_SOURCES) \ - $(nodist_pltotf_SOURCES) $(nodist_pooltype_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_vftovp_SOURCES) \ -- $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \ -- $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \ -- $(nodist_EXTRA_xetex_SOURCES) -+ $(nodist_ppltotf_SOURCES) $(nodist_ptex_SOURCES) \ -+ $(nodist_ptftopl_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_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \ -+ $(nodist_weave_SOURCES) $(dist_xetex_SOURCES) \ -+ $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES) - DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ - $(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \ - $(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \ -@@ -805,12 +839,12 @@ - CTAGS = ctags - am__tty_colors = \ - red=; grn=; lgn=; blu=; std= --am__EXEEXT_22 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ -+am__EXEEXT_24 = 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 --am__EXEEXT_23 = $(am__EXEEXT_22) --@WEB_TRUE@am__EXEEXT_24 = $(am__EXEEXT_23) -+am__EXEEXT_25 = $(am__EXEEXT_24) -+@WEB_TRUE@am__EXEEXT_26 = $(am__EXEEXT_25) - DIST_SUBDIRS = $(SUBDIRS) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) -@@ -939,6 +973,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -@@ -1029,7 +1066,7 @@ - ACLOCAL_AMFLAGS = -I ../../m4 - INCLUDES = -I$(top_builddir)/.. $(KPATHSEA_INCLUDES) - version = $(WEB2CVERSION) --SUBDIRS = doc lib man web2c . window omegafonts otps -+SUBDIRS = doc lib man web2c . window omegafonts otps ptexdir/lib - proglib = lib/lib.a - dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 - nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1 -@@ -1091,7 +1128,18 @@ - etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \ - etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \ - etexdir/etrip/trip2.in etexdir/etex.mak etexdir/etex.mk \ -- $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/pdftex.h \ -+ $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptexextra.in \ -+ lib/texmfmp.c tmf-pool.h ptexdir/ChangeLog ptexdir/INSTALL \ -+ ptexdir/README ptexdir/ptex_gen.tex $(ptex_tests) \ -+ ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/ptrip.fot \ -+ ptexdir/ptrip/ptrip.log ptexdir/ptrip/ptrip.out \ -+ ptexdir/ptrip/ptrip.pl ptexdir/ptrip/ptrip.tex \ -+ ptexdir/ptrip/ptrip.typ ptexdir/ptrip/ptrip1.in \ -+ ptexdir/ptrip/ptrip2.in ptexdir/ptrip/ptrip3.in \ -+ ptexdir/ptrip/ptripin.log ptexdir/ptrip/ptripman.tex \ -+ ptexdir/ptrip/texmf.cnf ptexdir/ptrip/trip2.in \ -+ ptexdir/ptex.mak ptexdir/ptex.mk $(pdftex_ch_srcs) \ -+ pdftexdir/pdftex.defines pdftexdir/pdftex.h \ - pdftexdir/pdftexextra.in pdftexdir/ChangeLog pdftexdir/NEWS \ - pdftexdir/README pdftexdir/change-files.txt \ - pdftexdir/pdftex.mak pdftexdir/pdftex.mk \ -@@ -1265,6 +1313,8 @@ - $(nodist_libmplib_a_SOURCES) mp-ctangle psout-ctangle \ - svgout-ctangle $(nodist_etex_SOURCES) etex.web etex.ch \ - etex-web2c etex.p etex.pool etex-tangle etexdir/etex.version \ -+ $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \ -+ ptex.pool ptex-tangle ptexdir/ptex.version \ - $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \ - pdftex.pool pdftex-tangle pdftexdir/pdftex.version \ - $(nodist_luatex_SOURCES) luatex-web2c luatex.p luatex.pool \ -@@ -1334,14 +1384,14 @@ - nodist_ctie_SOURCES = ctie.c - nodist_cweave_SOURCES = cweave.c cweb.c - nodist_tie_SOURCES = tie.c --tex_CPPFLAGS = $(am__append_39) -+tex_CPPFLAGS = $(am__append_42) - - # With --enable-ipc, TeX may need to link with -lsocket. --tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_40) -+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_43) - - # TeX C sources - tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h --nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_41) -+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_44) - tex_ch_srcs = \ - tex.web \ - tex.ch \ -@@ -1380,15 +1430,15 @@ - svgout_c_h = mplibsvg.h mpsvgout.h svgout.c - libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ - mplibdir/memio.w mplibdir/tfmin.w --etex_CPPFLAGS = $(am__append_42) -+etex_CPPFLAGS = $(am__append_45) - - # With --enable-ipc, e-TeX may need to link with -lsocket. --etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_43) -+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_46) - - # e-TeX C sources - etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h - nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \ -- etexdir/etexextra.h $(am__append_44) -+ etexdir/etexextra.h $(am__append_47) - etex_web_srcs = \ - tex.web \ - etexdir/etex.ch \ -@@ -1403,6 +1453,44 @@ - etexdir/etex-binpool.ch - - etex_tests = etexdir/etrip.test -+ptex_CPPFLAGS = $(PTEXENC_INCLUDES) -+ -+# With --enable-ipc, pTeX may need to link with -lsocket. -+ptex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs) -+pbibtex_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+ptftopl_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+ppltotf_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+pdvitype_LDADD = $(pproglib) $(PTEXENC_LIBS) $(LDADD) -+pproglib = ptexdir/lib/lib.a -+ -+# pTeX C sources -+ptex_c_h = ptexini.c ptex0.c ptex1.c ptex2.c ptexcoerce.h ptexd.h -+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexextra.c ptexdir/ptexextra.h ptexdir/kanji.c ptexdir/kanji.h -+ptex_web_srcs = \ -+ tex.web \ -+ tex.ch -+ -+ptex_ch_srcs = \ -+ $(ptex_ch_synctex) \ -+ ptexdir/ptex-base.ch \ -+ ptexdir/ptex-include.ch \ -+ tex-binpool.ch -+ -+ -+### pBibTeX -+nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h -+ -+### pDVItype -+nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h -+pdvitype_CPPFLAGS = -DDHEX_CHAR_CODE -+ -+### pTFtoPL -+nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h -+ -+### pPLtoTF -+nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h -+ppltotf_CPPFLAGS = -DPRESERVE_PUTC -+ptex_tests = ptexdir/ptrip.test - pdftex_cppflags = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \ - $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \ - -I$(srcdir)/pdftexdir -@@ -1414,12 +1502,12 @@ - $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a - nodist_EXTRA_pdftex_SOURCES = dummy.cxx - pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE) --pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_45) -+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_48) - pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs) - pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a - pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h - nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \ -- pdftexdir/pdftexextra.h $(am__append_46) -+ pdftexdir/pdftexextra.h $(am__append_49) - pdftex_ch_srcs = \ - pdftexdir/pdftex.web \ - pdftexdir/tex.ch0 \ -@@ -1439,7 +1527,7 @@ - pdftexdir/writejbig2.h pdftexdir/writejpg.c \ - pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ - pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ -- $(am__append_17) -+ $(am__append_20) - EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \ - pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \ - pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c -@@ -1469,7 +1557,7 @@ - luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch - nodist_luatangle_SOURCES = luatangle.c luatangle.h - luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch --liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_20) -+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_23) - liblua51_a_SOURCES = \ - luatexdir/lua51/lapi.c \ - luatexdir/lua51/lapi.h \ -@@ -1851,23 +1939,23 @@ - - EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c - nodist_EXTRA_xetex_SOURCES = dummy.cxx --libxetex = libxetex.a $(am__append_23) -+libxetex = libxetex.a $(am__append_26) - xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir \ - $(ICU_INCLUDES) $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) \ -- $(am__append_22) $(am__append_24) $(am__append_27) \ -+ $(am__append_25) $(am__append_27) $(am__append_30) \ - $(ZLIB_INCLUDES) --xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_25) \ -- $(am__append_28) $(FREETYPE2_LIBS) $(ZLIB_LIBS) -+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_28) \ -+ $(am__append_31) $(FREETYPE2_LIBS) $(ZLIB_LIBS) - xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \ -- $(am__append_26) $(am__append_29) $(FREETYPE2_DEPEND) \ -+ $(am__append_29) $(am__append_32) $(FREETYPE2_DEPEND) \ - $(ZLIB_DEPEND) - @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime --xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_47) -+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_50) - xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) - xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex) - xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.c xetexcoerce.h xetexd.h - nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \ -- xetexdir/xetexextra.h $(am__append_48) -+ xetexdir/xetexextra.h $(am__append_51) - xetex_web_srcs = \ - tex.web \ - etexdir/etex.ch \ -@@ -1892,8 +1980,8 @@ - xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \ - xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \ - xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \ -- xetexdir/trans.h xetexdir/xetex.h $(am__append_30) \ -- $(am__append_31) $(am__append_32) -+ xetexdir/trans.h xetexdir/xetex.h $(am__append_33) \ -+ $(am__append_34) $(am__append_35) - libxetexmm_a_CPPFLAGS = $(xetex_cppflags) - libxetexmm_a_CXXFLAGS = -ObjC++ - libxetexmm_a_SOURCES = \ -@@ -2060,7 +2148,7 @@ - .SUFFIXES: .c .cc .cpp .cxx .lo .o .obj - am--refresh: - @: --$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -@@ -2310,12 +2398,18 @@ - patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) - @rm -f patgen$(EXEEXT) - $(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS) -+pbibtex$(EXEEXT): $(pbibtex_OBJECTS) $(pbibtex_DEPENDENCIES) -+ @rm -f pbibtex$(EXEEXT) -+ $(LINK) $(pbibtex_OBJECTS) $(pbibtex_LDADD) $(LIBS) - pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) - @rm -f pdftex$(EXEEXT) - $(CXXLINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS) - pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) - @rm -f pdftosrc$(EXEEXT) - $(CXXLINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS) -+pdvitype$(EXEEXT): $(pdvitype_OBJECTS) $(pdvitype_DEPENDENCIES) -+ @rm -f pdvitype$(EXEEXT) -+ $(LINK) $(pdvitype_OBJECTS) $(pdvitype_LDADD) $(LIBS) - pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) - @rm -f pktogf$(EXEEXT) - $(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS) -@@ -2328,6 +2422,15 @@ - pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) - @rm -f pooltype$(EXEEXT) - $(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS) -+ppltotf$(EXEEXT): $(ppltotf_OBJECTS) $(ppltotf_DEPENDENCIES) -+ @rm -f ppltotf$(EXEEXT) -+ $(LINK) $(ppltotf_OBJECTS) $(ppltotf_LDADD) $(LIBS) -+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) -+ @rm -f ptex$(EXEEXT) -+ $(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS) -+ptftopl$(EXEEXT): $(ptftopl_OBJECTS) $(ptftopl_DEPENDENCIES) -+ @rm -f ptftopl$(EXEEXT) -+ $(LINK) $(ptftopl_OBJECTS) $(ptftopl_LDADD) $(LIBS) - synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) - @rm -f synctex$(EXEEXT) - $(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) -@@ -2673,6 +2776,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovf2ovp.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovp2ovf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patgen.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbibtex.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex-pool.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex0.Po@am__quote@ -@@ -2684,10 +2788,20 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-synctex-pdf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftosrc-dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftosrc-pdftosrc.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdvitype-pdvitype.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktogf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktype.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pltotf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pooltype.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppltotf-ppltotf.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-kanji.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex-pool.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex1.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex2.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexextra.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptftopl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synctex-synctex_parser_utils.Po@am__quote@ -@@ -6587,6 +6701,132 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-synctex-pdf.obj `if test -f 'synctex-pdf.c'; then $(CYGPATH_W) 'synctex-pdf.c'; else $(CYGPATH_W) '$(srcdir)/synctex-pdf.c'; fi` - -+pdvitype-pdvitype.o: pdvitype.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.o -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdvitype.c' object='pdvitype-pdvitype.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c -+ -+pdvitype-pdvitype.obj: pdvitype.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.obj -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pdvitype.c' object='pdvitype-pdvitype.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi` -+ -+ppltotf-ppltotf.o: ppltotf.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ppltotf.c' object='ppltotf-ppltotf.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c -+ -+ppltotf-ppltotf.obj: ppltotf.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.obj -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ppltotf.c' object='ppltotf-ppltotf.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi` -+ -+ptex-ptexini.o: ptexini.c -+@am__fastdepCC_TRUE@ $(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 -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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 -+@am__fastdepCC_TRUE@ $(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` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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 -+@am__fastdepCC_TRUE@ $(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 -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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 -+@am__fastdepCC_TRUE@ $(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` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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-ptex1.o: ptex1.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex1.o -MD -MP -MF $(DEPDIR)/ptex-ptex1.Tpo -c -o ptex-ptex1.o `test -f 'ptex1.c' || echo '$(srcdir)/'`ptex1.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex1.Tpo $(DEPDIR)/ptex-ptex1.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex1.c' object='ptex-ptex1.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex1.o `test -f 'ptex1.c' || echo '$(srcdir)/'`ptex1.c -+ -+ptex-ptex1.obj: ptex1.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex1.obj -MD -MP -MF $(DEPDIR)/ptex-ptex1.Tpo -c -o ptex-ptex1.obj `if test -f 'ptex1.c'; then $(CYGPATH_W) 'ptex1.c'; else $(CYGPATH_W) '$(srcdir)/ptex1.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex1.Tpo $(DEPDIR)/ptex-ptex1.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex1.c' object='ptex-ptex1.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex1.obj `if test -f 'ptex1.c'; then $(CYGPATH_W) 'ptex1.c'; else $(CYGPATH_W) '$(srcdir)/ptex1.c'; fi` -+ -+ptex-ptex2.o: ptex2.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex2.o -MD -MP -MF $(DEPDIR)/ptex-ptex2.Tpo -c -o ptex-ptex2.o `test -f 'ptex2.c' || echo '$(srcdir)/'`ptex2.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex2.Tpo $(DEPDIR)/ptex-ptex2.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex2.c' object='ptex-ptex2.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex2.o `test -f 'ptex2.c' || echo '$(srcdir)/'`ptex2.c -+ -+ptex-ptex2.obj: ptex2.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex2.obj -MD -MP -MF $(DEPDIR)/ptex-ptex2.Tpo -c -o ptex-ptex2.obj `if test -f 'ptex2.c'; then $(CYGPATH_W) 'ptex2.c'; else $(CYGPATH_W) '$(srcdir)/ptex2.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex2.Tpo $(DEPDIR)/ptex-ptex2.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex2.c' object='ptex-ptex2.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex2.obj `if test -f 'ptex2.c'; then $(CYGPATH_W) 'ptex2.c'; else $(CYGPATH_W) '$(srcdir)/ptex2.c'; fi` -+ -+ptex-ptex-pool.o: ptex-pool.c -+@am__fastdepCC_TRUE@ $(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 -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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 -+@am__fastdepCC_TRUE@ $(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` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(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` -+ -+ptex-ptexextra.o: ptexextra.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.o -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.o `test -f 'ptexextra.c' || echo '$(srcdir)/'`ptexextra.c -+ -+ptex-ptexextra.obj: ptexextra.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexextra.obj -MD -MP -MF $(DEPDIR)/ptex-ptexextra.Tpo -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-ptexextra.Tpo $(DEPDIR)/ptex-ptexextra.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexextra.c' object='ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexextra.obj `if test -f 'ptexextra.c'; then $(CYGPATH_W) 'ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexextra.c'; fi` -+ -+ptex-kanji.o: ptexdir/kanji.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-kanji.o -MD -MP -MF $(DEPDIR)/ptex-kanji.Tpo -c -o ptex-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-kanji.Tpo $(DEPDIR)/ptex-kanji.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/kanji.c' object='ptex-kanji.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c -+ -+ptex-kanji.obj: ptexdir/kanji.c -+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-kanji.obj -MD -MP -MF $(DEPDIR)/ptex-kanji.Tpo -c -o ptex-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/ptex-kanji.Tpo $(DEPDIR)/ptex-kanji.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ptexdir/kanji.c' object='ptex-kanji.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi` -+ - synctex-synctex_main.o: synctexdir/synctex_main.c - @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctex-synctex_main.o -MD -MP -MF $(DEPDIR)/synctex-synctex_main.Tpo -c -o synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/synctex-synctex_main.Tpo $(DEPDIR)/synctex-synctex_main.Po -@@ -8237,6 +8477,99 @@ - rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ - rm -f tripos.tex 8terminal.tex - rm -rf tfm -+# Rebuild $(pproglib) -+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/ptexdir/lib/*.c -+ cd ptexdir/lib && $(MAKE) $(AM_MAKEFLAGS) -+ -+$(ptex_c_h): ptex-web2c -+ptex-web2c: ptex.p $(web2c_texmf) -+ $(web2c) ptex -+# : $(synctex_convert_ptex) -+ echo timestamp >$@ -+ touch $(ptex_c_h) -+ -+ptex-pool.c: ptex.pool $(makecpool_stamp) tmf-pool.h -+ $(makecpool) ptex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ -+ -+ptexextra.c: ptexdir/ptexextra.h lib/texmfmp.c ptexd.h -+ sed s/TEX-OR-MF-OR-MP/ptex/ $(srcdir)/lib/texmfmp.c >$@ -+ -+ptexdir/ptexextra.h: ptexdir/ptexextra.in ptexdir/ptex.version -+ sed s/PTEX-VERSION/`cat ptexdir/ptex.version`/ \ -+ $(srcdir)/ptexdir/ptexextra.in >$@ -+ -+# Tangling pTeX -+ptex.p ptex.pool: ptex-tangle -+ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch -+ $(tangle) ptex ptex -+ echo timestamp >$@ -+ touch ptex.p ptex.pool -+ -+# Extract ptex version -+ptexdir/ptex.version: ptexdir/ptex-base.ch -+ $(mkdir_p) ptexdir/lib -+ grep "^@d TeX_banner=='This is pTeX" $(srcdir)/ptexdir/ptex-base.ch \ -+ | sed "s/^.*-//;s/'.*$$//" >ptexdir/ptex.version -+ -+# Generate ptex.web -+ptex.web: tie$(EXEEXT) $(ptex_web_srcs) -+ $(tie) -m ptex.web $(ptex_web_srcs) -+ -+# Generate ptex.ch -+ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs) -+ $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs) -+pbibtex.c pbibtex.h: pbibtex-web2c -+pbibtex.o: pbibtex.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+pbibtex-web2c: $(web2c_depend) web2c/cvtbib.sed pbibtex.p -+ $(web2c) pbibtex -+ echo timestamp >$@ -+ touch pbibtex.c pbibtex.h -+pbibtex.p: tangle$(EXEEXT) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+ $(tangle) pbibtex.web $(srcdir)/ptexdir/pbibtex.ch -+pbibtex.web: $(srcdir)/bibtex.web -+ cat $(srcdir)/bibtex.web > $@ -+pdvitype.c pdvitype.h: pdvitype-web2c -+pdvitype.o: pdvitype.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+pdvitype-web2c: $(web2c_depend) pdvitype.p -+ $(web2c) pdvitype -+ echo timestamp >$@ -+ touch pdvitype.c pdvitype.h -+pdvitype.p: tangle$(EXEEXT) pdvitype.web $(srcdir)/ptexdir/pdvitype.ch -+ $(tangle) pdvitype $(srcdir)/ptexdir/pdvitype -+pdvitype.web: $(srcdir)/dvitype.web -+ cat $(srcdir)/dvitype.web > $@ -+ptftopl.c ptftopl.h: ptftopl-web2c -+ptftopl.o: ptftopl.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ptftopl-web2c: $(web2c_depend) ptftopl.p -+ $(web2c) ptftopl -+ echo timestamp >$@ -+ touch ptftopl.c ptftopl.h -+ptftopl.p: tangle$(EXEEXT) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ $(tangle) ptftopl.web $(srcdir)/ptexdir/ptftopl.ch -+ptftopl.web: tie$(EXEEXT) $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ $(tie) -m ptftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch -+ppltotf.c ppltotf.h: ppltotf-web2c -+pppltotf.o: pppltotf.c $(srcdir)/ptexdir/kanji.h $(srcdir)/ptexdir/ptexhelp.h -+ppltotf-web2c: $(web2c_depend) ppltotf.p -+ $(web2c) ppltotf -+ echo timestamp >$@ -+ touch ppltotf.c ppltotf.h -+ppltotf.p: tangle$(EXEEXT) ppltotf.web $(srcdir)/ptexdir/ppltotf.ch -+ $(tangle) ppltotf.web $(srcdir)/ptexdir/ppltotf -+ppltotf.web: tie$(EXEEXT) $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ $(tie) -m ppltotf.web $(srcdir)/pltotf.web $(srcdir)/pltotf.ch -+ -+.PHONY: ptrip-clean -+clean-local:: ptrip-clean -+ptrip-clean: -+ rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log -+ rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ -+ rm -f xtripin.fot xtripin.log -+ rm -f xtrip.fot xtrip.log xtrip.typ -+ rm -f ptrip.tfm ptrip.pl ptrip.tex ptrip.fmt ptripin.fot ptripin.log -+ rm -f ptrip.fot ptrip.log ptrip.dvi ptrip.out ptrip.typ -+ rm -f tripos.tex 8terminal.tex -+ rm -rf tfm - $(pdftex_c_h): pdftex-web2c - pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines - $(web2c) pdftex -Index: texk/web2c/configure.ac -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/configure.ac -+++ texlive-20091011-source/texk/web2c/configure.ac -@@ -246,6 +246,7 @@ - AC_TYPE_SIGNAL - - KPSE_KPATHSEA_FLAGS -+KPSE_PTEXENC_FLAGS - KPSE_ZLIB_FLAGS - KPSE_LIBPNG_FLAGS - KPSE_XPDF_FLAGS -@@ -358,6 +359,7 @@ - AC_CONFIG_SUBDIRS([web2c]) - - AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile -+ ptexdir/lib/Makefile - omegafonts/Makefile otps/Makefile window/Makefile]) - - dnl The subdirectory web2c must be configured for the build system. -Index: texk/web2c/doc/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/doc/Makefile.in -+++ texlive-20091011-source/texk/web2c/doc/Makefile.in -@@ -50,6 +50,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -198,6 +199,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/window/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/window/Makefile.in -+++ texlive-20091011-source/texk/web2c/window/Makefile.in -@@ -52,6 +52,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -194,6 +195,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/man/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/man/Makefile.in -+++ texlive-20091011-source/texk/web2c/man/Makefile.in -@@ -61,6 +61,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -199,6 +200,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/fmtutil.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/fmtutil.in -+++ texlive-20091011-source/texk/web2c/fmtutil.in -@@ -73,6 +73,10 @@ - # if you want babel support in pdfamstex: - #! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini - -+# Japanese pTeX: -+@PTEX@ptex ptex - --kanji=default ptex.ini -+@PTEX@platex ptex language.dat --kanji=default platex.ini -+ - # Context formats: - #! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini - #! cont-cz xetex cont-usr.tex -8bit *cont-cz.ini -Index: texk/web2c/configure -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/configure -+++ texlive-20091011-source/texk/web2c/configure -@@ -832,6 +832,10 @@ - ZLIB_DEPEND - ZLIB_LIBS - ZLIB_INCLUDES -+PTEXENC_RULE -+PTEXENC_DEPEND -+PTEXENC_LIBS -+PTEXENC_INCLUDES - KPATHSEA_RULE - KPATHSEA_DEPEND - KPATHSEA_LIBS -@@ -880,6 +884,10 @@ - ALEPH_SYNCTEX_TRUE - ALEPH_FALSE - ALEPH_TRUE -+PTEX_SYNCTEX_FALSE -+PTEX_SYNCTEX_TRUE -+PTEX_FALSE -+PTEX_TRUE - ETEX_SYNCTEX_FALSE - ETEX_SYNCTEX_TRUE - ETEX_FALSE -@@ -1044,6 +1052,7 @@ - enable_omfonts - enable_tex - enable_etex -+enable_ptex - enable_aleph - enable_pdftex - enable_luatex -@@ -1754,6 +1763,7 @@ - versions) - --disable-tex do not compile and install TeX - --enable-etex compile and install e-TeX -+ --disable-ptex do not compile and install pTeX - --disable-aleph do not compile and install Aleph - --disable-pdftex do not compile and install pdfTeX - --disable-luatex do not compile and install luaTeX -@@ -4571,13 +4581,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:4574: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:4584: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4577: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:4587: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:4580: output\"" >&5) -+ (eval echo "\"\$as_me:4590: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -5783,7 +5793,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5786 "configure"' > conftest.$ac_ext -+ echo '#line 5796 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -7744,11 +7754,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7747: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7757: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7751: \$? = $ac_status" >&5 -+ echo "$as_me:7761: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8083,11 +8093,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8086: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8096: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:8090: \$? = $ac_status" >&5 -+ echo "$as_me:8100: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -8188,11 +8198,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8191: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8201: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8195: \$? = $ac_status" >&5 -+ echo "$as_me:8205: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -8243,11 +8253,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:8246: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8256: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:8250: \$? = $ac_status" >&5 -+ echo "$as_me:8260: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -11043,7 +11053,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11046 "configure" -+#line 11056 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -11139,7 +11149,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 11142 "configure" -+#line 11152 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -16259,11 +16269,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16262: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16272: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16266: \$? = $ac_status" >&5 -+ echo "$as_me:16276: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -16358,11 +16368,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16361: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16371: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16365: \$? = $ac_status" >&5 -+ echo "$as_me:16375: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16410,11 +16420,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16413: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16423: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16417: \$? = $ac_status" >&5 -+ echo "$as_me:16427: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -17704,6 +17714,18 @@ - yes|no) : ;; - *) enable_etex=no ;; - esac -+# Check whether --enable-ptex was given. -+if test "${enable_ptex+set}" = set; then -+ enableval=$enable_ptex; -+fi -+case $enable_ptex in -+ yes|no) : ;; -+ *) enable_ptex=yes ;; -+esac -+ -+test "x$enable_web2c:$enable_ptex" = xyes:yes && { -+ need_ptexenc=yes -+} - # Check whether --enable-aleph was given. - if test "${enable_aleph+set}" = set; then - enableval=$enable_aleph; -@@ -18938,6 +18960,20 @@ - ETEX_SYNCTEX_TRUE='#' - ETEX_SYNCTEX_FALSE= - fi -+ if test "x$enable_ptex" = xyes; then -+ PTEX_TRUE= -+ PTEX_FALSE='#' -+else -+ PTEX_TRUE='#' -+ PTEX_FALSE= -+fi -+ if false; then -+ PTEX_SYNCTEX_TRUE= -+ PTEX_SYNCTEX_FALSE='#' -+else -+ PTEX_SYNCTEX_TRUE='#' -+ PTEX_SYNCTEX_FALSE= -+fi - if test "x$enable_aleph" = xyes; then - ALEPH_TRUE= - ALEPH_FALSE='#' -@@ -24487,6 +24523,21 @@ - cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS)' - fi - -+## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags -+ PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ -+ -e "s,SRC/,$kpse_SRC/,g" \ -+ -e "s,BLD/,$kpse_BLD/,g"` -+ PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e "s,BLD/,$kpse_BLD/,g"` -+ -+ PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -+ -e 's,BLD/,${top_builddir}/../../,g'` -+ PTEXENC_RULE='# Rebuild libptexenc -+$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS) -+${top_builddir}/../ptexenc/ptexenc.h: -+ cd ${top_builddir}/../../libs/ptexenc && $(MAKE) $(AM_MAKEFLAGS)' -+ - ## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags - - # Check whether --with-system-zlib was given. -@@ -25279,7 +25330,7 @@ - subdirs="$subdirs web2c" - - --ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile window/Makefile" -+ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile ptexdir/lib/Makefile omegafonts/Makefile otps/Makefile window/Makefile" - - - -@@ -25480,6 +25531,20 @@ - Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } - fi -+if test -z "${PTEX_TRUE}" && test -z "${PTEX_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"PTEX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"PTEX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+if test -z "${PTEX_SYNCTEX_TRUE}" && test -z "${PTEX_SYNCTEX_FALSE}"; then -+ { { $as_echo "$as_me:$LINENO: error: conditional \"PTEX_SYNCTEX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+$as_echo "$as_me: error: conditional \"PTEX_SYNCTEX\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - if test -z "${ALEPH_TRUE}" && test -z "${ALEPH_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ALEPH\" was never defined. - Usually this means the macro was only invoked conditionally." >&5 -@@ -26456,6 +26521,7 @@ - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; -+ "ptexdir/lib/Makefile") CONFIG_FILES="$CONFIG_FILES ptexdir/lib/Makefile" ;; - "omegafonts/Makefile") CONFIG_FILES="$CONFIG_FILES omegafonts/Makefile" ;; - "otps/Makefile") CONFIG_FILES="$CONFIG_FILES otps/Makefile" ;; - "window/Makefile") CONFIG_FILES="$CONFIG_FILES window/Makefile" ;; -Index: texk/web2c/lib/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/lib/Makefile.in -+++ texlive-20091011-source/texk/web2c/lib/Makefile.in -@@ -51,6 +51,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -189,6 +190,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/lib/texmfmp.c -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/lib/texmfmp.c -+++ texlive-20091011-source/texk/web2c/lib/texmfmp.c -@@ -50,6 +50,8 @@ - #include <luatexdir/luatexextra.h> - #elif defined (Aleph) - #include <alephdir/alephextra.h> -+#elif defined (pTeX) -+#include <ptexdir/ptexextra.h> - #else - #define BANNER "This is TeX, Version 3.1415926" - #define COPYRIGHT_HOLDER "D.E. Knuth" -@@ -591,6 +593,9 @@ - - /* Must be initialized before options are parsed. */ - interactionoption = 4; -+#ifdef pTeX -+ set_enc_string (NULL, "default"); -+#endif /* pTeX */ - - /* Have things to record as we go along. */ - kpse_record_input = recorder_record_input; -@@ -697,7 +702,7 @@ - if (mltexp) { - fprintf(stderr, "-mltex only works with -ini\n"); - } --#if !defined(XeTeX) -+#if !defined(XeTeX) && !defined(pTeX) - if (enctexp) { - fprintf(stderr, "-enc only works with -ini\n"); - } -@@ -1311,9 +1316,9 @@ - #endif /* IPC */ - #if !defined(Aleph) && !defined(luaTeX) - { "mltex", 0, &mltexp, 1 }, --#if !defined(XeTeX) -+#if !defined(XeTeX) && !defined(pTeX) - { "enc", 0, &enctexp, 1 }, --#endif /* !XeTeX */ -+#endif /* !XeTeX && !pTeX*/ - #endif /* !Aleph && !luaTeX */ - #if defined (eTeX) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX) || defined(luaTeX) - { "etex", 0, &etexp, 1 }, -@@ -1360,6 +1365,9 @@ - { "mktex", 1, 0, 0 }, - { "no-mktex", 1, 0, 0 }, - #endif /* TeX or MF */ -+#ifdef pTeX -+ { "kanji", 1, 0, 0 }, -+#endif /* pTeX */ - { 0, 0, 0, 0 } }; - - -@@ -1507,6 +1515,12 @@ - } else { - WARNING1 ("Ignoring unknown argument `%s' to --interaction", optarg); - } -+#ifdef pTeX -+ } else if (ARGUMENT_IS ("kanji")) { -+ if (!set_enc_string (optarg, NULL)) { -+ WARNING1 ("Ignoring unknown argument `%s' to --kanji", optarg); -+ } -+#endif /* pTeX */ - - } else if (ARGUMENT_IS ("help")) { - usagehelp (PROGRAM_HELP, BUG_ADDRESS); -@@ -2025,9 +2039,13 @@ - int i = EOF; - - /* Recognize either LF or CR as a line terminator. */ -+#ifdef pTeX -+ last = input_line2(f, buffer, first, bufsize, &i); -+#else /* pTeX */ - last = first; - while (last < bufsize && (i = getc (f)) != EOF && i != '\n' && i != '\r') - buffer[last++] = i; -+#endif /* pTeX */ - - if (i == EOF && errno != EINTR && last == first) - return false; -@@ -2062,6 +2080,11 @@ - buffer[i] = xord[buffer[i]]; - #endif - -+#ifdef pTeX -+ for (i = last+1; (i < last + 5 && i < bufsize) ; i++) -+ buffer[i] = '\0'; -+#endif /* pTeX */ -+ - return true; - } - #endif /* !XeTeX */ -Index: texk/web2c/ac/web2c.ac -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/ac/web2c.ac -+++ texlive-20091011-source/texk/web2c/ac/web2c.ac -@@ -28,9 +28,11 @@ - AS_HELP_STRING([--disable-omfonts], - [do not compile and install omfonts (use Web2C versions)], - kpse_indent_26))[]dnl -+dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS] - m4_define([kpse_tex_progs], [dnl - [[tex], [yes], [no], [TeX], []], - [[etex], [no], [yes], [e-TeX], []], -+[[ptex], [yes], [no], [pTeX], [ptexenc]], - [[aleph], [yes], [no], [Aleph], []], - [[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]], - [[luatex], [yes], [no], [luaTeX], [xpdf libpng obsdcompat]], -Index: texk/web2c/otps/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/otps/Makefile.in -+++ texlive-20091011-source/texk/web2c/otps/Makefile.in -@@ -56,6 +56,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -231,6 +232,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/omegafonts/Makefile.in -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/omegafonts/Makefile.in -+++ texlive-20091011-source/texk/web2c/omegafonts/Makefile.in -@@ -54,6 +54,7 @@ - $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ - $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ - $(top_srcdir)/../../m4/kpse-obsdcompat-flags.m4 \ -+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ - $(top_srcdir)/../../m4/kpse-socket-libs.m4 \ - $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \ - $(top_srcdir)/../../m4/kpse-warnings.m4 \ -@@ -208,6 +209,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ -+PTEXENC_DEPEND = @PTEXENC_DEPEND@ -+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ -+PTEXENC_LIBS = @PTEXENC_LIBS@ - RANLIB = @RANLIB@ - SED = @SED@ - SET_MAKE = @SET_MAKE@ -Index: texk/web2c/web2c/convert -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/web2c/convert -+++ texlive-20091011-source/texk/web2c/web2c/convert -@@ -53,6 +53,12 @@ - midcmd="| sed -f $srcdir/web2c/cvtbib.sed" - ;; - -+ pbibtex) -+ midcmd="| sed -f $srcdir/web2c/cvtbib.sed" -+ more_defines="$srcdir/ptexdir/pbibtex.defines" -+ hfile=ptexdir/kanji.h -+ ;; -+ - mf) - more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines" - precmd="| sed -f $srcdir/web2c/cvtmf1.sed" -@@ -66,7 +72,7 @@ - ${basefile}coerce.h" - ;; - -- tex|etex|pdftex|aleph|xetex) -+ tex|etex|pdftex|aleph|xetex|ptex) - more_defines="$srcdir/web2c/texmf.defines $srcdir/synctexdir/synctex.defines" - prog_defines="$srcdir/${basefile}dir/$basefile.defines" - if test -f $prog_defines; then -@@ -98,6 +104,11 @@ - output_files="$basefile[0-9].c ${basefile}ini.c ${basefile}d.h \ - ${basefile}coerce.h" - ;; -+ -+ ptftopl|ppltotf|pdvitype) -+ more_defines="$srcdir/ptexdir/ptex.defines" -+ hfile=ptexdir/kanji.h -+ ;; - esac - - # Do it. -@@ -125,11 +136,11 @@ - fi - - case $basefile in -- bibtex) -- sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <bibtex.h >xbibtex.h -- mv xbibtex.h bibtex.h -+ bibtex|pbibtex) -+ sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <${basefile}.h >x${basefile}.h -+ mv x${basefile}.h ${basefile}.h - ;; -- tex|etex|luatex|pdftex|aleph|mf|xetex) -+ tex|etex|luatex|pdftex|aleph|mf|xetex|ptex) - sleep 2 # so timestamps are definitely later, to avoid make weirdness - cat $srcdir/web2c/coerce.h >>${basefile}coerce.h - touch ${basefile}d.h -Index: texk/web2c/web2c/splitup.c -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/web2c/splitup.c -+++ texlive-20091011-source/texk/web2c/web2c/splitup.c -@@ -130,6 +130,9 @@ - } else if (STREQ (output_name, "xetex")) { - fputs ("#define INITEX\n#define TeX\n#define XeTeX\n", out); - coerce = "xetexcoerce.h"; -+ } else if (STREQ (output_name, "ptex")) { -+ fputs ("#define INITEX\n#define TeX\n#define pTeX\n", out); -+ coerce = "ptexcoerce.h"; - } else if (STREQ (output_name, "mp")) { - fputs ("#define INIMP\n#define MP\n", out); - coerce = "mpcoerce.h"; -Index: texk/web2c/Makefile.am -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/Makefile.am -+++ texlive-20091011-source/texk/web2c/Makefile.am -@@ -136,6 +136,9 @@ - ## e-TeX - include $(srcdir)/etexdir/am/etex.am - -+## pTeX -+include $(srcdir)/ptexdir/am/ptex.am -+ - ## pdfTeX - include $(srcdir)/pdftexdir/am/pdftex.am - include $(srcdir)/pdftexdir/am/libpdftex.am -Index: texk/web2c/aclocal.m4 -=================================================================== ---- texlive-20091011-source.orig/texk/web2c/aclocal.m4 -+++ texlive-20091011-source/texk/web2c/aclocal.m4 -@@ -1002,6 +1002,7 @@ - m4_include([../../m4/kpse-libpng-flags.m4]) - m4_include([../../m4/kpse-macos-framework.m4]) - m4_include([../../m4/kpse-obsdcompat-flags.m4]) -+m4_include([../../m4/kpse-ptexenc-flags.m4]) - m4_include([../../m4/kpse-socket-libs.m4]) - m4_include([../../m4/kpse-teckit-flags.m4]) - m4_include([../../m4/kpse-warnings.m4]) diff --git a/Build/source/texk/ptexenc/patches/texlive2009.sh b/Build/source/texk/ptexenc/patches/texlive2009.sh deleted file mode 100644 index faee526dd75..00000000000 --- a/Build/source/texk/ptexenc/patches/texlive2009.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Attatch patch for ptex-src-3.1.11 under TeX Live 2009. -# - -echo ${PATCH:=patch} > /dev/null -echo ${CP:=cp -fp} > /dev/null -echo ${RM:=rm -f} > /dev/null -echo ${MV:=mv -f} > /dev/null - -## check - -if test ! -d kpathsea; then - cat <<-EOF - - This script should be executed under 'texk'. - Excute as following. - - cd /your/path/to/texk - ./ptexenc/patches/texlive2009.sh - -EOF - exit 1 -fi - -if grep "2009 TeX Users Group" ../README > /dev/null; then - echo "dummy" > /dev/null -else - echo "This is for TeX Live 2009." - exit 1 -fi - -## for ptexenc - -$PATCH -p1 -d .. < ptexenc/patches/texlive2009-ptexenc.patch || exit - -## for ptex - -(cd web2c/ptexdir -mkdir lib am -$RM Makefile.in ptexextra.c version.c mkconf pconvert configure \ - jbibextra.* jbibd.sed usage.c -sed -e s/etex/ptex/g -e s/@ETEX@/@JPTEX@/g ../etexdir/etex.mk > ptex.mk -sed -e 's/e-*tex/ptex/g' -e 's/e-*TeX/pTeX/g' -e s/etrip/ptrip/g \ - ../etexdir/am/etex.am > am/ptex.am -$CP ../lib/openclose.c lib -$CP ../lib/printversion.c lib -$CP ../lib/usage.c lib -$MV kanji.h.in kanji.h -$MV kanji.defines ptex.defines -$MV ptexextra.h ptexextra.in -$MV jbibtex.ch pbibtex.ch -$MV jbibtex.defines pbibtex.defines -$MV pltotf.ch ppltotf.ch -$MV tftopl.ch ptftopl.ch -) - -$PATCH -p1 -d web2c/ptexdir < ptexenc/patches/ptex-src-3.1.11-ptexenc.patch || exit - -## for mendex -if test -d mendexk; then - $CP makeindexk/configure mendexk/ - $CP makeindexk/Makefile.in mendexk/ - $CP makeindexk/Makefile.am mendexk/ - $CP makeindexk/aclocal.m4 mendexk/ - $PATCH -p1 -d mendexk < ptexenc/patches/mendexk2.6f-ptexenc.patch || exit -fi - -## for makejvf -if test -d makejvf; then - $CP makeindexk/configure makejvf/ - $CP makeindexk/Makefile.in makejvf/ - $CP makeindexk/Makefile.am makejvf/ - $CP makeindexk/aclocal.m4 makejvf/ - $PATCH -p1 -d makejvf < ptexenc/patches/makejvf-1.1a-ptexenc.patch || exit -fi diff --git a/Build/source/texk/ptexenc/kanjicnv.h b/Build/source/texk/ptexenc/ptexenc/kanjicnv.h index 4893389a527..4893389a527 100644 --- a/Build/source/texk/ptexenc/kanjicnv.h +++ b/Build/source/texk/ptexenc/ptexenc/kanjicnv.h diff --git a/Build/source/texk/ptexenc/ptexenc.h b/Build/source/texk/ptexenc/ptexenc/ptexenc.h index 3fc2fe2711e..3fc2fe2711e 100644 --- a/Build/source/texk/ptexenc/ptexenc.h +++ b/Build/source/texk/ptexenc/ptexenc/ptexenc.h diff --git a/Build/source/texk/ptexenc/unicode-jp.h b/Build/source/texk/ptexenc/ptexenc/unicode-jp.h index 6d583ac53d5..6d583ac53d5 100644 --- a/Build/source/texk/ptexenc/unicode-jp.h +++ b/Build/source/texk/ptexenc/ptexenc/unicode-jp.h diff --git a/Build/source/texk/ptexenc/unicode.h b/Build/source/texk/ptexenc/ptexenc/unicode.h index b3e1d5ee83c..b3e1d5ee83c 100644 --- a/Build/source/texk/ptexenc/unicode.h +++ b/Build/source/texk/ptexenc/ptexenc/unicode.h diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index fccd99114c0..2b9e3da7f3d 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Fix the lib/libp.a rebuild rule. + 2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de> * cpascal.h (BIBXRETALLOCNOSET, BIBXRETALLOCSTRING): Cast size_t diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 983ac742764..9da3593352f 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -76,7 +76,7 @@ web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c # Rebuild $(proglib) $(proglib): ${srcdir}/lib/*.c - cd lib && $(MAKE) $(AM_MAKEFLAGS) + cd lib && $(MAKE) $(AM_MAKEFLAGS) lib.a ## Rebuild libkpathsea @KPATHSEA_RULE@ ## Rebuild libz diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 64007cbf543..b203af932f4 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -8649,7 +8649,7 @@ web2c/stamp-makecpool: $(web2c_common) ${srcdir}/web2c/makecpool.c # Rebuild $(proglib) $(proglib): ${srcdir}/lib/*.c - cd lib && $(MAKE) $(AM_MAKEFLAGS) + cd lib && $(MAKE) $(AM_MAKEFLAGS) lib.a @KPATHSEA_RULE@ @ZLIB_RULE@ @LIBPNG_RULE@ @@ -8986,7 +8986,7 @@ etrip-clean: rm -rf tfm # Rebuild $(pproglib) $(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c - cd lib && $(MAKE) $(AM_MAKEFLAGS) + cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a @PTEXENC_RULE@ $(ptex_OBJECTS): $(ptex_prereq) diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index cf2154028bb..d4d6389bbed 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -21232,7 +21232,7 @@ if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; th PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" fi else - PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \ + PTEXENC_INCLUDES=`echo '-IBLD/texk/ptexenc -ISRC/texk/ptexenc' | sed \ -e "s,SRC/,$kpse_SRC/,g" \ -e "s,BLD/,$kpse_BLD/,g"` PTEXENC_LIBS=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ @@ -21241,9 +21241,7 @@ else PTEXENC_DEPEND=`echo 'BLD/texk/ptexenc/libptexenc.la' | sed \ -e 's,BLD/texk/,${top_builddir}/../,g'` PTEXENC_RULE='# Rebuild libptexenc -$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/ptexenc.h - cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../ptexenc/ptexenc.h: +$(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc/*.h cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi diff --git a/Build/source/texk/web2c/lib/Makefile.am b/Build/source/texk/web2c/lib/Makefile.am index 8488b4e98bf..87a5ff67a60 100644 --- a/Build/source/texk/web2c/lib/Makefile.am +++ b/Build/source/texk/web2c/lib/Makefile.am @@ -3,7 +3,8 @@ ## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## -INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) +INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) ## Rebuild libkpathsea @@ -37,7 +38,7 @@ lib_a_SOURCES = \ ## Replacements for pTeX. ## -libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES) +libp_a_CPPFLAGS = -DPTEX $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) libp_a_SOURCES = \ openclose.c \ printversion.c diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 4a2a8917a7a..2123cb28f36 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -297,7 +297,8 @@ top_srcdir = @top_srcdir@ wlibs = @wlibs@ x_ext_lib = @x_ext_lib@ x_tool_libs = @x_tool_libs@ -INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) +INCLUDES = -I$(top_srcdir) +AM_CPPFLAGS = $(KPATHSEA_INCLUDES) AM_CFLAGS = $(WARNING_CFLAGS) noinst_LIBRARIES = lib.a $(am__append_1) EXTRA_LIBRARIES = libp.a @@ -319,7 +320,7 @@ lib_a_SOURCES = \ version.c \ zround.c -libp_a_CPPFLAGS = -DPTEX $(ENCTEX_INCLUDES) +libp_a_CPPFLAGS = -DPTEX $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) libp_a_SOURCES = \ openclose.c \ printversion.c diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index fe47255862c..95ea697c403 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2010-05-21 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/ptex.am: Fix the lib/libp.a rebuild rule. + 2010-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> * nissya.test (new): Shell script for pBibTeX test using kanji. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index b253e1eebef..dfb8f285593 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -27,7 +27,7 @@ DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \ pproglib = lib/libp.a # Rebuild $(pproglib) $(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c - cd lib && $(MAKE) $(AM_MAKEFLAGS) + cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a ## Rebuild libptexenc @PTEXENC_RULE@ |