summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-14 14:23:26 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-08-14 14:23:26 +0000
commiteeefc6bc7d0b3af828a0c623ff63020b19d3bdcd (patch)
treebba70e0540f6b6149b1e29c5c5ff9615a6924636
parent9ab7c0f8a5cfedd0f440ee28479755646a521f3f (diff)
upTeX and e-upTeX (preliminary)
git-svn-id: svn://tug.org/texlive/trunk@23549 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/configure46
-rwxr-xr-xBuild/source/libs/configure46
-rwxr-xr-xBuild/source/texk/configure46
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rwxr-xr-xBuild/source/texk/kpathsea/configure26
-rw-r--r--Build/source/texk/kpathsea/version.ac2
-rw-r--r--Build/source/texk/ptexenc/ChangeLog.TL5
-rw-r--r--Build/source/texk/ptexenc/ptexenc.c2
-rw-r--r--Build/source/texk/ptexenc/ptexenc/ptexenc.h1
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst2
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.am6
-rw-r--r--Build/source/texk/web2c/Makefile.in796
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac18
-rwxr-xr-xBuild/source/texk/web2c/configure116
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL6
-rw-r--r--Build/source/texk/web2c/eptexdir/am/eptex.am16
-rw-r--r--Build/source/texk/web2c/eptexdir/eptex.ech18
-rw-r--r--Build/source/texk/web2c/eptexdir/eptexextra.h3
-rw-r--r--Build/source/texk/web2c/eptexdir/etex.ch112
-rw-r--r--Build/source/texk/web2c/eptexdir/fam256.ch3
-rw-r--r--Build/source/texk/web2c/eptexdir/pdfsavepos.ch6
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am111
-rw-r--r--Build/source/texk/web2c/euptexdir/euptex.ch037
-rw-r--r--Build/source/texk/web2c/euptexdir/euptex.ch127
-rw-r--r--Build/source/texk/web2c/euptexdir/euptex.defines49
-rw-r--r--Build/source/texk/web2c/euptexdir/euptexextra.c11
-rw-r--r--Build/source/texk/web2c/euptexdir/euptexextra.h27
-rw-r--r--Build/source/texk/web2c/euptexdir/fam256-eup.ch5
-rw-r--r--Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch5
-rw-r--r--Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch26
-rw-r--r--Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-pre.ch17
-rw-r--r--Build/source/texk/web2c/lib/ChangeLog6
-rw-r--r--Build/source/texk/web2c/lib/texmfmp.c170
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/ptexdir/kanji.h21
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch3
-rw-r--r--Build/source/texk/web2c/synctexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am62
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-euptex.h57
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-uptex.h57
-rw-r--r--Build/source/texk/web2c/texmfmem.h6
-rw-r--r--Build/source/texk/web2c/texmfmp-help.h103
-rw-r--r--Build/source/texk/web2c/texmfmp.h8
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am86
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.c364
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.h58
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex-m.ch1209
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex.defines48
-rw-r--r--Build/source/texk/web2c/uptexdir/uptexextra.c11
-rw-r--r--Build/source/texk/web2c/uptexdir/uptexextra.h25
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog4
-rwxr-xr-xBuild/source/texk/web2c/web2c/convert4
-rw-r--r--Build/source/texk/web2c/web2c/splitup.c8
-rwxr-xr-xBuild/source/utils/configure46
55 files changed, 3543 insertions, 324 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 28f0dde57d3..715d91a1fd8 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -788,6 +788,10 @@ enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
+enable_uptex
+enable_uptex_synctex
+enable_euptex
+enable_euptex_synctex
enable_aleph
enable_pdftex
enable_pdftex_synctex
@@ -1585,6 +1589,10 @@ Optional Features:
--disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
+ --disable-uptex do not compile and install upTeX
+ --disable-uptex-synctex build upTeX without SyncTeX support
+ --disable-euptex do not compile and install e-upTeX
+ --disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
@@ -4214,6 +4222,44 @@ fi
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
+# Check whether --enable-uptex was given.
+if test "${enable_uptex+set}" = set; then :
+ enableval=$enable_uptex;
+fi
+case $enable_uptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_uptex=yes ;;
+esac
+
+# Check whether --enable-uptex-synctex was given.
+if test "${enable_uptex_synctex+set}" = set; then :
+ enableval=$enable_uptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_uptex" = xyes:yes && {
+ need_ptexenc=yes
+}
+# Check whether --enable-euptex was given.
+if test "${enable_euptex+set}" = set; then :
+ enableval=$enable_euptex;
+fi
+case $enable_euptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_euptex=yes ;;
+esac
+
+# Check whether --enable-euptex-synctex was given.
+if test "${enable_euptex_synctex+set}" = set; then :
+ enableval=$enable_euptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_euptex" = xyes:yes && {
+ need_ptexenc=yes
+}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 110566bbd54..0e36c89b340 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -699,6 +699,10 @@ enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
+enable_uptex
+enable_uptex_synctex
+enable_euptex
+enable_euptex_synctex
enable_aleph
enable_pdftex
enable_pdftex_synctex
@@ -1485,6 +1489,10 @@ Optional Features:
--disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
+ --disable-uptex do not compile and install upTeX
+ --disable-uptex-synctex build upTeX without SyncTeX support
+ --disable-euptex do not compile and install e-upTeX
+ --disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
@@ -3547,6 +3555,44 @@ fi
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
+# Check whether --enable-uptex was given.
+if test "${enable_uptex+set}" = set; then :
+ enableval=$enable_uptex;
+fi
+case $enable_uptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_uptex=yes ;;
+esac
+
+# Check whether --enable-uptex-synctex was given.
+if test "${enable_uptex_synctex+set}" = set; then :
+ enableval=$enable_uptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_uptex" = xyes:yes && {
+ need_ptexenc=yes
+}
+# Check whether --enable-euptex was given.
+if test "${enable_euptex+set}" = set; then :
+ enableval=$enable_euptex;
+fi
+case $enable_euptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_euptex=yes ;;
+esac
+
+# Check whether --enable-euptex-synctex was given.
+if test "${enable_euptex_synctex+set}" = set; then :
+ enableval=$enable_euptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_euptex" = xyes:yes && {
+ need_ptexenc=yes
+}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index cc9acb1f888..2522a02e72f 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -699,6 +699,10 @@ enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
+enable_uptex
+enable_uptex_synctex
+enable_euptex
+enable_euptex_synctex
enable_aleph
enable_pdftex
enable_pdftex_synctex
@@ -1505,6 +1509,10 @@ Optional Features:
--disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
+ --disable-uptex do not compile and install upTeX
+ --disable-uptex-synctex build upTeX without SyncTeX support
+ --disable-euptex do not compile and install e-upTeX
+ --disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
@@ -3567,6 +3575,44 @@ fi
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
+# Check whether --enable-uptex was given.
+if test "${enable_uptex+set}" = set; then :
+ enableval=$enable_uptex;
+fi
+case $enable_uptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_uptex=yes ;;
+esac
+
+# Check whether --enable-uptex-synctex was given.
+if test "${enable_uptex_synctex+set}" = set; then :
+ enableval=$enable_uptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_uptex" = xyes:yes && {
+ need_ptexenc=yes
+}
+# Check whether --enable-euptex was given.
+if test "${enable_euptex+set}" = set; then :
+ enableval=$enable_euptex;
+fi
+case $enable_euptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_euptex=yes ;;
+esac
+
+# Check whether --enable-euptex-synctex was given.
+if test "${enable_euptex_synctex+set}" = set; then :
+ enableval=$enable_euptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_euptex" = xyes:yes && {
+ need_ptexenc=yes
+}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index e5478fa7a67..e86c0a9356a 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * version.ac: Update version number 6.0.2dev => 6.1.0dev.
+
2011-08-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (SUBDIRS): Add win32 to build C programs from
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 20fac4388ee..5d6a676b51a 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Kpathsea 6.0.2dev.
+# Generated by GNU Autoconf 2.68 for Kpathsea 6.1.0dev.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.0.2dev'
-PACKAGE_STRING='Kpathsea 6.0.2dev'
+PACKAGE_VERSION='6.1.0dev'
+PACKAGE_STRING='Kpathsea 6.1.0dev'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1308,7 +1308,7 @@ if test "$ac_init_help" = "long"; then
# 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 Kpathsea 6.0.2dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.1.0dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1378,7 +1378,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.0.2dev:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.1.0dev:";;
esac
cat <<\_ACEOF
@@ -1494,7 +1494,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.0.2dev
+Kpathsea configure 6.1.0dev
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2020,7 +2020,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.0.2dev, which was
+It was created by Kpathsea $as_me 6.1.0dev, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2401,12 +2401,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-KPSEVERSION=6.0.2dev
+KPSEVERSION=6.1.0dev
-$as_echo "#define KPSEVERSION \"kpathsea version 6.0.2dev\"" >>confdefs.h
+$as_echo "#define KPSEVERSION \"kpathsea version 6.1.0dev\"" >>confdefs.h
-KPSE_LT_VERSINFO=6:2:0
+KPSE_LT_VERSINFO=7:0:1
am__api_version='1.11'
@@ -7381,7 +7381,7 @@ fi
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.0.2dev'
+ VERSION='6.1.0dev'
cat >>confdefs.h <<_ACEOF
@@ -13485,7 +13485,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.0.2dev, which was
+This file was extended by Kpathsea $as_me 6.1.0dev, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13551,7 +13551,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Kpathsea config.status 6.0.2dev
+Kpathsea config.status 6.1.0dev
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac
index 57449a852ad..837485cca92 100644
--- a/Build/source/texk/kpathsea/version.ac
+++ b/Build/source/texk/kpathsea/version.ac
@@ -21,4 +21,4 @@ dnl append "dev", to distinguish binaries built between releases.
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current kpathsea version
-m4_define([kpse_version], [6.0.2dev])
+m4_define([kpse_version], [6.1.0dev])
diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL
index e7d3bae15fe..c0123ad83bd 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
===============================================
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Add support for upTeX and e-upTeX.
+ * ptexenc/ptexenc.h, ptexenc.c: Export fromUCS().
+
2011-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* version.ac: New file defining the ptexenc version.
diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c
index 50504d579ef..7597b2b37a9 100644
--- a/Build/source/texk/ptexenc/ptexenc.c
+++ b/Build/source/texk/ptexenc/ptexenc.c
@@ -256,7 +256,7 @@ long fromKUTEN(long kcode)
/* UCS to internal (EUC/SJIS) code conversion */
-static long fromUCS(long kcode)
+long fromUCS(long kcode)
{
kcode = UCS2toJIS(kcode);
if (kcode == 0) return 0;
diff --git a/Build/source/texk/ptexenc/ptexenc/ptexenc.h b/Build/source/texk/ptexenc/ptexenc/ptexenc.h
index e28ff78c64a..a780045e18d 100644
--- a/Build/source/texk/ptexenc/ptexenc/ptexenc.h
+++ b/Build/source/texk/ptexenc/ptexenc/ptexenc.h
@@ -55,6 +55,7 @@ extern PTENCDLL long fromJIS(long jis);
extern PTENCDLL long fromEUC(long euc);
extern PTENCDLL long fromSJIS(long sjis);
extern PTENCDLL long fromKUTEN(long kuten);
+extern PTENCDLL long fromUCS (long ucs);
extern PTENCDLL long toUCS(long kcode);
/* fputs/putc with encoding conversion */
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 57fb33bd5ba..5c57c4809ac 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -1,2 +1,2 @@
texmf_scripts='simpdftex/simpdftex a2ping/a2ping.pl tetex/e2pall.pl tetex/texdoctk.pl texdoc/texdoc.tlu texlive/rungs.tlu texlive/tlmgr.pl'
-texmf_dist_scripts='bibexport/bibexport.sh installfont/installfont-tl listings-ext/listings-ext.sh pdfjam/pdf180 pdfjam/pdf270 pdfjam/pdf90 pdfjam/pdfbook pdfjam/pdfflip pdfjam/pdfjam pdfjam/pdfjam-pocketmod pdfjam/pdfjam-slides3up pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun pst-pdf/ps4pdf accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl authorindex/authorindex bundledoc/arlatex bundledoc/bundledoc cachepic/cachepic.tlu context/perl/mptopdf.pl de-macro/de-macro dviasm/dviasm.py ebong/ebong.py epspdf/epspdf.rb epspdf/epspdftk.tcl epstopdf/epstopdf.pl fig4latex/fig4latex findhyph/findhyph fontools/afm2afm fontools/autoinst fontools/cmap2enc fontools/font2afm fontools/ot2kpx fontools/pfm2kpx fontools/showglyphs fragmaster/fragmaster.pl glossaries/makeglossaries latex2man/latex2man latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua mathspic/mathspic.pl mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex musixtex/musixflx.lua musixtex/musixtex.lua oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper pst2pdf/pst2pdf purifyeps/purifyeps splitindex/perl/splitindex.pl sty2dtx/sty2dtx.pl svn-multi/svn-multi.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl ulqda/ulqda.pl urlbst/urlbst vpe/vpe.pl'
+texmf_dist_scripts='bibexport/bibexport.sh installfont/installfont-tl listings-ext/listings-ext.sh pdfjam/pdf180 pdfjam/pdf270 pdfjam/pdf90 pdfjam/pdfbook pdfjam/pdfflip pdfjam/pdfjam pdfjam/pdfjam-pocketmod pdfjam/pdfjam-slides3up pdfjam/pdfjam-slides6up pdfjam/pdfjoin pdfjam/pdfnup pdfjam/pdfpun pst-pdf/ps4pdf accfonts/mkt1font accfonts/vpl2ovp accfonts/vpl2vpl authorindex/authorindex bundledoc/arlatex bundledoc/bundledoc cachepic/cachepic.tlu context/perl/mptopdf.pl de-macro/de-macro dviasm/dviasm.py ebong/ebong.py epspdf/epspdf.rb epspdf/epspdftk.tcl epstopdf/epstopdf.pl fig4latex/fig4latex findhyph/findhyph fontools/afm2afm fontools/autoinst fontools/cmap2enc fontools/font2afm fontools/ot2kpx fontools/pfm2kpx fontools/showglyphs fragmaster/fragmaster.pl glossaries/makeglossaries latex2man/latex2man latexdiff/latexdiff.pl latexdiff/latexdiff-vc.pl latexdiff/latexrevise.pl latexmk/latexmk.pl luaotfload/mkluatexfontdb.lua match_parens/match_parens mathspic/mathspic.pl mf2pt1/mf2pt1.pl mkjobtexmf/mkjobtexmf.pl mkgrkindex/mkgrkindex musixtex/musixflx.lua musixtex/musixtex.lua oberdiek/pdfatfi.pl pax/pdfannotextractor.pl pdfcrop/pdfcrop.pl perltex/perltex.pl pkfix/pkfix.pl pkfix-helper/pkfix-helper pst2pdf/pst2pdf purifyeps/purifyeps splitindex/perl/splitindex.pl sty2dtx/sty2dtx.pl svn-multi/svn-multi.pl texcount/texcount.pl texdef/texdef.pl texdiff/texdiff texdirflatten/texdirflatten texloganalyser/texloganalyser thumbpdf/thumbpdf.pl ulqda/ulqda.pl urlbst/urlbst vpe/vpe.pl'
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 459c5f02e11..81714872132 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, texmfmem.h, texmfmp.h, texmfmp-help.h,
+ ac/web2c.ac: Add support for upTeX and e-upTeX.
+
2011-07-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* mft.ch (parsearguments): Allow find_suffix() to return a
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index ecaa3adb4c4..4f105df3392 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -173,6 +173,12 @@ include $(srcdir)/ptexdir/am/ptex.am
## e-pTeX
include $(srcdir)/eptexdir/am/eptex.am
+## upTeX
+include $(srcdir)/uptexdir/am/uptex.am
+
+## e-upTeX
+include $(srcdir)/euptexdir/am/euptex.am
+
## pdfTeX
include $(srcdir)/pdftexdir/am/pdftex.am
include $(srcdir)/pdftexdir/am/libpdftex.am
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index fd8484d9b65..30b1bc70b2c 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -36,10 +36,10 @@ build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
mf-nowin$(EXEEXT) mpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) \
- $(am__EXEEXT_2) eptex$(EXEEXT) pdftex$(EXEEXT) \
- ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
- txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_5) \
- aleph$(EXEEXT)
+ $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) euptex$(EXEEXT) \
+ pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ luatex$(EXEEXT) txt2zlib$(EXEEXT) xetex$(EXEEXT) \
+ $(am__EXEEXT_5) aleph$(EXEEXT)
bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \
ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_7) \
$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
@@ -47,18 +47,18 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_6) \
$(am__EXEEXT_14) $(am__EXEEXT_15) $(am__EXEEXT_16) \
$(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \
$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
- synctex$(EXEEXT)
+ $(am__EXEEXT_23) $(am__EXEEXT_24) synctex$(EXEEXT)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_30) $(am__EXEEXT_31)
-check_PROGRAMS = $(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
- $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
- $(am__EXEEXT_29) md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_34) ctiedir/ctie.test \
+ $(am__EXEEXT_32) $(am__EXEEXT_33)
+check_PROGRAMS = $(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27) \
+ $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \
+ $(am__EXEEXT_31) md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_36) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_14) $(am__append_23) $(am__append_28) \
$(am__append_34) $(am__append_38) $(am__append_40) \
- $(am__append_45) $(am__append_52) $(am__append_66) \
- $(am__append_69) $(am__append_70) libmd5/md5.test
+ $(am__append_47) $(am__append_54) $(am__append_68) \
+ $(am__append_71) $(am__append_72) libmd5/md5.test
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/config.guess \
$(srcdir)/../../build-aux/config.sub \
@@ -71,7 +71,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \
$(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \
$(srcdir)/eptexdir/am/eptex.am $(srcdir)/etexdir/am/etex.am \
- $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/liblua51.am \
+ $(srcdir)/euptexdir/am/euptex.am $(srcdir)/libmd5/am/md5.am \
+ $(srcdir)/luatexdir/am/liblua51.am \
$(srcdir)/luatexdir/am/libluatex.am \
$(srcdir)/luatexdir/am/luafontforge.am \
$(srcdir)/luatexdir/am/luamisc.am \
@@ -86,8 +87,8 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/pdftexdir/am/pdftosrc.am \
$(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/ptexdir/am/ptex.am \
$(srcdir)/synctexdir/am/synctex.am $(srcdir)/tangle-sh.in \
- $(srcdir)/web2c-sh.in $(srcdir)/xetexdir/am/xetex.am \
- $(top_srcdir)/configure \
+ $(srcdir)/uptexdir/am/uptex.am $(srcdir)/web2c-sh.in \
+ $(srcdir)/xetexdir/am/xetex.am $(top_srcdir)/configure \
$(top_srcdir)/luatexdir/luafontloader/ff-config.in \
../../build-aux/config.guess ../../build-aux/config.sub \
../../build-aux/depcomp ../../build-aux/install-sh \
@@ -137,35 +138,37 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@EPTEX_TRUE@am__append_41 = dvitype pltotf tftopl
@EPTEX_TRUE@am__append_42 = eptrip.diffs
@EPTEX_TRUE@am__append_43 = eptrip-clean
-@PDFTEX_TRUE@am__append_44 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_45 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_46 = \
+@UPTEX_TRUE@am__append_44 = uptex
+@EUPTEX_TRUE@am__append_45 = euptex
+@PDFTEX_TRUE@am__append_46 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_47 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_48 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
-@LUATEX_TRUE@am__append_47 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_48 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_49 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_50 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_51 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUATEX_TRUE@am__append_52 = $(luatex_tests)
-@MINGW32_FALSE@am__append_53 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_54 = xetex
-@XETEX_MACOSX_TRUE@am__append_55 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_56 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_57 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
+@LUATEX_TRUE@am__append_49 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_50 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_51 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_52 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_53 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUATEX_TRUE@am__append_54 = $(luatex_tests)
+@MINGW32_FALSE@am__append_55 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_56 = xetex
+@XETEX_MACOSX_TRUE@am__append_57 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_58 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_59 = -DXETEX_OTHER $(POPPLER_INCLUDES) \
@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_58 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_59 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_60 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_61 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_62 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_63 = \
+@XETEX_MACOSX_FALSE@am__append_60 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_61 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_62 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_63 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_64 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_65 = \
@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_64 = \
+@XETEX_MACOSX_FALSE@am__append_66 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \
@@ -182,74 +185,96 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.h
-@XETEX_GRAPHITE_TRUE@am__append_65 = \
+@XETEX_GRAPHITE_TRUE@am__append_67 = \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h
-@XETEX_TRUE@am__append_66 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_67 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_68 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_69 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_70 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_71 = pltotf tftopl
-@ALEPH_TRUE@am__append_72 = aleph
-@TEX_SYNCTEX_TRUE@am__append_73 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_68 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_69 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_70 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_71 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_72 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_73 = pltotf tftopl
+@ALEPH_TRUE@am__append_74 = aleph
+@TEX_SYNCTEX_TRUE@am__append_75 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_74 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_75 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_76 = \
+@TEX_SYNCTEX_TRUE@am__append_76 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_77 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_78 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
-@ETEX_SYNCTEX_TRUE@am__append_77 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_79 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_79 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_80 = \
+@ETEX_SYNCTEX_TRUE@am__append_80 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_81 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_82 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
-@PTEX_SYNCTEX_TRUE@am__append_81 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_83 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_82 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_83 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_84 = \
+@PTEX_SYNCTEX_TRUE@am__append_84 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_85 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_86 = \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-@EPTEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_87 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
+@UPTEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_89 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_90 = \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
+
+@EPTEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_88 = \
+@EPTEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_93 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_94 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
-@PDFTEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_95 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
+@EUPTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_97 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_98 = \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
+
+@PDFTEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_90 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_100 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
-@XETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_92 = \
+@XETEX_SYNCTEX_TRUE@am__append_102 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@@ -505,6 +530,10 @@ am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \
libpdftex_a-writettf.$(OBJEXT) libpdftex_a-writezip.$(OBJEXT) \
$(am__objects_6)
libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
+libukanji_a_AR = $(AR) $(ARFLAGS)
+libukanji_a_LIBADD =
+am_libukanji_a_OBJECTS = libukanji_a-kanji.$(OBJEXT)
+libukanji_a_OBJECTS = $(am_libukanji_a_OBJECTS)
libxetex_a_AR = $(AR) $(ARFLAGS)
libxetex_a_LIBADD =
am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \
@@ -579,28 +608,30 @@ am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4)
@PTEX_TRUE@am__EXEEXT_14 = ptex$(EXEEXT)
@PWEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2)
@EPTEX_TRUE@am__EXEEXT_16 = eptex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_17 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@UPTEX_TRUE@am__EXEEXT_17 = uptex$(EXEEXT)
+@EUPTEX_TRUE@am__EXEEXT_18 = euptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_19 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_18 = luatex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_19 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_20 = $(am__EXEEXT_3)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_21 = $(am__EXEEXT_4)
-@ALEPH_TRUE@am__EXEEXT_22 = aleph$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_20 = luatex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_21 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_22 = $(am__EXEEXT_3)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_23 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_24 = aleph$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man5dir)"
-@TEX_TRUE@am__EXEEXT_23 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@TEX_TRUE@am__EXEEXT_25 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@TEX_TRUE@ tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_24 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_25 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_26 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_27 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@ETEX_TRUE@ tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_27 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@PTEX_TRUE@ tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_30 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@EPTEX_TRUE@ tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_29 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_30 = call_mpost$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_31 = call_luatex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_31 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_32 = call_mpost$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_33 = call_luatex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \
aleph-alephextra.$(OBJEXT)
@@ -667,6 +698,19 @@ etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_4)
+am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \
+ euptexdir/euptexextra.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-euptex.h
+@EUPTEX_SYNCTEX_TRUE@am__objects_15 = euptex-synctex.$(OBJEXT)
+dist_euptex_OBJECTS = euptex-euptexextra.$(OBJEXT) $(am__objects_15)
+am__objects_16 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_16) euptex-euptex-pool.$(OBJEXT)
+euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
+@EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+euptex_DEPENDENCIES = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_5)
am_gftodvi_OBJECTS =
nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -688,7 +732,7 @@ initex_OBJECTS = $(am_initex_OBJECTS)
initex_DEPENDENCIES =
am_luatex_OBJECTS = luatex-luatex.$(OBJEXT)
luatex_OBJECTS = $(am_luatex_OBJECTS)
-am__DEPENDENCIES_5 = libluatex.a libff.a libluamisc.a libluasocket.a \
+am__DEPENDENCIES_6 = libluatex.a libff.a libluamisc.a libluasocket.a \
liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a libmplib.a
@@ -700,12 +744,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS)
md5main_DEPENDENCIES = libmd5.a
dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
mf_OBJECTS = $(dist_mf_OBJECTS)
-@WIN32_FALSE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1)
mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
@@ -713,8 +757,8 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_15 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_15)
+am__objects_17 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_17)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
@@ -751,19 +795,19 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am_pbibtex_OBJECTS =
nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
-am__DEPENDENCIES_7 = $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_8 = $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2)
-pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_7)
+pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_8)
am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
pdftexdir/pdftexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
-@PDFTEX_SYNCTEX_TRUE@am__objects_16 = pdftex-synctex.$(OBJEXT)
-dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_16)
-am__objects_17 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_17) pdftex-pdftex-pool.$(OBJEXT)
+@PDFTEX_SYNCTEX_TRUE@am__objects_18 = pdftex-synctex.$(OBJEXT)
+dist_pdftex_OBJECTS = pdftex-pdftexextra.$(OBJEXT) $(am__objects_18)
+am__objects_19 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_19) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmd5.a
pdftex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(pdftex_CXXFLAGS) $(CXXFLAGS) \
@@ -776,7 +820,7 @@ pdftosrc_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
am_pdvitype_OBJECTS =
nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
-pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_7)
+pdvitype_DEPENDENCIES = $(am__DEPENDENCIES_8)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -796,22 +840,22 @@ pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
am_ppltotf_OBJECTS =
nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
-ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ppltotf_DEPENDENCIES = $(am__DEPENDENCIES_8)
am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
synctexdir/synctex.c synctexdir/synctex.h \
synctexdir/synctex-common.h synctexdir/synctex-ptex.h
-@PTEX_SYNCTEX_TRUE@am__objects_18 = ptex-synctex.$(OBJEXT)
-dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) $(am__objects_18)
-am__objects_19 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_19) ptex-ptex-pool.$(OBJEXT)
+@PTEX_SYNCTEX_TRUE@am__objects_20 = ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptex-ptexextra.$(OBJEXT) $(am__objects_20)
+am__objects_21 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_21) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
-@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
-ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_7) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
+ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_8) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10)
am_ptftopl_OBJECTS =
nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
-ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ptftopl_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_synctex_OBJECTS = synctex-synctex_main.$(OBJEXT) \
synctex-synctex_parser.$(OBJEXT) \
synctex-synctex_parser_utils.$(OBJEXT)
@@ -827,14 +871,14 @@ tangleboot_LDADD = $(LDADD)
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
-@TEX_SYNCTEX_TRUE@am__objects_20 = tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_20)
-am__objects_21 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_21) tex-tex-pool.$(OBJEXT)
+@TEX_SYNCTEX_TRUE@am__objects_22 = tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_22)
+am__objects_23 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_23) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
-@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
+@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_10)
+ $(am__DEPENDENCIES_11)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -848,6 +892,19 @@ ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS)
ttf2afm_LDADD = $(LDADD)
nodist_txt2zlib_OBJECTS = txt2zlib-txt2zlib.$(OBJEXT)
txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS)
+am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \
+ uptexdir/uptexextra.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-uptex.h
+@UPTEX_SYNCTEX_TRUE@am__objects_24 = uptex-synctex.$(OBJEXT)
+dist_uptex_OBJECTS = uptex-uptexextra.$(OBJEXT) $(am__objects_24)
+am__objects_25 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_25) uptex-uptex-pool.$(OBJEXT)
+uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
+@UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+uptex_DEPENDENCIES = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_12)
nodist_vftovp_OBJECTS = vftovp.$(OBJEXT)
vftovp_OBJECTS = $(nodist_vftovp_OBJECTS)
vftovp_LDADD = $(LDADD)
@@ -864,20 +921,20 @@ am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
xetexdir/xetexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
-@XETEX_SYNCTEX_TRUE@am__objects_22 = xetex-synctex.$(OBJEXT)
-dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_22)
-am__objects_23 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_23) xetex-xetex_pool.$(OBJEXT)
+@XETEX_SYNCTEX_TRUE@am__objects_26 = xetex-synctex.$(OBJEXT)
+dist_xetex_OBJECTS = xetex-xetexextra.$(OBJEXT) $(am__objects_26)
+am__objects_27 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_27) xetex-xetex_pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
-@XETEX_MACOSX_FALSE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) \
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \
@XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1)
-@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_13 = $(libxetex) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_11) \
- $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \
+@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_15 = $(libxetex) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_13) \
+ $(am__DEPENDENCIES_14) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_13) $(am__DEPENDENCIES_2) \
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_15) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(xetex_CXXFLAGS) $(CXXFLAGS) \
@@ -910,19 +967,21 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(libmd5_a_SOURCES) $(nodist_libmf_a_SOURCES) \
$(libmplib_a_SOURCES) $(nodist_libmplib_a_SOURCES) \
$(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \
- $(libxetex_a_SOURCES) $(libxetexmm_a_SOURCES) \
- $(dist_aleph_SOURCES) $(nodist_aleph_SOURCES) \
- $(nodist_bibtex_SOURCES) $(call_luatex_SOURCES) \
- $(call_mpost_SOURCES) $(nodist_ctangle_SOURCES) \
- $(nodist_ctangleboot_SOURCES) $(nodist_ctie_SOURCES) \
- $(nodist_cweave_SOURCES) $(nodist_dvicopy_SOURCES) \
- $(nodist_dvitype_SOURCES) $(dist_eptex_SOURCES) \
- $(nodist_eptex_SOURCES) $(dist_etex_SOURCES) \
- $(nodist_etex_SOURCES) $(gftodvi_SOURCES) \
- $(nodist_gftodvi_SOURCES) $(nodist_gftopk_SOURCES) \
- $(nodist_gftype_SOURCES) $(inimf_SOURCES) $(initex_SOURCES) \
- $(luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \
- $(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+ $(libukanji_a_SOURCES) $(libxetex_a_SOURCES) \
+ $(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
+ $(nodist_aleph_SOURCES) $(nodist_bibtex_SOURCES) \
+ $(call_luatex_SOURCES) $(call_mpost_SOURCES) \
+ $(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
+ $(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
+ $(nodist_dvicopy_SOURCES) $(nodist_dvitype_SOURCES) \
+ $(dist_eptex_SOURCES) $(nodist_eptex_SOURCES) \
+ $(dist_etex_SOURCES) $(nodist_etex_SOURCES) \
+ $(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
+ $(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
+ $(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) \
+ $(inimf_SOURCES) $(initex_SOURCES) $(luatex_SOURCES) \
+ $(nodist_EXTRA_luatex_SOURCES) $(md5main_SOURCES) \
+ $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
$(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \
@@ -942,7 +1001,8 @@ SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
$(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(nodist_txt2zlib_SOURCES) $(nodist_vftovp_SOURCES) \
+ $(nodist_txt2zlib_SOURCES) $(dist_uptex_SOURCES) \
+ $(nodist_uptex_SOURCES) $(nodist_vftovp_SOURCES) \
$(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \
$(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \
$(nodist_EXTRA_xetex_SOURCES)
@@ -951,10 +1011,11 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(EXTRA_libluamisc_a_SOURCES) $(libluasocket_a_SOURCES) \
$(libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
$(libmplib_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
- $(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
- $(libxetexmm_a_SOURCES) $(dist_aleph_SOURCES) \
- $(call_luatex_SOURCES) $(call_mpost_SOURCES) \
- $(am__dist_eptex_SOURCES_DIST) $(am__dist_etex_SOURCES_DIST) \
+ $(EXTRA_libpdftex_a_SOURCES) $(libukanji_a_SOURCES) \
+ $(am__libxetex_a_SOURCES_DIST) $(libxetexmm_a_SOURCES) \
+ $(dist_aleph_SOURCES) $(call_luatex_SOURCES) \
+ $(call_mpost_SOURCES) $(am__dist_eptex_SOURCES_DIST) \
+ $(am__dist_etex_SOURCES_DIST) $(am__dist_euptex_SOURCES_DIST) \
$(gftodvi_SOURCES) $(inimf_SOURCES) $(initex_SOURCES) \
$(luatex_SOURCES) $(md5main_SOURCES) $(dist_mf_SOURCES) \
$(dist_mf_nowin_SOURCES) $(pbibtex_SOURCES) \
@@ -963,7 +1024,7 @@ DIST_SOURCES = $(libff_a_SOURCES) $(libkanji_a_SOURCES) \
$(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
$(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
$(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
- $(am__dist_xetex_SOURCES_DIST)
+ $(am__dist_uptex_SOURCES_DIST) $(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -1005,13 +1066,13 @@ ETAGS = etags
CTAGS = ctags
am__tty_colors = \
red=; grn=; lgn=; blu=; std=
-am__EXEEXT_32 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_34 = 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_33 = $(am__EXEEXT_32) tests/bibtex-openout-test.pl \
+am__EXEEXT_35 = $(am__EXEEXT_34) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_34 = $(am__EXEEXT_33)
+@WEB_TRUE@am__EXEEXT_36 = $(am__EXEEXT_35)
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -1252,9 +1313,9 @@ SUBDIRS = doc lib man web2c . window omegafonts otps
proglib = lib/lib.a
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
-EXTRA_LIBRARIES = libmf.a libmplib.a libkanji.a libpdftex.a liblua51.a \
- libluasocket.a libluamisc.a libff.a libluatex.a libxetex.a \
- libxetexmm.a libmd5.a
+EXTRA_LIBRARIES = libmf.a libmplib.a libkanji.a libukanji.a \
+ libpdftex.a liblua51.a libluasocket.a libluamisc.a libff.a \
+ libluatex.a libxetex.a libxetexmm.a libmd5.a
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \
@@ -1325,6 +1386,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
eptexdir/ChangeLog.TL eptexdir/README.txt \
eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \
eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \
+ $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines \
+ $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
$(pdftex_ch_srcs) etexdir/etex.ch pdftexdir/pdftex.defines \
pdftexdir/pdftex.h pdftexdir/ChangeLog pdftexdir/NEWS \
pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
@@ -1504,7 +1567,10 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
tests/xstory.dvityp tests/xpagenum.typ tests/xcmr10.tfm \
tests/xcmr10.pl tests/xsample.typ tests/x*min10.* ptrip.diffs \
$(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
- eptex.pool eptex-tangle eptrip.diffs $(nodist_pdftex_SOURCES) \
+ eptex.pool eptex-tangle eptrip.diffs $(nodist_uptex_SOURCES) \
+ uptex.web uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
+ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+ euptex.p euptex.pool euptex-tangle $(nodist_pdftex_SOURCES) \
pdftex.ch pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
$(nodist_libluatex_a_SOURCES) txt2zlib.c \
$(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
@@ -1526,9 +1592,9 @@ TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
$(am__append_30) $(am__append_36) $(am__append_42)
bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
- $(am__append_51)
-install_exe_links = $(am__append_20) $(am__append_49)
-uninstall_exe_links = $(am__append_21) $(am__append_50)
+ $(am__append_53)
+install_exe_links = $(am__append_20) $(am__append_51)
+uninstall_exe_links = $(am__append_21) $(am__append_52)
web2c = $(SHELL) ./web2c-sh $@
makecpool = web2c/makecpool
@@ -1612,18 +1678,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
initex_SOURCES = $(srcdir)/../texlive/w32_wrapper/callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_73)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_75)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_74)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_76)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_76)
+dist_tex_SOURCES = texextra.c $(am__append_78)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_75)
+tex_prereq = texd.h $(am__append_77)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1691,19 +1757,19 @@ psout_c_h = mppsout.h psout.c mplibps.h
svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/mpmath.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_77)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_79)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_78)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_80)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- $(am__append_80)
+ $(am__append_82)
# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_79)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_81)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -1737,20 +1803,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_81)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_83)
# With --enable-ipc, pTeX may need to link with -lsocket.
ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs) \
- $(am__append_82)
+ $(am__append_84)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c ptexdir/ptex_version.h
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- $(am__append_84)
+ $(am__append_86)
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_83)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_85)
ptex_web_srcs = \
tex.web \
tex.ch
@@ -1780,21 +1846,22 @@ ptftopl_LDADD = $(ptex_ldadd)
# e-pTeX Tests
#
eptex_tests = eptexdir/eptrip.test
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_85)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_91)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_86)
+ $(ipc_socketlibs) $(am__append_92)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
-nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/ptex_version.h
+nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- $(am__append_88)
+ $(am__append_94)
# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS.
eptex_prereq = eptexd.h eptexdir/etex_version.h \
- eptexdir/ptex_version.h $(am__append_87)
+ eptexdir/eptex_version.h eptexdir/ptex_version.h \
+ $(am__append_93)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1814,6 +1881,77 @@ eptex_ch_srcs = \
eptexdir/pdfsavepos.ch \
tex-binpool.ch
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h
+libukanji_a_CPPFLAGS = $(uptex_cppflags)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_87)
+
+# With --enable-ipc, upTeX may need to link with -lsocket.
+uptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+ $(ipc_socketlibs) $(am__append_88)
+
+# upTeX C sources
+uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
+nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
+ $(am__append_90)
+
+# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS.
+uptex_prereq = uptexd.h uptexdir/ptex_version.h \
+ uptexdir/uptex_version.h $(am__append_89)
+uptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+uptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ $(uptex_ch_synctex) \
+ tex-binpool.ch
+
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_95)
+
+# With --enable-ipc, e-upTeX may need to link with -lsocket.
+euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+ $(ipc_socketlibs) $(am__append_96)
+
+# e-upTeX C sources
+euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
+nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \
+ euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h
+
+dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
+ $(am__append_98)
+
+# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS.
+euptex_prereq = euptexd.h euptexdir/etex_version.h \
+ euptexdir/eptex_version.h euptexdir/ptex_version.h \
+ euptexdir/uptex_version.h $(am__append_97)
+euptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+euptex_ch_srcs = \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ euptexdir/euptex.ch0 \
+ eptexdir/eptex.ech \
+ euptexdir/euptex.ch1 \
+ eptexdir/etex.ch1 \
+ $(euptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ euptexdir/fam256-eup.ch \
+ euptexdir/pdfstrcmp-eup-pre.ch \
+ eptexdir/pdfstrcmp.ch \
+ euptexdir/pdfstrcmp-eup-post.ch \
+ eptexdir/pdfsavepos.ch \
+ euptexdir/pdfsavepos-eup.ch \
+ tex-binpool.ch
+
pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
$(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 \
-I$(srcdir)/pdftexdir
@@ -1827,7 +1965,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_89)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_99)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -1841,7 +1979,7 @@ nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
pdftexdir/etex_version.h pdftexdir/pdftex_version.h
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
- $(am__append_90)
+ $(am__append_100)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -1867,7 +2005,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
pdftexdir/writejbig2.c 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_46)
+ pdftexdir/writezip.c $(am__append_48)
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
@@ -1908,7 +2046,7 @@ call_luatex_LDADD =
# luaTeX Tests
#
luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_53)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_55)
liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
liblua51_a_SOURCES = \
luatexdir/lua51/lapi.c \
@@ -2286,17 +2424,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS)
# Force Automake to use CXXLD for linking
nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_56)
+libxetex = libxetex.a $(am__append_58)
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_55) \
- $(am__append_57) $(am__append_60) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_58) \
- $(am__append_61) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_57) \
+ $(am__append_59) $(am__append_62) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_60) \
+ $(am__append_63) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
- $(TECKIT_DEPEND) $(am__append_59) $(am__append_62) \
+ $(TECKIT_DEPEND) $(am__append_61) $(am__append_64) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_91)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_101)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -2308,7 +2446,7 @@ nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
xetexdir/etex_version.h xetexdir/xetex_version.h
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
- $(am__append_92)
+ $(am__append_102)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2339,7 +2477,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
- $(am__append_63) $(am__append_64) $(am__append_65)
+ $(am__append_65) $(am__append_66) $(am__append_67)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -2475,6 +2613,17 @@ synctex_LDADD = $(ZLIB_LIBS)
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+@UPTEX_SYNCTEX_TRUE@uptex_ch_synctex = \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@@ -2488,6 +2637,19 @@ synctex_LDADD = $(ZLIB_LIBS)
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch1 \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+@EUPTEX_SYNCTEX_TRUE@euptex_ch_synctex = \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
@PDFTEX_SYNCTEX_TRUE@pdftex_ch_synctex = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch1 \
@@ -2523,7 +2685,7 @@ all: ff-config.h
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .o .obj .p .pin
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)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.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/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.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 $(srcdir)/../am/bin_links.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)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.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/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/txt2zlib.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 $(srcdir)/../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -2627,6 +2789,10 @@ libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES)
-rm -f libpdftex.a
$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
$(RANLIB) libpdftex.a
+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES)
+ -rm -f libukanji.a
+ $(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(RANLIB) libukanji.a
libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES)
-rm -f libxetex.a
$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
@@ -2732,6 +2898,9 @@ eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES)
etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES)
@rm -f etex$(EXEEXT)
$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES)
@rm -f gftodvi$(EXEEXT)
$(LINK) $(gftodvi_OBJECTS) $(gftodvi_LDADD) $(LIBS)
@@ -2846,6 +3015,9 @@ ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES)
txt2zlib$(EXEEXT): $(txt2zlib_OBJECTS) $(txt2zlib_DEPENDENCIES)
@rm -f txt2zlib$(EXEEXT)
$(LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS)
+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES)
@rm -f vftovp$(EXEEXT)
$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
@@ -2892,6 +3064,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexextra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexini.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-synctex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftodvi.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftopk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftype.Po@am__quote@
@@ -3158,6 +3335,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writet3.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writettf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-writezip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libukanji_a-kanji.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-FontTableCache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontInst.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-XeTeXFontInst_FT2.Po@am__quote@
@@ -3236,6 +3414,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2afm-macnames.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttf2afm-ttf2afm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2zlib-txt2zlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptexini.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vftovp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vptovf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Po@am__quote@
@@ -6879,6 +7062,20 @@ libpdftex_a-regexec.obj: pdftexdir/regex/regexec.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpdftex_a-regexec.obj `if test -f 'pdftexdir/regex/regexec.c'; then $(CYGPATH_W) 'pdftexdir/regex/regexec.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regexec.c'; fi`
+libukanji_a-kanji.o: uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libukanji_a-kanji.o -MD -MP -MF $(DEPDIR)/libukanji_a-kanji.Tpo -c -o libukanji_a-kanji.o `test -f 'uptexdir/kanji.c' || echo '$(srcdir)/'`uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libukanji_a-kanji.Tpo $(DEPDIR)/libukanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexdir/kanji.c' object='libukanji_a-kanji.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libukanji_a-kanji.o `test -f 'uptexdir/kanji.c' || echo '$(srcdir)/'`uptexdir/kanji.c
+
+libukanji_a-kanji.obj: uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libukanji_a-kanji.obj -MD -MP -MF $(DEPDIR)/libukanji_a-kanji.Tpo -c -o libukanji_a-kanji.obj `if test -f 'uptexdir/kanji.c'; then $(CYGPATH_W) 'uptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libukanji_a-kanji.Tpo $(DEPDIR)/libukanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexdir/kanji.c' object='libukanji_a-kanji.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libukanji_a-kanji.obj `if test -f 'uptexdir/kanji.c'; then $(CYGPATH_W) 'uptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji.c'; fi`
+
libxetex_a-XeTeX_ext.o: xetexdir/XeTeX_ext.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT libxetex_a-XeTeX_ext.o -MD -MP -MF $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo -c -o libxetex_a-XeTeX_ext.o `test -f 'xetexdir/XeTeX_ext.c' || echo '$(srcdir)/'`xetexdir/XeTeX_ext.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxetex_a-XeTeX_ext.Tpo $(DEPDIR)/libxetex_a-XeTeX_ext.Po
@@ -7257,6 +7454,76 @@ etex-etex-pool.obj: etex-pool.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etex-pool.obj `if test -f 'etex-pool.c'; then $(CYGPATH_W) 'etex-pool.c'; else $(CYGPATH_W) '$(srcdir)/etex-pool.c'; fi`
+euptex-euptexextra.o: euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexextra.o -MD -MP -MF $(DEPDIR)/euptex-euptexextra.Tpo -c -o euptex-euptexextra.o `test -f 'euptexdir/euptexextra.c' || echo '$(srcdir)/'`euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptexextra.Tpo $(DEPDIR)/euptex-euptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptexdir/euptexextra.c' object='euptex-euptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexextra.o `test -f 'euptexdir/euptexextra.c' || echo '$(srcdir)/'`euptexdir/euptexextra.c
+
+euptex-euptexextra.obj: euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexextra.obj -MD -MP -MF $(DEPDIR)/euptex-euptexextra.Tpo -c -o euptex-euptexextra.obj `if test -f 'euptexdir/euptexextra.c'; then $(CYGPATH_W) 'euptexdir/euptexextra.c'; else $(CYGPATH_W) '$(srcdir)/euptexdir/euptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptexextra.Tpo $(DEPDIR)/euptex-euptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptexdir/euptexextra.c' object='euptex-euptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexextra.obj `if test -f 'euptexdir/euptexextra.c'; then $(CYGPATH_W) 'euptexdir/euptexextra.c'; else $(CYGPATH_W) '$(srcdir)/euptexdir/euptexextra.c'; fi`
+
+euptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-synctex.o -MD -MP -MF $(DEPDIR)/euptex-synctex.Tpo -c -o euptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-synctex.Tpo $(DEPDIR)/euptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='euptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+euptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-synctex.obj -MD -MP -MF $(DEPDIR)/euptex-synctex.Tpo -c -o euptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-synctex.Tpo $(DEPDIR)/euptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='euptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+euptex-euptexini.o: euptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexini.o -MD -MP -MF $(DEPDIR)/euptex-euptexini.Tpo -c -o euptex-euptexini.o `test -f 'euptexini.c' || echo '$(srcdir)/'`euptexini.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptexini.Tpo $(DEPDIR)/euptex-euptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptexini.c' object='euptex-euptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexini.o `test -f 'euptexini.c' || echo '$(srcdir)/'`euptexini.c
+
+euptex-euptexini.obj: euptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexini.obj -MD -MP -MF $(DEPDIR)/euptex-euptexini.Tpo -c -o euptex-euptexini.obj `if test -f 'euptexini.c'; then $(CYGPATH_W) 'euptexini.c'; else $(CYGPATH_W) '$(srcdir)/euptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptexini.Tpo $(DEPDIR)/euptex-euptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptexini.c' object='euptex-euptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexini.obj `if test -f 'euptexini.c'; then $(CYGPATH_W) 'euptexini.c'; else $(CYGPATH_W) '$(srcdir)/euptexini.c'; fi`
+
+euptex-euptex0.o: euptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex0.o -MD -MP -MF $(DEPDIR)/euptex-euptex0.Tpo -c -o euptex-euptex0.o `test -f 'euptex0.c' || echo '$(srcdir)/'`euptex0.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptex0.Tpo $(DEPDIR)/euptex-euptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptex0.c' object='euptex-euptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex0.o `test -f 'euptex0.c' || echo '$(srcdir)/'`euptex0.c
+
+euptex-euptex0.obj: euptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex0.obj -MD -MP -MF $(DEPDIR)/euptex-euptex0.Tpo -c -o euptex-euptex0.obj `if test -f 'euptex0.c'; then $(CYGPATH_W) 'euptex0.c'; else $(CYGPATH_W) '$(srcdir)/euptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptex0.Tpo $(DEPDIR)/euptex-euptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptex0.c' object='euptex-euptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex0.obj `if test -f 'euptex0.c'; then $(CYGPATH_W) 'euptex0.c'; else $(CYGPATH_W) '$(srcdir)/euptex0.c'; fi`
+
+euptex-euptex-pool.o: euptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex-pool.o -MD -MP -MF $(DEPDIR)/euptex-euptex-pool.Tpo -c -o euptex-euptex-pool.o `test -f 'euptex-pool.c' || echo '$(srcdir)/'`euptex-pool.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptex-pool.Tpo $(DEPDIR)/euptex-euptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptex-pool.c' object='euptex-euptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex-pool.o `test -f 'euptex-pool.c' || echo '$(srcdir)/'`euptex-pool.c
+
+euptex-euptex-pool.obj: euptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex-pool.obj -MD -MP -MF $(DEPDIR)/euptex-euptex-pool.Tpo -c -o euptex-euptex-pool.obj `if test -f 'euptex-pool.c'; then $(CYGPATH_W) 'euptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/euptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/euptex-euptex-pool.Tpo $(DEPDIR)/euptex-euptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='euptex-pool.c' object='euptex-euptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex-pool.obj `if test -f 'euptex-pool.c'; then $(CYGPATH_W) 'euptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/euptex-pool.c'; fi`
+
inimf-callexe.o: $(srcdir)/../texlive/w32_wrapper/callexe.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimf-callexe.o -MD -MP -MF $(DEPDIR)/inimf-callexe.Tpo -c -o inimf-callexe.o `test -f '$(srcdir)/../texlive/w32_wrapper/callexe.c' || echo '$(srcdir)/'`$(srcdir)/../texlive/w32_wrapper/callexe.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/inimf-callexe.Tpo $(DEPDIR)/inimf-callexe.Po
@@ -7733,6 +8000,76 @@ txt2zlib-txt2zlib.obj: txt2zlib.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi`
+uptex-uptexextra.o: uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexextra.o -MD -MP -MF $(DEPDIR)/uptex-uptexextra.Tpo -c -o uptex-uptexextra.o `test -f 'uptexdir/uptexextra.c' || echo '$(srcdir)/'`uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptexextra.Tpo $(DEPDIR)/uptex-uptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexdir/uptexextra.c' object='uptex-uptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexextra.o `test -f 'uptexdir/uptexextra.c' || echo '$(srcdir)/'`uptexdir/uptexextra.c
+
+uptex-uptexextra.obj: uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexextra.obj -MD -MP -MF $(DEPDIR)/uptex-uptexextra.Tpo -c -o uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptexextra.Tpo $(DEPDIR)/uptex-uptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexdir/uptexextra.c' object='uptex-uptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
+
+uptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-synctex.o -MD -MP -MF $(DEPDIR)/uptex-synctex.Tpo -c -o uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-synctex.Tpo $(DEPDIR)/uptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='uptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+uptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-synctex.obj -MD -MP -MF $(DEPDIR)/uptex-synctex.Tpo -c -o uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-synctex.Tpo $(DEPDIR)/uptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctexdir/synctex.c' object='uptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+uptex-uptexini.o: uptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.o -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexini.c' object='uptex-uptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
+
+uptex-uptexini.obj: uptexini.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.obj -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.obj `if test -f 'uptexini.c'; then $(CYGPATH_W) 'uptexini.c'; else $(CYGPATH_W) '$(srcdir)/uptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptexini.c' object='uptex-uptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexini.obj `if test -f 'uptexini.c'; then $(CYGPATH_W) 'uptexini.c'; else $(CYGPATH_W) '$(srcdir)/uptexini.c'; fi`
+
+uptex-uptex0.o: uptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex0.o -MD -MP -MF $(DEPDIR)/uptex-uptex0.Tpo -c -o uptex-uptex0.o `test -f 'uptex0.c' || echo '$(srcdir)/'`uptex0.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptex0.Tpo $(DEPDIR)/uptex-uptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptex0.c' object='uptex-uptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex0.o `test -f 'uptex0.c' || echo '$(srcdir)/'`uptex0.c
+
+uptex-uptex0.obj: uptex0.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex0.obj -MD -MP -MF $(DEPDIR)/uptex-uptex0.Tpo -c -o uptex-uptex0.obj `if test -f 'uptex0.c'; then $(CYGPATH_W) 'uptex0.c'; else $(CYGPATH_W) '$(srcdir)/uptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptex0.Tpo $(DEPDIR)/uptex-uptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptex0.c' object='uptex-uptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex0.obj `if test -f 'uptex0.c'; then $(CYGPATH_W) 'uptex0.c'; else $(CYGPATH_W) '$(srcdir)/uptex0.c'; fi`
+
+uptex-uptex-pool.o: uptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex-pool.o -MD -MP -MF $(DEPDIR)/uptex-uptex-pool.Tpo -c -o uptex-uptex-pool.o `test -f 'uptex-pool.c' || echo '$(srcdir)/'`uptex-pool.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptex-pool.Tpo $(DEPDIR)/uptex-uptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptex-pool.c' object='uptex-uptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex-pool.o `test -f 'uptex-pool.c' || echo '$(srcdir)/'`uptex-pool.c
+
+uptex-uptex-pool.obj: uptex-pool.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex-pool.obj -MD -MP -MF $(DEPDIR)/uptex-uptex-pool.Tpo -c -o uptex-uptex-pool.obj `if test -f 'uptex-pool.c'; then $(CYGPATH_W) 'uptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/uptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/uptex-uptex-pool.Tpo $(DEPDIR)/uptex-uptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='uptex-pool.c' object='uptex-uptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex-pool.obj `if test -f 'uptex-pool.c'; then $(CYGPATH_W) 'uptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/uptex-pool.c'; fi`
+
xetex-xetexextra.o: xetexdir/xetexextra.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexextra.o -MD -MP -MF $(DEPDIR)/xetex-xetexextra.Tpo -c -o xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xetex-xetexextra.Tpo $(DEPDIR)/xetex-xetexextra.Po
@@ -9267,10 +9604,16 @@ eptexdir/etex_version.h: etexdir/etex.ch
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
| sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-# Extract ptex version
-eptexdir/ptex_version.h: eptexdir/eptex.ech
+# Extract eptex version
+eptexdir/eptex_version.h: eptexdir/eptex.ech
$(MKDIR_P) eptexdir
- grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract ptex version
+eptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) ptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
| sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate eptex.web
@@ -9291,6 +9634,99 @@ eptrip-clean:
rm -f etrip.tfm etrip.pl etrip.tex etrip.log etrip.fmt etrip.dvi etrip.out
rm -f tripos.tex 8terminal.tex
rm -rf tfm
+$(uptex_OBJECTS): $(uptex_prereq)
+
+$(uptex_c_h): uptex-web2c
+ @$(web2c) uptex
+uptex-web2c: uptex.p $(web2c_texmf) uptexdir/uptex.defines
+ @$(web2c) uptex
+
+uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp)
+ $(makecpool) uptex >$@ || rm -f $@
+
+# Tangling upTeX
+uptex.p uptex.pool: uptex-tangle
+ @$(texmf_tangle) uptex uptex
+uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
+ @$(texmf_tangle) uptex uptex
+
+# Extract ptex version
+uptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) uptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract uptex version
+uptexdir/uptex_version.h: uptexdir/uptex-m.ch
+ $(MKDIR_P) uptexdir
+ grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate uptex.web
+uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
+ $(tie) -m uptex.web $(uptex_web_srcs)
+
+# Generate uptex.ch
+uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
+ $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+
+upTeX.w: uptex.p
+ $(tie) -m upTeX.w uptex.web uptex.ch
+$(euptex_OBJECTS): $(euptex_prereq)
+
+$(euptex_c_h): euptex-web2c
+ @$(web2c) euptex
+euptex-web2c: euptex.p $(web2c_texmf) euptexdir/euptex.defines
+ @$(web2c) euptex
+
+euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp)
+ $(makecpool) euptex >$@ || rm -f $@
+
+# Tangling e-upTeX
+euptex.p euptex.pool: euptex-tangle
+ @$(texmf_tangle) euptex euptex
+euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
+ @$(texmf_tangle) euptex euptex
+
+# Extract etex version
+euptexdir/etex_version.h: etexdir/etex.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract eptex version
+euptexdir/eptex_version.h: eptexdir/eptex.ech
+ $(MKDIR_P) euptexdir
+ grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract ptex version
+euptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract uptex version
+euptexdir/uptex_version.h: uptexdir/uptex-m.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate euptex.web
+euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
+ $(tie) -m euptex.web $(euptex_web_srcs)
+
+# Generate euptex.ch
+euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
+ $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+
+e-upTeX.w: euptex.p
+ $(tie) -m e-upTeX.w euptex.web euptex.ch
+
+e-pTeX.w: eptex.p
+ $(tie) -m e-pTeX.w eptex.web eptex.ch
+
+foo: e-pTeX.w e-upTeX.w upTeX.w
$(pdftex_OBJECTS): $(pdftex_prereq)
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 1249251eb3c..d7330f5ea82 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -31,14 +31,16 @@ AC_ARG_ENABLE([omfonts],
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], [yes], [pTeX], [ptexenc]],
-[[eptex], [yes], [yes], [e-pTeX], [ptexenc]],
-[[aleph], [yes], [], [Aleph], []],
-[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
-[[luatex], [yes], [], [luaTeX], [poppler libpng obsdcompat zziplib]],
-[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]],
+[[tex], [yes], [no], [TeX], []],
+[[etex], [no], [yes], [e-TeX], []],
+[[ptex], [yes], [yes], [pTeX], [ptexenc]],
+[[eptex], [yes], [yes], [e-pTeX], [ptexenc]],
+[[uptex], [yes], [yes], [upTeX], [ptexenc]],
+[[euptex], [yes], [yes], [e-upTeX], [ptexenc]],
+[[aleph], [yes], [], [Aleph], []],
+[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
+[[luatex], [yes], [], [luaTeX], [poppler libpng obsdcompat zziplib]],
+[[xetex], [yes], [yes], [XeTeX], [poppler libpng freetype2 icu-xetex teckit graphite]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_tex_progs],
[m4_ifset([Kpse_Prog],
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index b4a5f340cde..f5f46801802 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -715,6 +715,14 @@ PDFTEX_FALSE
PDFTEX_TRUE
ALEPH_FALSE
ALEPH_TRUE
+EUPTEX_SYNCTEX_FALSE
+EUPTEX_SYNCTEX_TRUE
+EUPTEX_FALSE
+EUPTEX_TRUE
+UPTEX_SYNCTEX_FALSE
+UPTEX_SYNCTEX_TRUE
+UPTEX_FALSE
+UPTEX_TRUE
EPTEX_SYNCTEX_FALSE
EPTEX_SYNCTEX_TRUE
EPTEX_FALSE
@@ -903,6 +911,10 @@ enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
+enable_uptex
+enable_uptex_synctex
+enable_euptex
+enable_euptex_synctex
enable_aleph
enable_pdftex
enable_pdftex_synctex
@@ -1615,6 +1627,10 @@ Optional Features:
--disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
+ --disable-uptex do not compile and install upTeX
+ --disable-uptex-synctex build upTeX without SyncTeX support
+ --disable-euptex do not compile and install e-upTeX
+ --disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
@@ -17372,6 +17388,44 @@ fi
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
+# Check whether --enable-uptex was given.
+if test "${enable_uptex+set}" = set; then :
+ enableval=$enable_uptex;
+fi
+case $enable_uptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_uptex=yes ;;
+esac
+
+# Check whether --enable-uptex-synctex was given.
+if test "${enable_uptex_synctex+set}" = set; then :
+ enableval=$enable_uptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_uptex" = xyes:yes && {
+ need_ptexenc=yes
+}
+# Check whether --enable-euptex was given.
+if test "${enable_euptex+set}" = set; then :
+ enableval=$enable_euptex;
+fi
+case $enable_euptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_euptex=yes ;;
+esac
+
+# Check whether --enable-euptex-synctex was given.
+if test "${enable_euptex_synctex+set}" = set; then :
+ enableval=$enable_euptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_euptex" = xyes:yes && {
+ need_ptexenc=yes
+}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;
@@ -18455,6 +18509,52 @@ else
EPTEX_SYNCTEX_TRUE='#'
EPTEX_SYNCTEX_FALSE=
fi
+ if test "x$enable_uptex" = xyes; then
+ UPTEX_TRUE=
+ UPTEX_FALSE='#'
+else
+ UPTEX_TRUE='#'
+ UPTEX_FALSE=
+fi
+
+case $enable_native_texlive_build:$enable_uptex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_uptex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-uptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_uptex_synctex" = xyes; then
+ UPTEX_SYNCTEX_TRUE=
+ UPTEX_SYNCTEX_FALSE='#'
+else
+ UPTEX_SYNCTEX_TRUE='#'
+ UPTEX_SYNCTEX_FALSE=
+fi
+ if test "x$enable_euptex" = xyes; then
+ EUPTEX_TRUE=
+ EUPTEX_FALSE='#'
+else
+ EUPTEX_TRUE='#'
+ EUPTEX_FALSE=
+fi
+
+case $enable_native_texlive_build:$enable_euptex_synctex in #(
+ yes:yes | no:yes | no:no) :
+ ;; #(
+ *) :
+ enable_euptex_synctex=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&5
+$as_echo "$as_me: WARNING: Enforcing \`--enable-euptex-synctex=yes' (native TeX Live build)" >&2;} ;;
+esac
+ if test "x$enable_euptex_synctex" = xyes; then
+ EUPTEX_SYNCTEX_TRUE=
+ EUPTEX_SYNCTEX_FALSE='#'
+else
+ EUPTEX_SYNCTEX_TRUE='#'
+ EUPTEX_SYNCTEX_FALSE=
+fi
if test "x$enable_aleph" = xyes; then
ALEPH_TRUE=
ALEPH_FALSE='#'
@@ -22983,6 +23083,22 @@ if test -z "${EPTEX_SYNCTEX_TRUE}" && test -z "${EPTEX_SYNCTEX_FALSE}"; then
as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then
+ as_fn_error $? "conditional \"UPTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${UPTEX_SYNCTEX_TRUE}" && test -z "${UPTEX_SYNCTEX_FALSE}"; then
+ as_fn_error $? "conditional \"UPTEX_SYNCTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${EUPTEX_TRUE}" && test -z "${EUPTEX_FALSE}"; then
+ as_fn_error $? "conditional \"EUPTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${EUPTEX_SYNCTEX_TRUE}" && test -z "${EUPTEX_SYNCTEX_FALSE}"; then
+ as_fn_error $? "conditional \"EUPTEX_SYNCTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ALEPH_TRUE}" && test -z "${ALEPH_FALSE}"; then
as_fn_error $? "conditional \"ALEPH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index 4ad7523d8ee..86e7309f0ec 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,6 +1,12 @@
ChangeLog.TL: TeX Live (TL) changes for e-pTeX
==============================================
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eptex.ech, eptexextra.h, etex.ch1, am/eptex.am, fam256.ch:
+ Slightly reformulate to simplify e-upTeX.
+ * pdfsavepos.ch: \pdfsavepos is extension, not convert case.
+
2011-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* eptex.defines: Add newline at end of file.
diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am
index 96dbd00955e..da582985d1c 100644
--- a/Build/source/texk/web2c/eptexdir/am/eptex.am
+++ b/Build/source/texk/web2c/eptexdir/am/eptex.am
@@ -23,11 +23,11 @@ eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
-nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/ptex_version.h
+nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h
# We must create eptexd.h and eptexdir/[ep]tex_version.h before building the eptex_OBJECTS.
-eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/ptex_version.h
+eptex_prereq = eptexd.h eptexdir/etex_version.h eptexdir/eptex_version.h eptexdir/ptex_version.h
$(eptex_OBJECTS): $(eptex_prereq)
$(eptex_c_h): eptex-web2c
@@ -50,10 +50,16 @@ eptexdir/etex_version.h: etexdir/etex.ch
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
| sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-# Extract ptex version
-eptexdir/ptex_version.h: eptexdir/eptex.ech
+# Extract eptex version
+eptexdir/eptex_version.h: eptexdir/eptex.ech
$(MKDIR_P) eptexdir
- grep '^@d pTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract ptex version
+eptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) ptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
| sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate eptex.web
diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech
index e11b01f2e42..30d687672be 100644
--- a/Build/source/texk/web2c/eptexdir/eptex.ech
+++ b/Build/source/texk/web2c/eptexdir/eptex.ech
@@ -8,10 +8,12 @@
\def\epTeX{$\varepsilon$-p\TeX}
@z
-@x [1.2] l.200 - pTeX:
-@d pTeX_version_string=='-p3.2' {current p\TeX\ version}
+@x [1.2] l.190 - epTeX:
+@d eTeX_version_string=='-2.3' {current \eTeX\ version}
@y
-@d pTeX_version_string=='-p3.2-110415' {current \epTeX\ version}
+@d eTeX_version_string=='-2.3' {current \eTeX\ version}
+@#
+@d epTeX_version_string=='-110415'
@z
@x e-pTeX: banner
@@ -19,12 +21,20 @@
@y
{printed when p\TeX\ starts}
@#
-@d epTeX_version==pTeX_version_string,eTeX_version_string
+@d epTeX_version==pTeX_version_string,epTeX_version_string,eTeX_version_string
@d epTeX_banner=='This is e-pTeX, Version 3.1415926',epTeX_version
@d epTeX_banner_k==epTeX_banner
{printed when \epTeX\ starts}
@z
+@x [1.2]
+@d banner==pTeX_banner
+@d banner_k==pTeX_banner_k
+@y
+@d banner==epTeX_banner
+@d banner_k==epTeX_banner_k
+@z
+
@x
@d max_quarterword=255 {largest allowable value in a |quarterword|}
@y
diff --git a/Build/source/texk/web2c/eptexdir/eptexextra.h b/Build/source/texk/web2c/eptexdir/eptexextra.h
index f9cf9747695..e232e433d57 100644
--- a/Build/source/texk/web2c/eptexdir/eptexextra.h
+++ b/Build/source/texk/web2c/eptexdir/eptexextra.h
@@ -4,9 +4,10 @@
*/
#include <eptexdir/etex_version.h> /* for ETEX_VERSION */
+#include <eptexdir/eptex_version.h> /* for EPTEX_VERSION */
#include <eptexdir/ptex_version.h> /* for PTEX_VERSION */
-#define BANNER "This is e-pTeX, Version 3.1415926-" PTEX_VERSION "-" ETEX_VERSION
+#define BANNER "This is e-pTeX, Version 3.1415926-" PTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION
#define COPYRIGHT_HOLDER "D.E. Knuth"
#define AUTHOR NULL
#define PROGRAM_HELP EPTEXHELP
diff --git a/Build/source/texk/web2c/eptexdir/etex.ch1 b/Build/source/texk/web2c/eptexdir/etex.ch1
index 0032ec606e5..1f5fac7bb73 100644
--- a/Build/source/texk/web2c/eptexdir/etex.ch1
+++ b/Build/source/texk/web2c/eptexdir/etex.ch1
@@ -1,14 +1,6 @@
% eptexdir/etex.ch1: changefile used to build e-pTeX, see eptexdir/eptex-base.ch for details.
% Public domain. Originally written by Peter Breitenlohner <tex-live@tug.org>.
-@x [1.2]
-@d banner==pTeX_banner
-@d banner_k==pTeX_banner_k
-@y
-@d banner==epTeX_banner
-@d banner_k==epTeX_banner_k
-@z
-
@x [12.184]
begin print(", "); print_direction(box_dir(p));
@y
@@ -25,9 +17,9 @@
@z
@x [27.468]
-@d job_name_code=10 {command code for \.{\\jobname}}
+@d job_name_code=ptex_convert_codes {command code for \.{\\jobname}}
@y
-@d etex_convert_base=10 {base for \eTeX's command codes}
+@d etex_convert_base=ptex_convert_codes {base for \eTeX's command codes}
@d eTeX_revision_code=etex_convert_base {command code for \.{\\eTeXrevision}}
@d etex_convert_codes=etex_convert_base+1 {end of \eTeX's command codes}
@d job_name_code=etex_convert_codes {command code for \.{\\jobname}}
diff --git a/Build/source/texk/web2c/eptexdir/fam256.ch b/Build/source/texk/web2c/eptexdir/fam256.ch
index dc759b93812..829ee8113c5 100644
--- a/Build/source/texk/web2c/eptexdir/fam256.ch
+++ b/Build/source/texk/web2c/eptexdir/fam256.ch
@@ -260,7 +260,8 @@ end;
@x
char_given,math_given: scanned_result(cur_chr)(int_val);
@y
-char_given,math_given,omath_given: scanned_result(cur_chr)(int_val);
+omath_given,
+char_given,math_given: scanned_result(cur_chr)(int_val);
@z
%-----------------------------------------------
@x
diff --git a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
index 3c5b58f822b..077b3b384c0 100644
--- a/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
+++ b/Build/source/texk/web2c/eptexdir/pdfsavepos.ch
@@ -39,12 +39,6 @@ pdf_page_height_code: print_esc("pdfpageheight");
@z
@x
-@d etex_convert_codes=etex_convert_base+2 {end of \eTeX's command codes}
-@y
-@d etex_convert_codes=etex_convert_base+3 {end of \eTeX's command codes}
-@z
-
-@x
@ @<Initialize variables as |ship_out| begins@>=
@y
@ @<Initialize variables as |ship_out| begins@>=
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
new file mode 100644
index 00000000000..5fafa60045e
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -0,0 +1,111 @@
+## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX.
+##
+## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## e-upTeX
+##
+if EUPTEX
+bin_PROGRAMS += euptex
+endif EUPTEX
+EXTRA_PROGRAMS += euptex
+
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+
+# With --enable-ipc, e-upTeX may need to link with -lsocket.
+euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+
+# e-upTeX C sources
+euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
+nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \
+ euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h
+dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h
+
+# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS.
+euptex_prereq = euptexd.h euptexdir/etex_version.h euptexdir/eptex_version.h \
+ euptexdir/ptex_version.h euptexdir/uptex_version.h
+$(euptex_OBJECTS): $(euptex_prereq)
+
+$(euptex_c_h): euptex-web2c
+ @$(web2c) euptex
+euptex-web2c: euptex.p $(web2c_texmf) euptexdir/euptex.defines
+ @$(web2c) euptex
+
+euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp)
+ $(makecpool) euptex >$@ || rm -f $@
+
+# Tangling e-upTeX
+euptex.p euptex.pool: euptex-tangle
+ @$(texmf_tangle) euptex euptex
+euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
+ @$(texmf_tangle) euptex euptex
+
+# Extract etex version
+euptexdir/etex_version.h: etexdir/etex.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract eptex version
+euptexdir/eptex_version.h: eptexdir/eptex.ech
+ $(MKDIR_P) euptexdir
+ grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract ptex version
+euptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract uptex version
+euptexdir/uptex_version.h: uptexdir/uptex-m.ch
+ $(MKDIR_P) euptexdir
+ grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate euptex.web
+euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
+ $(tie) -m euptex.web $(euptex_web_srcs)
+euptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+# Generate euptex.ch
+euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
+ $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+euptex_ch_srcs = \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ euptexdir/euptex.ch0 \
+ eptexdir/eptex.ech \
+ euptexdir/euptex.ch1 \
+ eptexdir/etex.ch1 \
+ $(euptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ euptexdir/fam256-eup.ch \
+ euptexdir/pdfstrcmp-eup-pre.ch \
+ eptexdir/pdfstrcmp.ch \
+ euptexdir/pdfstrcmp-eup-post.ch \
+ eptexdir/pdfsavepos.ch \
+ euptexdir/pdfsavepos-eup.ch \
+ tex-binpool.ch
+
+EXTRA_DIST += $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines
+
+DISTCLEANFILES += $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+ euptex.p euptex.pool euptex-tangle
+
+## =============
+
+e-upTeX.w: euptex.p
+ $(tie) -m e-upTeX.w euptex.web euptex.ch
+
+e-pTeX.w: eptex.p
+ $(tie) -m e-pTeX.w eptex.web eptex.ch
+
+foo: e-pTeX.w e-upTeX.w upTeX.w
diff --git a/Build/source/texk/web2c/euptexdir/euptex.ch0 b/Build/source/texk/web2c/euptexdir/euptex.ch0
new file mode 100644
index 00000000000..e35be327ffb
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/euptex.ch0
@@ -0,0 +1,37 @@
+@x e-upTeX: logo
+\def\eTeX{$\varepsilon$-\TeX}
+@y
+\def\eTeX{$\varepsilon$-\TeX}
+\def\eupTeX{$\varepsilon$-up\TeX}
+@z
+
+@x e-upTeX: banner
+ {printed when up\TeX\ starts}
+@y
+ {printed when up\TeX\ starts}
+@#
+@d eupTeX_version==pTeX_version_string,upTeX_version_string,epTeX_version_string,eTeX_version_string
+@d eupTeX_banner=='This is e-upTeX, Version 3.1415926',eupTeX_version
+@d eupTeX_banner_k==eupTeX_banner
+ {printed when \eupTeX\ starts}
+@z
+
+@x [1.2]
+@d banner==upTeX_banner
+@d banner_k==upTeX_banner_k
+@y
+@d banner==pTeX_banner
+@d banner_k==pTeX_banner_k
+@z
+
+@x
+@d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
+@y
+@d max_quarterword=255 {largest allowable value in a |quarterword|}
+@z
+
+@x
+@d protected_token=@'7001 {$2^8\cdot|end_match|+1$}
+@y
+@d protected_token=@"E01 {$2^8\cdot|end_match|+1$}
+@z
diff --git a/Build/source/texk/web2c/euptexdir/euptex.ch1 b/Build/source/texk/web2c/euptexdir/euptex.ch1
new file mode 100644
index 00000000000..1a2039cb62d
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/euptex.ch1
@@ -0,0 +1,27 @@
+@x [1.2]
+@d banner==epTeX_banner
+@d banner_k==epTeX_banner_k
+@y
+@d banner==eupTeX_banner
+@d banner_k==eupTeX_banner_k
+@z
+
+@x e-pTeX: ifcsname l.28620
+ if check_kanji(info(p)) then {|wchar_token|}
+ begin buffer[m]:=Hi(info(p)); incr(m);
+ end;
+ buffer[m]:=Lo(info(p)); incr(m); p:=link(p);
+@y
+ if check_kanji(info(p),4)=2 then {|wchar_token|}
+ begin
+ if BYTE1(toBUFF(info(p) mod max_cjk_val))<>0 then begin buffer[m]:=BYTE1(toBUFF(info(p) mod max_cjk_val)); incr(m); end;
+ if BYTE2(toBUFF(info(p) mod max_cjk_val))<>0 then begin buffer[m]:=BYTE2(toBUFF(info(p) mod max_cjk_val)); incr(m); end;
+ if BYTE3(toBUFF(info(p) mod max_cjk_val))<>0 then begin buffer[m]:=BYTE3(toBUFF(info(p) mod max_cjk_val)); incr(m); end;
+ buffer[m]:=BYTE4(toBUFF(info(p) mod max_cjk_val)); incr(m);
+ p:=link(p);
+ end
+ else
+ begin buffer[m]:=info(p) mod max_char_val; incr(m); p:=link(p);
+ end;
+@z
+
diff --git a/Build/source/texk/web2c/euptexdir/euptex.defines b/Build/source/texk/web2c/euptexdir/euptex.defines
new file mode 100644
index 00000000000..5c76fc01af1
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/euptex.defines
@@ -0,0 +1,49 @@
+{ defined at kanji.c, kanji.h, ptexenc/ptexenc.h, ptexenc/unicode.h }
+@define function BYTE1 ();
+@define function BYTE2 ();
+@define function BYTE3 ();
+@define function BYTE4 ();
+@define function Hi ();
+@define function Lo ();
+@define procedure initdefaultkanji;
+@define procedure forcesjisterm ();
+
+@define function getencstring;
+@define function setencstring ();
+@define procedure setpriorfileenc;
+@define function isinternalUPTEX;
+@define procedure setptexencuptex;
+
+@define function iskanji1 ();
+@define function is1stchr ();
+@define function ismultichr ();
+
+@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 fromUCS ();
+@define function UCStoUTF8 ();
+@define function toUCS ();
+
+@define function checkkanji ();
+@define function iskanji ();
+@define function ischarascii ();
+@define function iswcharascii ();
+@define function ismultiprn ();
+@define function calcpos ();
+@define function kcatcodekey ();
+@define function multilenbuffchar ();
+@define function nrestmultichr ();
+
+@define function getintone();
+@define procedure setintone();
diff --git a/Build/source/texk/web2c/euptexdir/euptexextra.c b/Build/source/texk/web2c/euptexdir/euptexextra.c
new file mode 100644
index 00000000000..f710b584d5c
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/euptexextra.c
@@ -0,0 +1,11 @@
+/* euptexextra.c: Hand-coded routines for e-upTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from euptexd.h here. */
+
+/* This file defines TeX and eupTeX. */
+#include <euptexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/euptexdir/euptexextra.h b/Build/source/texk/web2c/euptexdir/euptexextra.h
new file mode 100644
index 00000000000..6e9d4071c13
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/euptexextra.h
@@ -0,0 +1,27 @@
+/* euptexextra.h: banner etc. for e-upTeX.
+
+ This is included by e-upTeX, from euptexextra.c
+*/
+
+#include <euptexdir/eptex_version.h> /* for EPTEX_VERSION */
+#include <euptexdir/etex_version.h> /* for ETEX_VERSION */
+#include <euptexdir/ptex_version.h> /* for PTEX_VERSION */
+#include <euptexdir/uptex_version.h> /* for UPTEX_VERSION */
+
+#define BANNER "This is e-upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION
+#define COPYRIGHT_HOLDER "D.E. Knuth"
+#define AUTHOR NULL
+#define PROGRAM_HELP EUPTEXHELP
+#define BUG_ADDRESS "ptex-staff@ml.asciimw.jp"
+#define DUMP_VAR TEXformatdefault
+#define DUMP_LENGTH_VAR formatdefaultlength
+#define DUMP_OPTION "fmt"
+#define DUMP_EXT ".fmt"
+#define INPUT_FORMAT kpse_tex_format
+#define INI_PROGRAM "inieuptex"
+#define VIR_PROGRAM "vireuptex"
+
+#ifdef Xchr
+#undef Xchr
+#define Xchr(x) (x)
+#endif /* Xchr */
diff --git a/Build/source/texk/web2c/euptexdir/fam256-eup.ch b/Build/source/texk/web2c/euptexdir/fam256-eup.ch
new file mode 100644
index 00000000000..b69bf067c8c
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/fam256-eup.ch
@@ -0,0 +1,5 @@
+@x
+@d kchar_def_code=8 {|shorthand_def| for \.{\\kchardef}}
+@y
+@d kchar_def_code=9 {|shorthand_def| for \.{\\kchardef}}
+@z
diff --git a/Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch b/Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch
new file mode 100644
index 00000000000..a650c822694
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch
@@ -0,0 +1,5 @@
+@x
+@* \[54] System-dependent changes.
+@y
+@* \[56] System-dependent changes.
+@z
diff --git a/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch b/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch
new file mode 100644
index 00000000000..939ccb12a74
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-post.ch
@@ -0,0 +1,26 @@
+@x
+procedure print_kanji(@!s:integer); {prints a single character}
+begin
+if s>255 then begin
+ if isprint_utf8 then begin
+ s:=UCStoUTF8(toUCS(s));
+ if BYTE1(s)<>0 then print_char(BYTE1(s));
+ if BYTE2(s)<>0 then print_char(BYTE2(s));
+ if BYTE3(s)<>0 then print_char(BYTE3(s));
+ print_char(BYTE4(s));
+ end
+ else begin print_char(Hi(s)); print_char(Lo(s)); end;
+end
+else print_char(s);
+end;
+@y
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+begin
+if isprint_utf8 then s:=UCStoUTF8(toUCS(s mod max_cjk_val))
+else s:=toBUFF(s mod max_cjk_val);
+if BYTE1(s)<>0 then print_char(BYTE1(s));
+if BYTE2(s)<>0 then print_char(BYTE2(s));
+if BYTE3(s)<>0 then print_char(BYTE3(s));
+ print_char(BYTE4(s));
+end;
+@z
diff --git a/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-pre.ch b/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-pre.ch
new file mode 100644
index 00000000000..80c1a7dd555
--- /dev/null
+++ b/Build/source/texk/web2c/euptexdir/pdfstrcmp-eup-pre.ch
@@ -0,0 +1,17 @@
+@x
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+begin
+s:=toBUFF(s mod max_cjk_val);
+if BYTE1(s)<>0 then print_char(BYTE1(s));
+if BYTE2(s)<>0 then print_char(BYTE2(s));
+if BYTE3(s)<>0 then print_char(BYTE3(s));
+ print_char(BYTE4(s));
+end;
+@y
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+begin
+if s>255 then
+ begin print_char(Hi(s)); print_char(Lo(s));
+ end else print_char(s);
+end;
+@z
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 12dbd76daa9..c24f6863a20 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,4 +1,8 @@
-2011-08-04 Magnus Granberg <zorry@gentoo.org>
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * texmfmp.c: Add upTeX and e-upTeX.
+
+2011-08-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmfmp.c: Do not #include empty file <kpathsea/recorder.h>.
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 6384a5665c5..1e100e18043 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -53,6 +53,10 @@
#include <ptexdir/ptexextra.h>
#elif defined (epTeX)
#include <eptexdir/eptexextra.h>
+#elif defined (upTeX)
+#include <uptexdir/uptexextra.h>
+#elif defined (eupTeX)
+#include <euptexdir/euptexextra.h>
#else
#define BANNER "This is TeX, Version 3.1415926"
#define COPYRIGHT_HOLDER "D.E. Knuth"
@@ -88,6 +92,10 @@
#define VIR_PROGRAM "virmf"
#define edit_var "MFEDIT"
#endif /* MF */
+
+#define IS_eTeX (defined(eTeX) || defined(epTeX) || defined(eupTeX)) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX)
+#define IS_pTeX (defined(pTeX) || defined(epTeX) || defined(upTeX) || defined(eupTeX))
+#define IS_upTeX (defined(upTeX) || defined(eupTeX))
#if defined(__SyncTeX__)
/*
@@ -507,7 +515,7 @@ runsystem (const char *cmd)
a file handle (or NULL) instead of a status indicator. */
static FILE *
-runpopen (const char *cmd, const char *mode)
+runpopen (char *cmd, const char *mode)
{
FILE *f = NULL;
char *safecmd = NULL;
@@ -635,7 +643,7 @@ maininit (int ac, string *av)
since we want the --ini option, have to do it before getting into
the web (which would read the base file, etc.). */
parse_options (ac, av);
-
+
/* If -progname was not specified, default to the dump name. */
if (!user_progname)
user_progname = dump_name;
@@ -711,13 +719,13 @@ maininit (int ac, string *av)
if (mltexp) {
fprintf(stderr, "-mltex only works with -ini\n");
}
-#if !defined(XeTeX) && !defined(pTeX) && !defined(epTeX)
+#if !defined(XeTeX) && !IS_pTeX
if (enctexp) {
fprintf(stderr, "-enc only works with -ini\n");
}
#endif
#endif
-#if defined(eTeX) || defined(epTeX) || defined(Aleph) || defined(XeTeX)
+#if IS_eTeX
if (etexp) {
fprintf(stderr, "-etex only works with -ini\n");
}
@@ -799,11 +807,10 @@ main (int ac, string *av)
/* Call the real main program. */
mainbody ();
-
+
return EXIT_SUCCESS;
-}
+}
#endif /* !WIN32 || __MINGW32__ */
-
/* This is supposed to ``open the terminal for input'', but what we
really do is copy command line arguments into TeX's or Metafont's
@@ -897,13 +904,11 @@ topenin (void)
#ifndef O_NONBLOCK /* POSIX */
#ifdef O_NDELAY /* BSD */
#define O_NONBLOCK O_NDELAY
-#else
-#ifdef FNDELAY /* NeXT */
+#elif defined(O_FNDELAY) /* NeXT */
#define O_NONBLOCK O_FNDELAY
#else
what the fcntl? cannot implement IPC without equivalent for O_NONBLOCK.
-#endif /* no FNDELAY */
-#endif /* no O_NDELAY */
+#endif
#endif /* no O_NONBLOCK */
#endif /* !WIN32 */
@@ -933,7 +938,7 @@ ipc_make_name (void)
if (ipc_addr_len == 0) {
string s = getenv ("HOME");
if (s) {
- ipc_addr = (struct sockaddr*)xmalloc (strlen (s) + 40);
+ ipc_addr = xmalloc (strlen (s) + 40);
ipc_addr->sa_family = 0;
ipc_name = ipc_addr->sa_data;
strcpy (ipc_name, s);
@@ -944,7 +949,6 @@ ipc_make_name (void)
return ipc_addr_len;
}
-
static int sock = -1;
static int
@@ -953,7 +957,6 @@ ipc_is_open (void)
return sock >= 0;
}
-
static void
ipc_open_out (void) {
#ifdef WIN32
@@ -990,7 +993,6 @@ ipc_open_out (void) {
}
}
-
static void
ipc_close_out (void)
{
@@ -1013,13 +1015,13 @@ ipc_snd (int n, int is_eof, char *data)
char more_data[1024];
} ourmsg;
-#ifdef IPC_DEBUG
- fputs ("tex: Sending message to socket ...\n", stderr);
-#endif
if (!ipc_is_open ()) {
return;
}
+#ifdef IPC_DEBUG
+ fputs ("tex: Sending message to socket ...\n", stderr);
+#endif
ourmsg.msg.namelength = n;
ourmsg.msg.eof = is_eof;
if (n) {
@@ -1037,7 +1039,6 @@ ipc_snd (int n, int is_eof, char *data)
#endif
}
-
/* This routine notifies the server if there is an eof, or the filename
if a new DVI file is starting. This is the routine called by TeX.
Aleph defines str_start(#) as str_start_ar[# - too_big_char], with
@@ -1072,21 +1073,31 @@ ipcpage (int is_eof)
}
#endif
name[len] = 0;
-
+
/* Have to pass whole filename to the other end, since it may have
been started up and running as a daemon, e.g., as with the NeXT
preview program. */
p = concat3 (cwd, DIR_SEP_STRING, name);
free (cwd);
free (name);
+
+#if defined (WIN32)
+ { char *q;
+ for (q = p; *q; q++) {
+ if (*q == '\\')
+ *q = '/';
+ else if (IS_KANJI(q))
+ q++;
+ }
+ }
+#endif
len = strlen(p);
begun = true;
}
ipc_snd (len, is_eof, p);
- if (p) {
+ if (p)
free (p);
- }
}
#endif /* TeX && IPC */
@@ -1334,13 +1345,13 @@ static struct option long_options[]
#endif /* IPC */
#if !defined(Aleph)
{ "mltex", 0, &mltexp, 1 },
-#if !defined(XeTeX) && !defined(pTeX) && !defined(epTeX)
+#if !defined(XeTeX) && !IS_pTeX
{ "enc", 0, &enctexp, 1 },
-#endif /* !XeTeX && !pTeX && !epTeX */
+#endif
#endif /* !Aleph */
-#if defined (eTeX) || defined (epTeX) || defined(pdfTeX) || defined(Aleph) || defined(XeTeX)
+#if IS_eTeX
{ "etex", 0, &etexp, 1 },
-#endif /* eTeX || epTeX || pdfTeX || Aleph */
+#endif
{ "output-comment", 1, 0, 0 },
#if defined(pdfTeX)
{ "draftmode", 0, 0, 0 },
@@ -1379,12 +1390,14 @@ static struct option long_options[]
{ "mktex", 1, 0, 0 },
{ "no-mktex", 1, 0, 0 },
#endif /* TeX or MF */
-#if defined(pTeX) || defined(epTeX)
+#if IS_pTeX
{ "kanji", 1, 0, 0 },
-#endif /* pTeX || epTeX */
+#endif
+#if IS_upTeX
+ { "kanji-internal", 1, 0, 0 },
+#endif
{ 0, 0, 0, 0 } };
-
static void
parse_options (int argc, string *argv)
{
@@ -1529,12 +1542,18 @@ parse_options (int argc, string *argv)
} else {
WARNING1 ("Ignoring unknown argument `%s' to --interaction", optarg);
}
-#if defined(pTeX) || defined(epTeX)
+#if IS_pTeX
} else if (ARGUMENT_IS ("kanji")) {
if (!set_enc_string (optarg, NULL)) {
WARNING1 ("Ignoring unknown argument `%s' to --kanji", optarg);
}
-#endif /* pTeX || epTeX */
+#endif
+#if IS_upTeX
+ } else if (ARGUMENT_IS ("kanji-internal")) {
+ if (!set_enc_string (NULL, optarg)) {
+ WARNING1 ("Ignoring unknown argument `%s' to --kanji-internal",optarg);
+ }
+#endif
} else if (ARGUMENT_IS ("help")) {
usagehelp (PROGRAM_HELP, BUG_ADDRESS);
@@ -1708,7 +1727,7 @@ open_in_or_pipe (FILE **f_ptr, int filefmt, const_string fopen_mode)
{
string fname = NULL;
int i; /* iterator */
-
+
/* opening a read pipe is straightforward, only have to
skip past the pipe symbol in the file name. filename
quoting is assumed to happen elsewhere (it does :-)) */
@@ -1719,7 +1738,7 @@ open_in_or_pipe (FILE **f_ptr, int filefmt, const_string fopen_mode)
fname = xmalloc(strlen((const_string)(nameoffile+1))+1);
strcpy(fname,(const_string)(nameoffile+1));
recorder_record_input (fname + 1);
- *f_ptr = runpopen(fname+1,"r");
+ *f_ptr = runpopen(fname+1,"rb");
free(fname);
for (i=0; i<=15; i++) {
if (pipes[i]==NULL) {
@@ -1756,12 +1775,12 @@ open_out_or_pipe (FILE **f_ptr, const_string fopen_mode)
if (strchr (fname,' ')==NULL && strchr(fname,'>')==NULL) {
/* mp and mf currently do not use this code, but it
is better to be prepared */
- if (STREQ((fname+strlen(fname)-3),"tex"))
+ if (STREQ((fname+strlen(fname)-4),".tex"))
*(fname+strlen(fname)-4) = 0;
- *f_ptr = runpopen(fname+1,"w");
+ *f_ptr = runpopen(fname+1,"wb");
*(fname+strlen(fname)) = '.';
} else {
- *f_ptr = runpopen(fname+1,"w");
+ *f_ptr = runpopen(fname+1,"wb");
}
recorder_record_output (fname + 1);
free(fname);
@@ -1792,8 +1811,9 @@ close_file_or_pipe (FILE *f)
/* if this file was a pipe, pclose() it and return */
for (i=0; i<=15; i++) {
if (pipes[i] == f) {
- if (f)
+ if (f) {
pclose (f);
+ }
pipes[i] = NULL;
return;
}
@@ -1872,7 +1892,7 @@ get_date_and_time (integer *minutes, integer *day,
#ifdef WIN32
SetConsoleCtrlHandler(catch_interrupt, TRUE);
#else /* not WIN32 */
- RETSIGTYPE (*old_handler) (int);
+ RETSIGTYPE (*old_handler)(int);
old_handler = signal (SIGINT, catch_interrupt);
if (old_handler != SIG_DFL)
@@ -1938,13 +1958,13 @@ input_line (FILE *f)
int i = EOF;
/* Recognize either LF or CR as a line terminator. */
-#if defined(pTeX) || defined(epTeX)
+#if IS_pTeX
last = input_line2(f, (char *)buffer, first, bufsize, &i);
-#else /* pTeX || epTeX */
+#else
last = first;
while (last < bufsize && (i = getc (f)) != EOF && i != '\n' && i != '\r')
buffer[last++] = i;
-#endif /* pTeX || epTeX */
+#endif
if (i == EOF && errno != EINTR && last == first)
return false;
@@ -1979,12 +1999,12 @@ input_line (FILE *f)
buffer[i] = xord[buffer[i]];
#endif
-#if defined(pTeX) || defined(epTeX)
+#if IS_pTeX
for (i = last+1; (i < last + 5 && i < bufsize) ; i++)
buffer[i] = '\0';
-#endif /* pTeX || epTeX */
+#endif
- return true;
+ return true;
}
#endif /* !XeTeX */
@@ -2067,14 +2087,16 @@ calledit (packedASCIIcode *filename,
}
}
else
- *temp++ = c;
+ *temp++ = c;
}
*temp = 0;
/* Execute the command. */
- if (system (command) != 0)
- fprintf (stderr, "! Trouble executing `%s'.\n", command);
+ {
+ if (system (command) != 0)
+ fprintf (stderr, "! Trouble executing `%s'.\n", command);
+ }
/* Quit, since we found an error. */
uexit (1);
@@ -2233,7 +2255,7 @@ checkpoolpointer (poolpointer poolptr, size_t len)
}
}
-#ifndef XeTeX /* XeTeX uses this from XeTeX_mac.c */
+#ifndef XeTeX /* XeTeX uses this from XeTeX_ext.c */
static
#endif
int
@@ -2242,37 +2264,37 @@ maketexstring(const_string s)
size_t len;
#ifdef XeTeX
UInt32 rval;
- const unsigned char* cp = (const unsigned char*)s;
+ const unsigned char *cp = (const unsigned char *)s;
#endif
assert (s != 0);
len = strlen(s);
checkpoolpointer (poolptr, len); /* in the XeTeX case, this may be more than enough */
#ifdef XeTeX
while ((rval = *(cp++)) != 0) {
- UInt16 extraBytes = bytesFromUTF8[rval];
- switch (extraBytes) { /* note: code falls through cases! */
- case 5: rval <<= 6; if (*cp) rval += *(cp++);
- case 4: rval <<= 6; if (*cp) rval += *(cp++);
- case 3: rval <<= 6; if (*cp) rval += *(cp++);
- case 2: rval <<= 6; if (*cp) rval += *(cp++);
- case 1: rval <<= 6; if (*cp) rval += *(cp++);
- case 0: ;
- };
- rval -= offsetsFromUTF8[extraBytes];
- if (rval > 0xffff) {
- rval -= 0x10000;
- strpool[poolptr++] = 0xd800 + rval / 0x0400;
- strpool[poolptr++] = 0xdc00 + rval % 0x0400;
- }
- else
- strpool[poolptr++] = rval;
+ UInt16 extraBytes = bytesFromUTF8[rval];
+ switch (extraBytes) { /* note: code falls through cases! */
+ case 5: rval <<= 6; if (*cp) rval += *(cp++);
+ case 4: rval <<= 6; if (*cp) rval += *(cp++);
+ case 3: rval <<= 6; if (*cp) rval += *(cp++);
+ case 2: rval <<= 6; if (*cp) rval += *(cp++);
+ case 1: rval <<= 6; if (*cp) rval += *(cp++);
+ case 0: ;
+ };
+ rval -= offsetsFromUTF8[extraBytes];
+ if (rval > 0xffff) {
+ rval -= 0x10000;
+ strpool[poolptr++] = 0xd800 + rval / 0x0400;
+ strpool[poolptr++] = 0xdc00 + rval % 0x0400;
+ }
+ else
+ strpool[poolptr++] = rval;
}
#else /* ! XeTeX */
while (len-- > 0)
strpool[poolptr++] = *s++;
#endif /* ! XeTeX */
- return (makestring());
+ return makestring();
}
#endif /* !pdfTeX */
@@ -2409,7 +2431,7 @@ makesrcspecial (strnumber srcfilename, int lineno)
char *filename = gettexstring(srcfilename);
/* FIXME: Magic number. */
char buf[40];
- char * s = buf;
+ char *s = buf;
/* Always put a space after the number, which makes things easier
* to parse.
@@ -2427,7 +2449,7 @@ makesrcspecial (strnumber srcfilename, int lineno)
s = filename;
while (*s)
strpool[poolptr++] = *s++;
-
+
return (oldpoolptr);
}
#endif
@@ -2731,6 +2753,7 @@ static struct mfwin_sw *mfwp;
boolean
initscreen (void)
{
+ int retval;
/* If MFTERM is set, use it. */
const_string tty_type = kpse_var_value ("MFTERM");
@@ -2761,8 +2784,13 @@ initscreen (void)
for (mfwp = mfwsw; mfwp->mfwsw_type != NULL; mfwp++) {
if (!strncmp (mfwp->mfwsw_type, tty_type, strlen (mfwp->mfwsw_type))
|| STREQ (tty_type, "emacs")) {
- if (mfwp->mfwsw_initscreen)
- return ((*mfwp->mfwsw_initscreen) ());
+ if (mfwp->mfwsw_initscreen) {
+ retval = (*mfwp->mfwsw_initscreen) ();
+#ifdef WIN32
+ Sleep(1000); /* Wait for opening a window */
+#endif
+ return retval;
+ }
else {
fprintf (stderr, "mf: Couldn't initialize online display for `%s'.\n",
tty_type);
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 37600573f4d..fc5bdf9cfcd 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ptex-base.ch: Slightly reformulate to simplify e-upTeX.
+
+ * kanji.h [MP]: Remove TEXMFPOOLNAME and TEXMFENGINENAME.
+
2011-07-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/ptex.am (pweb_tests): New variable for tests of pTeX
diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h
index 003944a3bae..421a524b56d 100644
--- a/Build/source/texk/web2c/ptexdir/kanji.h
+++ b/Build/source/texk/web2c/ptexdir/kanji.h
@@ -17,18 +17,18 @@
#define Hi(x) (((x) >> 8) & 0xff)
#define Lo(x) ((x) & 0xff)
-extern boolean check_kanji(integer c);
+extern boolean check_kanji (integer c);
#define checkkanji check_kanji
-extern boolean is_kanji(integer c);
+extern boolean is_kanji (integer c);
#define iskanji is_kanji
-extern boolean is_char_ascii(integer c);
+extern boolean is_char_ascii (integer c);
#define ischarascii is_char_ascii
-extern boolean is_wchar_ascii(integer c);
+extern boolean is_wchar_ascii (integer c);
#define iswcharascii is_wchar_ascii
-extern boolean ismultiprn(integer c);
-extern integer calc_pos(integer c);
+extern boolean ismultiprn (integer c);
+extern integer calc_pos (integer c);
#define calcpos calc_pos
-extern integer kcatcodekey(integer c);
+extern integer kcatcodekey (integer c);
#ifndef PRESERVE_PUTC
#undef putc
@@ -41,11 +41,4 @@ extern integer kcatcodekey(integer c);
#define inputline2(fp,buff,pos,size) input_line2(fp,buff,pos,size,NULL)
#endif
-#ifdef MP
-#undef TEXMFPOOLNAME
-#undef TEXMFENGINENAME
-#define TEXMFPOOLNAME "jmp.pool"
-#define TEXMFENGINENAME "jmpost"
-#endif /* MP */
-
#endif /* not KANJI_H */
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index 051df8a7fce..010ca831e5a 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -2171,7 +2171,8 @@ else if scan_keyword("sp") then goto done
@d sjis_code=7 {command code for \.{\\sjis}}
@d jis_code=8 {command code for \.{\\jis}}
@d kuten_code=9 {command code for \.{\\kuten}}
-@d job_name_code=10 {command code for \.{\\jobname}}
+@d ptex_convert_codes=10 {end of \eTeX's command codes}
+@d job_name_code=ptex_convert_codes {command code for \.{\\jobname}}
@z
@x [27.468] l.9547 - pTeX:
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog
index 3fb8ccbbce7..57c382f2a74 100644
--- a/Build/source/texk/web2c/synctexdir/ChangeLog
+++ b/Build/source/texk/web2c/synctexdir/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/synctex.am: Add upTeX and e-upTeX.
+ * synctex-euptex.h, synctex-uptex.h: New files.
+
2011-07-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/synctex.am (eptex_ch_synctex): Bug fix:
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index e34293e4ee7..8eea18c6531 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -144,6 +144,36 @@ EXTRA_DIST += \
synctexdir/synctex-p-rec.ch0 \
synctexdir/synctex-p-rec.ch1
+## SyncTeX infrastructure: upTeX
+
+if UPTEX_SYNCTEX
+
+uptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+uptex_LDADD += $(ZLIB_LIBS)
+uptex_prereq += $(ZLIB_DEPEND)
+
+uptex_ch_synctex = \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch1 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_uptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-uptex.h
+
+uptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
+
+endif UPTEX_SYNCTEX
+
## SyncTeX infrastructure: e-pTeX
if EPTEX_SYNCTEX
@@ -180,6 +210,38 @@ EXTRA_DIST += \
synctexdir/synctex-ep-mem.ch0 \
synctexdir/synctex-ep-mem.ch1
+## SyncTeX infrastructure: e-upTeX
+
+if EUPTEX_SYNCTEX
+
+euptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+euptex_LDADD += $(ZLIB_LIBS)
+euptex_prereq += $(ZLIB_DEPEND)
+
+euptex_ch_synctex = \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch1 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-e-rec.ch0 \
+ synctexdir/synctex-e-rec.ch1 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_euptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-euptex.h
+
+euptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
+
+endif EUPTEX_SYNCTEX
+
## SyncTeX infrastructure: pdfTeX
if PDFTEX_SYNCTEX
diff --git a/Build/source/texk/web2c/synctexdir/synctex-euptex.h b/Build/source/texk/web2c/synctexdir/synctex-euptex.h
new file mode 100644
index 00000000000..a1a9e1c712d
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-euptex.h
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "euptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/synctexdir/synctex-uptex.h b/Build/source/texk/web2c/synctexdir/synctex-uptex.h
new file mode 100644
index 00000000000..86a82d205b1
--- /dev/null
+++ b/Build/source/texk/web2c/synctexdir/synctex-uptex.h
@@ -0,0 +1,57 @@
+/*
+Copyright (c) 2011 jerome DOT laurens AT u-bourgogne DOT fr
+
+This file is part of the SyncTeX package.
+
+Latest Revision: Wed Jun 30 11:00:00 UTC 2011
+
+License:
+--------
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE
+
+Except as contained in this notice, the name of the copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Software without prior written
+authorization from the copyright holder.
+
+Acknowledgments:
+----------------
+The author received useful remarks from the pdfTeX developers, especially Hahn The Thanh,
+and significant help from XeTeX developer Jonathan Kew
+
+Nota Bene:
+----------
+If you include or use a significant part of the synctex package into a software,
+I would appreciate to be listed as contributor and see "SyncTeX" highlighted.
+
+Version 1
+Thu Jun 30 11:00:00 UTC 2011
+
+*/
+
+#include "uptexd.h"
+
+#define box_node_size (8+synchronization_field_size)
+
+#define rule_node 3
+#define glue_node 12
+#define kern_node 13
diff --git a/Build/source/texk/web2c/texmfmem.h b/Build/source/texk/web2c/texmfmem.h
index 4841f759ba3..a53025f1925 100644
--- a/Build/source/texk/web2c/texmfmem.h
+++ b/Build/source/texk/web2c/texmfmem.h
@@ -63,7 +63,7 @@
*/
/* Aleph is sufficiently different to separate the definition. */
-#if !defined(Aleph) && !defined(epTeX)
+#if !defined(Aleph) && !defined(epTeX) && !defined(eupTeX)
typedef union
{
@@ -181,7 +181,7 @@ typedef union
#define qqqq v.QQQQ
#endif
-#else /* Aleph */
+#else /* Aleph || epTeX || eupTeX */
typedef union
{
@@ -257,4 +257,4 @@ typedef union
#define gr gg.GLUE
-#endif /* Aleph */
+#endif /* Aleph || epTeX || eupTeX */
diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h
index b8242269e8e..87bd3e4bd72 100644
--- a/Build/source/texk/web2c/texmfmp-help.h
+++ b/Build/source/texk/web2c/texmfmp-help.h
@@ -193,6 +193,58 @@ const_string ETEXHELP[] = {
};
#endif /* eTeX */
+#ifdef eupTeX
+const_string EUPTEXHELP[] = {
+ "Usage: euptex [option] texfile",
+ " : euptex [option] &format texfile",
+ "",
+ "-etex enable e-TeX extensions",
+ "-fmt=NAME use NAME instead of program name or %&format.",
+#ifdef WIN32
+ "[-no]-guess-input-enc disable/enable to guess input file encoding",
+#endif
+ "-halt-on-error stop processing at the first error",
+ "[-no]-file-line-error disable/enable file:line:error style messages",
+ "-ini be iniptex.",
+ "-interaction=STRING set interaction mode (STRING=batchmode|nonstopmode|",
+ " scrollmode|errorstopmode)",
+#ifdef IPC
+ "-ipc send DVI output to a socket as well as the usual",
+ " output file",
+ "-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|utf8|uptex)",
+ "-kanji-internal=STRING set Japanese internal encoding",
+ "-kpathsea-debug=NUMBER set path searching debugging flags according to",
+ " the bits of NUMBER",
+ "[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",
+ "-mltex enable MLTeX extensions such as \\charsubdef",
+ "-output-comment=STRING use STRING for DVI file comment instead of date",
+ "-output-directory=DIR use existing DIR as the directory to write files in",
+ "[-no]-parse-first-line disable/enable parsing of first line of input file",
+#ifdef WIN32
+ "-proctimes print process times, if possible",
+#endif
+ "-progname=STRING set program (and fmt) name to STRING",
+ "-recorder enable filename recorder",
+ "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}",
+ "-shell-restricted enable restricted \\write18",
+ "-sjis-terminal always output to stdout and stderr by sjis",
+ "-src-specials insert source specials into the DVI file",
+ "-src-specials=WHERE insert source specials in certain places of",
+ " the DVI file. WHERE is a comma-separated value",
+ " list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+ "-synctex=NUMBER generate SyncTeX data for previewers if nonzero",
+#endif
+ "-translate-file=TCXNAME use the TCX file TCXNAME",
+ "-help print this message and exit.",
+ "-version print version information and exit.",
+ NULL
+};
+#endif /* eupTeX */
+
#ifdef MF
const_string MFHELP[] = {
"Usage: mf [OPTION]... [MFNAME[.mf]] [COMMANDS]",
@@ -419,6 +471,57 @@ const_string TEXHELP[] = {
};
#endif /* onlyTeX */
+#ifdef upTeX
+const_string UPTEXHELP[] = {
+ "Usage: uptex [option] texfile",
+ " : uptex [option] &format texfile",
+ "",
+ "-fmt=NAME use NAME instead of program name or %&format.",
+#ifdef WIN32
+ "[-no]-guess-input-enc disable/enable to guess input file encoding",
+#endif
+ "-halt-on-error stop processing at the first error",
+ "[-no]-file-line-error disable/enable file:line:error style messages",
+ "-ini be iniptex.",
+ "-interaction=STRING set interaction mode (STRING=batchmode|nonstopmode|",
+ " scrollmode|errorstopmode)",
+#ifdef IPC
+ "-ipc send DVI output to a socket as well as the usual",
+ " output file",
+ "-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|utf8|uptex)",
+ "-kanji-internal=STRING set Japanese internal encoding",
+ "-kpathsea-debug=NUMBER set path searching debugging flags according to",
+ " the bits of NUMBER",
+ "[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=tex/tfm)",
+ "-mltex enable MLTeX extensions such as \\charsubdef",
+ "-output-comment=STRING use STRING for DVI file comment instead of date",
+ "-output-directory=DIR use existing DIR as the directory to write files in",
+ "[-no]-parse-first-line disable/enable parsing of first line of input file",
+#ifdef WIN32
+ "-proctimes print process times, if possible",
+#endif
+ "-progname=STRING set program (and fmt) name to STRING",
+ "-recorder enable filename recorder",
+ "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}",
+ "-shell-restricted enable restricted \\write18",
+ "-sjis-terminal always output to stdout and stderr by sjis",
+ "-src-specials insert source specials into the DVI file",
+ "-src-specials=WHERE insert source specials in certain places of",
+ " the DVI file. WHERE is a comma-separated value",
+ " list: cr display hbox math par parend vbox",
+#if defined(__SyncTeX__)
+ "-synctex=NUMBER generate SyncTeX data for previewers if nonzero",
+#endif
+ "-translate-file=TCXNAME use the TCX file TCXNAME",
+ "-help print this message and exit.",
+ "-version print version information and exit.",
+ NULL
+};
+#endif /* upTeX */
+
#ifdef XeTeX
const_string XETEXHELP[] = {
"Usage: xetex [OPTION]... [TEXNAME[.tex]] [COMMANDS]",
diff --git a/Build/source/texk/web2c/texmfmp.h b/Build/source/texk/web2c/texmfmp.h
index 58d068a8a34..4f773f2c708 100644
--- a/Build/source/texk/web2c/texmfmp.h
+++ b/Build/source/texk/web2c/texmfmp.h
@@ -67,6 +67,14 @@ typedef void* voidpointer;
#define TEXMFPOOLNAME "eptex.pool"
#define TEXMFENGINENAME "eptex"
#include "ptexdir/kanji.h"
+#elif defined (upTeX)
+#define TEXMFPOOLNAME "uptex.pool"
+#define TEXMFENGINENAME "uptex"
+#include "uptexdir/kanji.h"
+#elif defined (eupTeX)
+#define TEXMFPOOLNAME "euptex.pool"
+#define TEXMFENGINENAME "euptex"
+#include "uptexdir/kanji.h"
#else
#define TEXMFPOOLNAME "tex.pool"
#define TEXMFENGINENAME "tex"
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
new file mode 100644
index 00000000000..b231964f896
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -0,0 +1,86 @@
+## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
+##
+## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+
+## libukanji.a for upTeX and e-upTeX
+##
+EXTRA_LIBRARIES += libukanji.a
+libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h
+libukanji_a_CPPFLAGS = $(uptex_cppflags)
+
+## upTeX
+##
+if UPTEX
+bin_PROGRAMS += uptex
+endif UPTEX
+EXTRA_PROGRAMS += uptex
+
+uptex_CPPFLAGS = $(uptex_cppflags)
+
+# With --enable-ipc, upTeX may need to link with -lsocket.
+uptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+
+# upTeX C sources
+uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
+nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h
+
+# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS.
+uptex_prereq = uptexd.h uptexdir/ptex_version.h uptexdir/uptex_version.h
+$(uptex_OBJECTS): $(uptex_prereq)
+
+$(uptex_c_h): uptex-web2c
+ @$(web2c) uptex
+uptex-web2c: uptex.p $(web2c_texmf) uptexdir/uptex.defines
+ @$(web2c) uptex
+
+uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp)
+ $(makecpool) uptex >$@ || rm -f $@
+
+# Tangling upTeX
+uptex.p uptex.pool: uptex-tangle
+ @$(texmf_tangle) uptex uptex
+uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
+ @$(texmf_tangle) uptex uptex
+
+# Extract ptex version
+uptexdir/ptex_version.h: ptexdir/ptex-base.ch
+ $(MKDIR_P) uptexdir
+ grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract uptex version
+uptexdir/uptex_version.h: uptexdir/uptex-m.ch
+ $(MKDIR_P) uptexdir
+ grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate uptex.web
+uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
+ $(tie) -m uptex.web $(uptex_web_srcs)
+uptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+# Generate uptex.ch
+uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
+ $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+uptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ $(uptex_ch_synctex) \
+ tex-binpool.ch
+
+EXTRA_DIST += $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines
+
+DISTCLEANFILES += $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c \
+ uptex.p uptex.pool uptex-tangle
+
+## =============
+
+upTeX.w: uptex.p
+ $(tie) -m upTeX.w uptex.web uptex.ch
+
diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c
new file mode 100644
index 00000000000..5e46647ef06
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/kanji.c
@@ -0,0 +1,364 @@
+/*
+ * KANJI Code conversion routines.
+ * (for ptex only)
+ */
+
+#include "kanji.h"
+
+#define CS_TOKEN_FLAG 0x1FFFFFFF
+#define CJK_CHAR_LIMIT 0x1000000
+#define CJK_TOKEN_FLAG 0xFFFFFF
+#define KCAT_KANJI 16
+#define KCAT_HANGUL 19
+
+/* m: for debug */
+integer check_kanji (integer c,integer m)
+{
+ if (c > CS_TOKEN_FLAG) return 0;
+ if (is_internalUPTEX()) {
+ if ((c & CJK_TOKEN_FLAG) < CJK_CHAR_LIMIT) {
+ if (XXHi(c)==0) return 1;
+ else if (XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL) return 2;
+ }
+ } else {
+ if ((XHi(c)==0) &&
+ iskanji1(Hi(c)) && iskanji2(Lo(c))) {
+ if (XXHi(c)==0) return 1;
+ else if (XXHi(c)>=KCAT_KANJI && XXHi(c)<=KCAT_HANGUL) return 2;
+ }
+ }
+ if (0 <= c && c <= 255) return -1; /* ascii without catcode */
+ return 0; /* ascii with catcode */
+}
+
+boolean is_kanji(integer c)
+{
+ return (iskanji1(Hi(c)) && iskanji2(Lo(c)));
+}
+
+boolean is_char_ascii(integer c)
+{
+ return (0 <= c && c < 0x100);
+}
+
+boolean is_wchar_ascii(integer c)
+{
+ return (!is_char_ascii(c) && !is_kanji(c));
+}
+
+boolean ismultiprn(integer c)
+{
+ int i, j;
+
+ for (i=2; i<=4; i++) for (j=1; j<=i; j++) {
+ if (ismultichr(i,j,c)) return true;
+ }
+ return false;
+}
+
+integer calc_pos(integer c)
+{
+ unsigned char c1, c2;
+
+ if(c>=0 && c<=255) return(c);
+ c1 = Hi(c);
+ c2 = Lo(c);
+
+ c1 = (c1 % 4) * 64; /* c1 = 0, 64, 128, 192 */
+ c2 = c2 % 64; /* c2 = 0..63 */
+ return(c1 + c2); /* ret = 0..255 */
+}
+
+/* Ref. http://www.unicode.org/Public/UNIDATA/Blocks.txt */
+static long ucs_range[]={
+ 0x0000, /* Basic Latin 0x00 */
+ 0x0080, /* Latin-1 Supplement 0x01 */
+ 0x0100, /* Latin Extended-A 0x02 */
+ 0x0180, /* Latin Extended-B 0x03 */
+ 0x0250, /* IPA Extensions 0x04 */
+ 0x02B0, /* Spacing Modifier Letters 0x05 */
+ 0x0300, /* Combining Diacritical Marks 0x06 */
+ 0x0370, /* Greek and Coptic 0x07 */
+ 0x0400, /* Cyrillic 0x08 */
+ 0x0500, /* Cyrillic Supplement 0x09 */
+ 0x0530, /* Armenian 0x0a */
+ 0x0590, /* Hebrew 0x0b */
+ 0x0600, /* Arabic 0x0c */
+ 0x0700, /* Syriac 0x0d */
+ 0x0750, /* Arabic Supplement 0x0e */
+ 0x0780, /* Thaana 0x0f */
+ 0x07C0, /* NKo 0x10 */
+ 0x0800, /* Samaritan 0x11 */
+ 0x0900, /* Devanagari 0x12 */
+ 0x0980, /* Bengali 0x13 */
+ 0x0A00, /* Gurmukhi 0x14 */
+ 0x0A80, /* Gujarati 0x15 */
+ 0x0B00, /* Oriya 0x16 */
+ 0x0B80, /* Tamil 0x17 */
+ 0x0C00, /* Telugu 0x18 */
+ 0x0C80, /* Kannada 0x19 */
+ 0x0D00, /* Malayalam 0x1a */
+ 0x0D80, /* Sinhala 0x1b */
+ 0x0E00, /* Thai 0x1c */
+ 0x0E80, /* Lao 0x1d */
+ 0x0F00, /* Tibetan 0x1e */
+ 0x1000, /* Myanmar 0x1f */
+ 0x10A0, /* Georgian 0x20 */
+ 0x1100, /* Hangul Jamo 0x21 */
+ 0x1200, /* Ethiopic 0x22 */
+ 0x1380, /* Ethiopic Supplement 0x23 */
+ 0x13A0, /* Cherokee 0x24 */
+ 0x1400, /* Unified Canadian Aboriginal Syllabics 0x25 */
+ 0x1680, /* Ogham 0x26 */
+ 0x16A0, /* Runic 0x27 */
+ 0x1700, /* Tagalog 0x28 */
+ 0x1720, /* Hanunoo 0x29 */
+ 0x1740, /* Buhid 0x2a */
+ 0x1760, /* Tagbanwa 0x2b */
+ 0x1780, /* Khmer 0x2c */
+ 0x1800, /* Mongolian 0x2d */
+ 0x18B0, /* Unified Canadian Aboriginal Syllabics Extended 0x2e */
+ 0x1900, /* Limbu 0x2f */
+ 0x1950, /* Tai Le 0x30 */
+ 0x1980, /* New Tai Lue 0x31 */
+ 0x19E0, /* Khmer Symbols 0x32 */
+ 0x1A00, /* Buginese 0x33 */
+ 0x1A20, /* Tai Tham 0x34 */
+ 0x1B00, /* Balinese 0x35 */
+ 0x1B80, /* Sundanese 0x36 */
+ 0x1C00, /* Lepcha 0x37 */
+ 0x1C50, /* Ol Chiki 0x38 */
+ 0x1CD0, /* Vedic Extensions 0x39 */
+ 0x1D00, /* Phonetic Extensions 0x3a */
+ 0x1D80, /* Phonetic Extensions Supplement 0x3b */
+ 0x1DC0, /* Combining Diacritical Marks Supplement 0x3c */
+ 0x1E00, /* Latin Extended Additional 0x3d */
+ 0x1F00, /* Greek Extended 0x3e */
+ 0x2000, /* General Punctuation 0x3f */
+ 0x2070, /* Superscripts and Subscripts 0x40 */
+ 0x20A0, /* Currency Symbols 0x41 */
+ 0x20D0, /* Combining Diacritical Marks for Symbols 0x42 */
+ 0x2100, /* Letterlike Symbols 0x43 */
+ 0x2150, /* Number Forms 0x44 */
+ 0x2190, /* Arrows 0x45 */
+ 0x2200, /* Mathematical Operators 0x46 */
+ 0x2300, /* Miscellaneous Technical 0x47 */
+ 0x2400, /* Control Pictures 0x48 */
+ 0x2440, /* Optical Character Recognition 0x49 */
+ 0x2460, /* Enclosed Alphanumerics 0x4a */
+ 0x2500, /* Box Drawing 0x4b */
+ 0x2580, /* Block Elements 0x4c */
+ 0x25A0, /* Geometric Shapes 0x4d */
+ 0x2600, /* Miscellaneous Symbols 0x4e */
+ 0x2700, /* Dingbats 0x4f */
+ 0x27C0, /* Miscellaneous Mathematical Symbols-A 0x50 */
+ 0x27F0, /* Supplemental Arrows-A 0x51 */
+ 0x2800, /* Braille Patterns 0x52 */
+ 0x2900, /* Supplemental Arrows-B 0x53 */
+ 0x2980, /* Miscellaneous Mathematical Symbols-B 0x54 */
+ 0x2A00, /* Supplemental Mathematical Operators 0x55 */
+ 0x2B00, /* Miscellaneous Symbols and Arrows 0x56 */
+ 0x2C00, /* Glagolitic 0x57 */
+ 0x2C60, /* Latin Extended-C 0x58 */
+ 0x2C80, /* Coptic 0x59 */
+ 0x2D00, /* Georgian Supplement 0x5a */
+ 0x2D30, /* Tifinagh 0x5b */
+ 0x2D80, /* Ethiopic Extended 0x5c */
+ 0x2DE0, /* Cyrillic Extended-A 0x5d */
+ 0x2E00, /* Supplemental Punctuation 0x5e */
+ 0x2E80, /* CJK Radicals Supplement 0x5f */
+ 0x2F00, /* Kangxi Radicals 0x60 */
+ 0x2FF0, /* Ideographic Description Characters 0x61 */
+ 0x3000, /* CJK Symbols and Punctuation 0x62 */
+ 0x3040, /* Hiragana 0x63 */
+ 0x30A0, /* Katakana 0x64 */
+ 0x3100, /* Bopomofo 0x65 */
+ 0x3130, /* Hangul Compatibility Jamo 0x66 */
+ 0x3190, /* Kanbun 0x67 */
+ 0x31A0, /* Bopomofo Extended 0x68 */
+ 0x31C0, /* CJK Strokes 0x69 */
+ 0x31F0, /* Katakana Phonetic Extensions 0x6a */
+ 0x3200, /* Enclosed CJK Letters and Months 0x6b */
+ 0x3300, /* CJK Compatibility 0x6c */
+ 0x3400, /* CJK Unified Ideographs Extension A 0x6d */
+ 0x4DC0, /* Yijing Hexagram Symbols 0x6e */
+ 0x4E00, /* CJK Unified Ideographs 0x6f */
+ 0xA000, /* Yi Syllables 0x70 */
+ 0xA490, /* Yi Radicals 0x71 */
+ 0xA4D0, /* Lisu 0x72 */
+ 0xA500, /* Vai 0x73 */
+ 0xA640, /* Cyrillic Extended-B 0x74 */
+ 0xA6A0, /* Bamum 0x75 */
+ 0xA700, /* Modifier Tone Letters 0x76 */
+ 0xA720, /* Latin Extended-D 0x77 */
+ 0xA800, /* Syloti Nagri 0x78 */
+ 0xA830, /* Common Indic Number Forms 0x79 */
+ 0xA840, /* Phags-pa 0x7a */
+ 0xA880, /* Saurashtra 0x7b */
+ 0xA8E0, /* Devanagari Extended 0x7c */
+ 0xA900, /* Kayah Li 0x7d */
+ 0xA930, /* Rejang 0x7e */
+ 0xA960, /* Hangul Jamo Extended-A 0x7f */
+ 0xA980, /* Javanese 0x80 */
+ 0xAA00, /* Cham 0x81 */
+ 0xAA60, /* Myanmar Extended-A 0x82 */
+ 0xAA80, /* Tai Viet 0x83 */
+ 0xABC0, /* Meetei Mayek 0x84 */
+ 0xAC00, /* Hangul Syllables 0x85 */
+ 0xD7B0, /* Hangul Jamo Extended-B 0x86 */
+ 0xD800, /* High Surrogates 0x87 */
+ 0xDB80, /* High Private Use Surrogates 0x88 */
+ 0xDC00, /* Low Surrogates 0x89 */
+ 0xE000, /* Private Use Area 0x8a */
+ 0xF900, /* CJK Compatibility Ideographs 0x8b */
+ 0xFB00, /* Alphabetic Presentation Forms 0x8c */
+ 0xFB50, /* Arabic Presentation Forms-A 0x8d */
+ 0xFE00, /* Variation Selectors 0x8e */
+ 0xFE10, /* Vertical Forms 0x8f */
+ 0xFE20, /* Combining Half Marks 0x90 */
+ 0xFE30, /* CJK Compatibility Forms 0x91 */
+ 0xFE50, /* Small Form Variants 0x92 */
+ 0xFE70, /* Arabic Presentation Forms-B 0x93 */
+ 0xFF00, /* Halfwidth and Fullwidth Forms 0x94 */
+ 0xFFF0, /* Specials 0x95 */
+ 0x10000, /* Linear B Syllabary 0x96 */
+ 0x10080, /* Linear B Ideograms 0x97 */
+ 0x10100, /* Aegean Numbers 0x98 */
+ 0x10140, /* Ancient Greek Numbers 0x99 */
+ 0x10190, /* Ancient Symbols 0x9a */
+ 0x101D0, /* Phaistos Disc 0x9b */
+ 0x10280, /* Lycian 0x9c */
+ 0x102A0, /* Carian 0x9d */
+ 0x10300, /* Old Italic 0x9e */
+ 0x10330, /* Gothic 0x9f */
+ 0x10380, /* Ugaritic 0xa0 */
+ 0x103A0, /* Old Persian 0xa1 */
+ 0x10400, /* Deseret 0xa2 */
+ 0x10450, /* Shavian 0xa3 */
+ 0x10480, /* Osmanya 0xa4 */
+ 0x10800, /* Cypriot Syllabary 0xa5 */
+ 0x10840, /* Imperial Aramaic 0xa6 */
+ 0x10900, /* Phoenician 0xa7 */
+ 0x10920, /* Lydian 0xa8 */
+ 0x10A00, /* Kharoshthi 0xa9 */
+ 0x10A60, /* Old South Arabian 0xaa */
+ 0x10B00, /* Avestan 0xab */
+ 0x10B40, /* Inscriptional Parthian 0xac */
+ 0x10B60, /* Inscriptional Pahlavi 0xad */
+ 0x10C00, /* Old Turkic 0xae */
+ 0x10E60, /* Rumi Numeral Symbols 0xaf */
+ 0x11080, /* Kaithi 0xb0 */
+ 0x12000, /* Cuneiform 0xb1 */
+ 0x12400, /* Cuneiform Numbers and Punctuation 0xb2 */
+ 0x13000, /* Egyptian Hieroglyphs 0xb3 */
+ 0x1D000, /* Byzantine Musical Symbols 0xb4 */
+ 0x1D100, /* Musical Symbols 0xb5 */
+ 0x1D200, /* Ancient Greek Musical Notation 0xb6 */
+ 0x1D300, /* Tai Xuan Jing Symbols 0xb7 */
+ 0x1D360, /* Counting Rod Numerals 0xb8 */
+ 0x1D400, /* Mathematical Alphanumeric Symbols 0xb9 */
+ 0x1F000, /* Mahjong Tiles 0xba */
+ 0x1F030, /* Domino Tiles 0xbb */
+ 0x1F100, /* Enclosed Alphanumeric Supplement 0xbc */
+ 0x1F200, /* Enclosed Ideographic Supplement 0xbd */
+ 0x20000, /* CJK Unified Ideographs Extension B 0xbe */
+ 0x2A700, /* CJK Unified Ideographs Extension C 0xbf */
+ 0x2F800, /* CJK Compatibility Ideographs Supplement 0xc0 */
+ 0x30000, /* reserved 0xc1 */
+ 0x40000, /* reserved 0xc2 */
+ 0x50000, /* reserved 0xc3 */
+ 0x60000, /* reserved 0xc4 */
+ 0x70000, /* reserved 0xc5 */
+ 0x80000, /* reserved 0xc6 */
+ 0x90000, /* reserved 0xc7 */
+ 0xA0000, /* reserved 0xc8 */
+ 0xB0000, /* reserved 0xc9 */
+ 0xC0000, /* reserved 0xca */
+ 0xD0000, /* reserved 0xcb */
+ 0xE0000, /* Tags 0xcc */
+ 0xE0100, /* Variation Selectors Supplement 0xcd */
+ 0xF0000, /* Supplementary Private Use Area-A 0xce */
+ 0x100000, /* Supplementary Private Use Area-B 0xcf */
+ /* Value over 0x10FFFF is illegal under Unicode,
+ They are for some special use. *** experimental *** */
+ 0x110000, /* Reserved 0xd0 */
+ 0x120000, /* Reserved 0xd1 */
+ 0x130000, /* Reserved 0xd2 */
+ 0x140000, /* Reserved 0xd3 */
+ 0x150000, /* Reserved 0xd4 */
+ 0x160000, /* Reserved 0xd5 */
+ 0x170000, /* Reserved 0xd6 */
+ 0x180000, /* Reserved 0xd7 */
+ 0x190000, /* Reserved 0xd8 */
+ 0x1A0000, /* Reserved 0xd9 */
+ 0x1B0000, /* Reserved 0xda */
+ 0x1C0000, /* Reserved 0xdb */
+ 0x1D0000, /* Reserved 0xdc */
+ 0x1E0000, /* Reserved 0xdd */
+ 0x1F0000, /* Reserved 0xde */
+ 0x200000, /* Reserved 0xdf */
+ 0x210000, /* Reserved 0xe0 */
+ 0x220000, /* Reserved 0xe1 */
+ CJK_CHAR_LIMIT
+};
+
+#define NUCS_RANGE (sizeof(ucs_range)/sizeof(ucs_range[0]))
+
+/* Return i, which satisfies a[i] <= x < a[i+1]. */
+/* 'i' is serached between left <= i <= right. */
+/* If no i satisfies such condition, return left-1. */
+/* [Okumura et al.] An algorithm encyclopedia in Java, p.236. */
+static int
+binary_search (long x, long *a, int left, int right)
+{
+ right++;
+ while (left < right) {
+ int mid = (left + right) / 2;
+ if (a[mid] <= x ) left = mid + 1;
+ else right = mid;
+ }
+ return left - 1;
+}
+
+#define FULLWIDTH_DIGIT_0 0xFF10
+#define FULLWIDTH_DIGIT_9 0xFF19
+#define FULLWIDTH_CAPITAL_A 0xFF21
+#define FULLWIDTH_CAPITAL_Z 0xFF3A
+#define FULLWIDTH_SMALL_A 0xFF41
+#define FULLWIDTH_SMALL_Z 0xFF5A
+#define HALFWIDTH_KATAKANA_WO 0xFF66
+#define HALFWIDTH_KATAKANA_SMALL_TSU 0xFF6F
+#define HALFWIDTH_KATAKANA_A 0xFF71
+#define HALFWIDTH_KATAKANA_N 0xFF9D
+
+integer kcatcodekey(integer c)
+{
+ if (is_internalUPTEX()) {
+ if ( (FULLWIDTH_DIGIT_0 <=c && c<=FULLWIDTH_DIGIT_9 )
+ || (FULLWIDTH_CAPITAL_A<=c && c<=FULLWIDTH_CAPITAL_Z)
+ || (FULLWIDTH_SMALL_A <=c && c<=FULLWIDTH_SMALL_Z ) )
+ return 0xFE;
+ if ( (HALFWIDTH_KATAKANA_WO <=c && c<=HALFWIDTH_KATAKANA_SMALL_TSU )
+ || (HALFWIDTH_KATAKANA_A <=c && c<=HALFWIDTH_KATAKANA_N ) )
+ return 0xFF;
+ return binary_search((long)c, ucs_range, 0, NUCS_RANGE-1);
+ } else {
+ return Hi(toDVI(c));
+ }
+}
+
+integer multilenbuffchar(integer c)
+{
+ c=toBUFF(c);
+ if (BYTE1(c)) return 4;
+ if (BYTE2(c)) return 3;
+ if (BYTE3(c)) return 2;
+ if (BYTE4(c)) return 1;
+ return 0;
+}
+
+/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME */
+/* Temporary fix for functions still missing in the ptexenc library. */
+boolean is_internalUPTEX(void) { return false; }
+boolean ismultichr (int length, int nth, int c) { return false; }
+/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME */
diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h
new file mode 100644
index 00000000000..a1b5328041c
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/kanji.h
@@ -0,0 +1,58 @@
+/*
+ kanji.h: Handling 2byte char, and so on.
+*/
+#ifndef KANJI_H
+#define KANJI_H
+#include "cpascal.h"
+#include <ptexenc/ptexenc.h>
+#include <ptexenc/unicode.h>
+#ifdef eupTeX
+#define getintone(w) ((w).cint1)
+#define setintone(w,a) ((w).cint1=(a))
+#endif
+
+#define KANJI
+
+/* functions */
+#define XXHi(x) BYTE1(x)
+#define XHi(x) BYTE2(x)
+#define Hi(x) BYTE3(x)
+#define Lo(x) BYTE4(x)
+
+extern integer check_kanji (integer c, integer m);
+#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 multilenbuffchar (integer c);
+#define setptexencuptex() set_enc_string("utf8", "uptex");
+
+/* number of rest of multi-char for kcode_pos */
+#define nrestmultichr(x) ( (x)!=0 ? ((x) / 8) + 2 - ((x) % 8) : -1 )
+
+#ifndef PRESERVE_PUTC
+#undef putc
+#define putc(c,fp) putc2(c,fp)
+#endif /* !PRESERVE_PUTC */
+
+#if defined(UPBIBTEX) || defined(BIBTEX)
+#define inputline2(fp,buff,pos,size,ptr) input_line2(fp,buff,pos,size,ptr)
+#else
+#define inputline2(fp,buff,pos,size) input_line2(fp,buff,pos,size,NULL)
+#endif
+
+/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME */
+/* Temporary fix for functions still missing in the ptexenc library. */
+extern boolean is_internalUPTEX(void);
+#define isinternalUPTEX is_internalUPTEX
+extern boolean ismultichr (int length, int nth, int c);
+/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME */
+
+#endif /* not KANJI_H */
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
new file mode 100644
index 00000000000..b9f1b76911b
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -0,0 +1,1209 @@
+% This is a change file for upTeX u0.30
+% By Takuji Tanaka.
+%
+% (02/26/2007) TTK upTeX u0.01
+% (03/18/2007) TTK upTeX u0.03
+% (04/08/2007) TTK upTeX u0.05
+% (04/15/2007) TTK upTeX u0.06
+% (05/13/2007) TTK upTeX u0.07
+% (05/28/2007) TTK upTeX u0.08
+% (06/16/2007) TTK upTeX u0.09
+% (07/28/2007) TTK upTeX u0.10
+% (08/07/2007) TTK upTeX u0.11
+% (08/25/2007) TTK upTeX u0.12
+% (09/15/2007) TTK upTeX u0.13
+% (09/25/2007) TTK upTeX u0.14
+% (10/18/2007) TTK upTeX u0.15
+% (11/10/2007) TTK upTeX u0.16
+% (11/13/2007) TTK upTeX u0.17
+% (12/08/2007) TTK upTeX u0.18
+% (12/26/2007) TTK upTeX u0.19
+% (01/12/2008) TTK upTeX u0.20
+% (03/13/2008) TTK upTeX u0.21
+% (08/03/2008) TTK upTeX u0.22
+% (09/04/2008) TTK upTeX u0.23
+% (10/18/2008) TTK upTeX u0.24
+% (12/13/2008) TTK upTeX u0.25
+% (02/21/2009) TTK upTeX u0.26
+% (03/12/2009) TTK upTeX u0.27
+% (08/23/2009) TTK upTeX u0.28
+% (01/31/2010) TTK upTeX u0.29
+% (04/10/2010) TTK upTeX u0.30
+
+@x upTeX: banner
+ {printed when p\TeX\ starts}
+@y
+ {printed when p\TeX\ starts}
+@#
+@d upTeX_version_string=='-u0.30' {current up\TeX\ version}
+@#
+@d upTeX_version==pTeX_version_string,upTeX_version_string
+@d upTeX_banner=='This is upTeX, Version 3.1415926',upTeX_version
+@d upTeX_banner_k==upTeX_banner
+ {printed when up\TeX\ starts}
+@z
+
+@x upTeX: banner
+@d banner==pTeX_banner
+@d banner_k==pTeX_banner_k
+@y
+@d banner==upTeX_banner
+@d banner_k==upTeX_banner_k
+@z
+
+@x
+@!KANJI_code=0..65535; {sixteen-bit numbers}
+@y
+@!KANJI_code=0..@"FFFFFF; {0..0x10FFFF: Unicode, 0x110000..0xFFFFFF: special}
+@z
+
+@x
+@!trick_buf2:array[0..ssup_error_line] of 0..2; {pTeX: buffer for KANJI}
+@!kcode_pos: 0..2; {pTeX: denotes whether first byte or second byte of KANJI}
+@y
+@!trick_buf2:array[0..ssup_error_line] of 0..@'24; {pTeX: buffer for KANJI}
+@!kcode_pos: 0..@'24; {pTeX: denotes whether first byte or second byte of KANJI
+ 1..2:2byte-char, 11..13:3byte-char, 21..24:4byte-char}
+@!kcp: 0..@'24; {temporary kcode_pos}
+@z
+
+@x
+procedure print_ln; {prints an end-of-line}
+@y
+procedure print_ln; {prints an end-of-line}
+var @!ii: integer;
+@z
+
+@x
+ if kcode_pos=1 then begin wterm(' '); wlog(' '); end;
+@y
+ if nrestmultichr(kcode_pos)>0 then
+ for ii:=0 to nrestmultichr(kcode_pos)-1 do
+ begin wterm(' '); wlog(' '); end;
+@z
+
+@x
+log_only: begin if kcode_pos=1 then wlog(' ');
+@y
+log_only: begin
+ if nrestmultichr(kcode_pos)>0 then
+ for ii:=0 to nrestmultichr(kcode_pos)-1 do wlog(' ');
+@z
+
+@x
+term_only: begin if kcode_pos=1 then wterm(' ');
+@y
+term_only: begin
+ if nrestmultichr(kcode_pos)>0 then
+ for ii:=0 to nrestmultichr(kcode_pos)-1 do wterm(' ');
+@z
+
+@x
+if kcode_pos=1 then kcode_pos:=2
+@y
+if (kcode_pos=1)or((kcode_pos>=@'11)and(kcode_pos<=@'12))
+ or((kcode_pos>=@'21)and(kcode_pos<=@'23)) then incr(kcode_pos)
+@z
+
+@x
+ begin kcode_pos:=1;
+@y
+ begin
+ if (ismultichr(4,1,xchr[s])) then kcode_pos:=@'21
+ else if (ismultichr(3,1,xchr[s])) then kcode_pos:=@'11
+ else kcode_pos:=1;
+@z
+
+@x
+ if file_offset>=max_print_line-1 then
+@y
+ if file_offset>=max_print_line-nrestmultichr(kcode_pos) then
+@z
+
+@x
+ if term_offset>=max_print_line-1 then
+@y
+ if term_offset>=max_print_line-nrestmultichr(kcode_pos) then
+@z
+
+@x
+@d min_quarterword=0 {smallest allowable value in a |quarterword|}
+@d max_quarterword=255 {largest allowable value in a |quarterword|}
+@d min_halfword==-@"FFFFFFF {smallest allowable value in a |halfword|}
+@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
+@y
+@d min_quarterword=0 {smallest allowable value in a |quarterword|}
+@d max_quarterword=@"FFFF {largest allowable value in a |quarterword|}
+@d min_halfword=0 {smallest allowable value in a |halfword|}
+@d max_halfword=@"3FFFFFFF {largest allowable value in a |halfword|}
+@d max_cjk_val=@"1000000 {to separate wchar and kcatcode}
+@z
+
+@x
+@d xspace_ptr(#) == info(#+space_offset)
+@y
+@d xspace_ptr(#) == info(#+space_offset)
+@d read_sixteenx(#)==begin #:=fbyte;
+ if #>255 then abort;
+ fget; #:=#*@'400+fbyte;
+ end
+@z
+
+@x
+@d kanji=16 {kanji}
+@d kana=17 {hiragana, katakana, alphabet}
+@d other_kchar=18 {kanji codes}
+@d max_char_code=18 {largest catcode for individual characters}
+@y
+@d not_cjk=15 {is not cjk characters}
+@d kanji=16 {kanji}
+@d kana=17 {hiragana, katakana, alphabet}
+@d other_kchar=18 {cjk symbol codes}
+@d hangul=19 {hangul codes}
+@d max_char_code=19 {largest catcode for individual characters}
+@z
+
+@x
+@d math_comp=left_right+1 {component of formula ( \.{\\mathbin}, etc.~)}
+@y
+@d kchar_num=left_right+1 {cjk character specified numerically ( \.{\\kchar} )}
+@d math_comp=kchar_num+1 {component of formula ( \.{\\mathbin}, etc.~)}
+@z
+
+@x
+@d math_given=char_given+1 {math code defined by \.{\\mathchardef}}
+@y
+@d kchar_given=char_given+1 {cjk character code defined by \.{\\kchardef}}
+@d math_given=kchar_given+1 {math code defined by \.{\\mathchardef}}
+@z
+
+@x
+@d max_command=set_auto_spacing {the largest command code seen at |big_switch|}
+@y
+@d set_enable_cjk_token=set_auto_spacing+1 {set cjk mode ( \.{\\enablecjktoken}, \.{\\disablecjktoken}, \.{\\forcecjktoken} )}
+@d max_command=set_enable_cjk_token {the largest command code seen at |big_switch|}
+@z
+
+@x
+@d cat_code_base=auto_xspacing_code+1
+@y
+@d enable_cjk_token_code=auto_xspacing_code+1
+@d cat_code_base=enable_cjk_token_code+1
+@z
+
+@x
+@d auto_xspacing==equiv(auto_xspacing_code)
+@y
+@d auto_xspacing==equiv(auto_xspacing_code)
+@d enable_cjk_token==equiv(enable_cjk_token_code)
+@z
+
+@x
+eqtb[auto_xspacing_code]:=eqtb[cat_code_base];
+@y
+eqtb[auto_xspacing_code]:=eqtb[cat_code_base];
+eqtb[enable_cjk_token_code]:=eqtb[cat_code_base];
+@z
+
+@x
+@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))$ }
+@y
+if (isinternalUPTEX) then begin
+ { default: other_kchar }
+ @t\hskip10pt@>kcat_code(@"0):=not_cjk;
+ @t\hskip10pt@>kcat_code(@"21):=hangul; { Hangul Jamo }
+ @+@t\1@>for k:=@"5F to @"61 do kcat_code(k):=kanji; { CJK Radicals Supplement .. Ideographic Description Characters }
+ @+@t\1@>for k:=@"63 to @"64 do kcat_code(k):=kana; { Hiragana, Katakana }
+ @t\hskip10pt@>kcat_code(@"65):=kanji; { Bopomofo }
+ @t\hskip10pt@>kcat_code(@"66):=hangul; { Hangul Compatibility Jamo }
+ @+@t\1@>for k:=@"67 to @"69 do kcat_code(k):=kanji; { Kanbun .. CJK Strokes }
+ @t\hskip10pt@>kcat_code(@"6A):=kana; { Katakana Phonetic Extensions }
+ @t\hskip10pt@>kcat_code(@"6D):=kanji; { CJK Unified Ideographs Extension A }
+ @t\hskip10pt@>kcat_code(@"6F):=kanji; { CJK Unified Ideographs }
+ @t\hskip10pt@>kcat_code(@"7F):=hangul; { Hangul Jamo Extended-A }
+ @t\hskip10pt@>kcat_code(@"85):=hangul; { Hangul Syllables }
+ @t\hskip10pt@>kcat_code(@"86):=hangul; { Hangul Jamo Extended-B }
+ @t\hskip10pt@>kcat_code(@"8B):=kanji; { CJK Compatibility Ideographs }
+ { @t\hskip10pt@>kcat_code(@"94):=other_kchar; Halfwidth and Fullwidth Forms }
+ @t\hskip10pt@>kcat_code(@"BE):=kanji; { CJK Unified Ideographs Extension B }
+ @t\hskip10pt@>kcat_code(@"BF):=kanji; { CJK Unified Ideographs Extension C }
+ @t\hskip10pt@>kcat_code(@"C0):=kanji; { CJK Compatibility Ideographs Supplement }
+ @t\hskip10pt@>kcat_code(@"FE):=kana; { Fullwidth digit and latin alphabet }
+ @t\hskip10pt@>kcat_code(@"FF):=kana; { Halfwidth katakana }
+end else begin
+ @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 13 do kcat_code(@"20+k):=other_kchar; {7 ku ... 13 ku}
+ @+@t\1@>for k:=14 to 120 do kcat_code(@"20+k):=kanji; {14 ku ... 120 ku}
+ { $\.{@@"20}+|k| = |kcatcodekey|(|fromKUTEN|(|HILO|(k,1))$ }
+ @+@t\1@>for k:=16 to 94 do kcat_code(@"A0+k):=kanji; {2 men 16 ku ... 94 ku}
+end;
+@z
+
+@x l.5897 - upTeX
+primitive("char",char_num,0);@/
+@!@:char_}{\.{\\char} primitive@>
+@y
+primitive("char",char_num,0);@/
+@!@:char_}{\.{\\char} primitive@>
+primitive("kchar",kchar_num,0);@/
+@!@:kchar_}{\.{\\kchar} primitive@>
+@z
+
+@x
+char_num: print_esc("char");
+cs_name: print_esc("csname");
+def_font: print_esc("font");
+@y
+char_num: print_esc("char");
+kchar_num: print_esc("kchar");
+cs_name: print_esc("csname");
+def_font: print_esc("font");
+@z
+
+@x
+@d cs_token_flag==@"FFFF {amount added to the |eqtb| location in a
+token that stands for a control sequence; is a multiple of~256, less~1}
+@d left_brace_token=@'0400 {$2^8\cdot|left_brace|$}
+@d left_brace_limit=@'1000 {$2^8\cdot(|left_brace|+1)$}
+@d right_brace_token=@'1000 {$2^8\cdot|right_brace|$}
+@d right_brace_limit=@'1400 {$2^8\cdot(|right_brace|+1)$}
+@d math_shift_token=@'1400 {$2^8\cdot|math_shift|$}
+@d tab_token=@'2000 {$2^8\cdot|tab_mark|$}
+@d out_param_token=@'2400 {$2^8\cdot|out_param|$}
+@d space_token=@'5040 {$2^8\cdot|spacer|+|" "|$}
+@d letter_token=@'5400 {$2^8\cdot|letter|$}
+@d other_token=@'6000 {$2^8\cdot|other_char|$}
+@d match_token=@'6400 {$2^8\cdot|match|$}
+@d end_match_token=@'7000 {$2^8\cdot|end_match|$}
+@y
+@d cs_token_flag=@"1FFFFFFF {amount added to the |eqtb| location in a
+ token that stands for a control sequence; is a multiple of~@"1000000, less~1}
+@d max_char_val=@"100 {to separate char and command code}
+@d left_brace_token=@"100 {$2^8\cdot|left_brace|$}
+@d left_brace_limit=@"200 {$2^8\cdot(|left_brace|+1)$}
+@d right_brace_token=@"200 {$2^8\cdot|right_brace|$}
+@d right_brace_limit=@"300 {$2^8\cdot(|right_brace|+1)$}
+@d math_shift_token=@"300 {$2^8\cdot|math_shift|$}
+@d tab_token=@"400 {$2^8\cdot|tab_mark|$}
+@d out_param_token=@"500 {$2^8\cdot|out_param|$}
+@d space_token=@"A20 {$2^8\cdot|spacer|+|" "|$}
+@d letter_token=@"B00 {$2^8\cdot|letter|$}
+@d other_token=@"C00 {$2^8\cdot|other_char|$}
+@d match_token=@"D00 {$2^8\cdot|match|$}
+@d end_match_token=@"E00 {$2^8\cdot|end_match|$}
+@z
+
+@x
+ if check_kanji(info(p)) then {|wchar_token|}
+ begin m:=kcat_code(kcatcodekey(info(p))); c:=info(p);
+ end
+ else begin m:=Hi(info(p)); c:=Lo(info(p));
+@y
+ if check_kanji(info(p),1)=2 then {|wchar_token|}
+ begin m:=info(p) div max_cjk_val; c:=info(p) mod max_cjk_val; end
+ else begin m:=info(p) div max_char_val; c:=info(p) mod max_char_val;
+@z
+
+@x
+kanji,kana,other_kchar: print_kanji(KANJI(c));
+@y
+kanji,kana,other_kchar,hangul: print_kanji(KANJI(c));
+@z
+
+@x
+kanji,kana,other_kchar: begin print("kanji character ");
+@y
+kanji,kana,other_kchar,hangul: begin print("kanji character ");
+@z
+
+@x
+ if (first_count>0)and(trick_buf2[(first_count-1)mod error_line]=1) then
+ incr(first_count);
+@y
+ kcp:=trick_buf2[(first_count-1)mod error_line];
+ if (first_count>0)and(kcp>0) then
+ first_count:=first_count+nrestmultichr(kcp);
+@z
+
+@x
+if trick_buf2[p mod error_line]=2 then
+ begin p:=p+1; n:=n-1;
+ end;
+@y
+kcp:=trick_buf2[p mod error_line];
+if (kcp mod @'10)>1 then begin
+ p:=p+nrestmultichr(kcp)+1; n:=n-nrestmultichr(kcp)-1; end;
+@z
+
+@x
+if trick_buf2[(p-1) mod error_line]=1 then p:=p-1;
+@y
+kcp:=trick_buf2[(p-1) mod error_line];
+if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10);
+@z
+
+@x
+ 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):=Lo(buffer[loc]);
+@y
+ begin if (link(start)=null)and(check_kanji(info(start),2)=2) then {|wchar_token|}
+ begin cur_input:=input_stack[base_ptr-1];
+ s:=get_avail; info(s):=(buffer[loc] mod max_char_val);
+@z
+
+@x
+ begin cur_chr:=buffer[loc]; incr(loc);
+ if multistrlen(stringcast(buffer), limit+1, loc-1)=2 then
+ begin cur_chr:=fromBUFF(stringcast(buffer), limit+1, loc-1);
+ cur_cmd:=kcat_code(kcatcodekey(cur_chr));
+ incr(loc);
+ end
+ else reswitch: cur_cmd:=cat_code(cur_chr);
+@y
+ begin
+ cur_chr:=fromBUFF(stringcast(buffer), limit, loc);
+ cur_cmd:=kcat_code(kcatcodekey(cur_chr));
+ if (multistrlen(stringcast(buffer), limit, loc)>1) and check_kcat_code(cur_cmd) then begin
+ if (cur_cmd=not_cjk) then cur_cmd:=other_kchar;
+ loc:=loc+multistrlen(stringcast(buffer), limit, loc) end
+ else begin
+ cur_chr:=buffer[loc]; incr(loc);
+ reswitch: cur_cmd:=cat_code(cur_chr);
+ end;
+@z
+
+@x
+@ @d add_delims_to(#)==#+math_shift,#+tab_mark,#+mac_param,
+ #+sub_mark,#+letter,#+other_char
+@d all_jcode(#)==#+kanji,#+kana,#+other_kchar
+@y
+@ @d add_delims_to(#)==#+math_shift,#+tab_mark,#+mac_param,
+ #+sub_mark,#+letter,#+other_char
+@d all_jcode(#)==#+kanji,#+kana,#+other_kchar
+@d hangul_code(#)==#+hangul
+@z
+
+@x
+all_jcode(skip_blanks),all_jcode(new_line),all_jcode(mid_line):
+ state:=mid_kanji;
+@y
+all_jcode(skip_blanks),all_jcode(new_line),all_jcode(mid_line):
+ state:=mid_kanji;
+hangul_code(skip_blanks),hangul_code(new_line),hangul_code(mid_kanji):
+ state:=mid_line;
+@z
+
+@x
+else begin k:=loc; cur_chr:=buffer[k]; incr(k);
+ if multistrlen(stringcast(buffer), limit+1, k-1)=2 then
+ begin cat:=kcat_code(kcatcodekey(fromBUFF(stringcast(buffer), limit+1, k-1))); incr(k);
+ end
+ else cat:=cat_code(cur_chr);
+start_cs:
+ if (cat=letter)or(cat=kanji)or(cat=kana) then state:=skip_blanks
+@y
+else begin k:=loc;
+ cur_chr:=fromBUFF(stringcast(buffer), limit, k);
+ cat:=kcat_code(kcatcodekey(cur_chr));
+ if (multistrlen(stringcast(buffer), limit, k)>1) and check_kcat_code(cat) then begin
+ if (cat=not_cjk) then cat:=other_kchar;
+ k:=k+multistrlen(stringcast(buffer), limit, k) end
+ else begin {not multi-byte char}
+ cur_chr:=buffer[k];
+ cat:=cat_code(cur_chr);
+ incr(k);
+ end;
+start_cs:
+ if (cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul) then state:=skip_blanks
+@z
+
+@x
+ else if ((cat=letter)or(cat=kanji)or(cat=kana))and(k<=limit) then
+@y
+ else if ((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul))and(k<=limit) then
+@z
+
+@x
+begin repeat cur_chr:=buffer[k]; incr(k);
+ if multistrlen(stringcast(buffer), limit+1, k-1)=2 then
+ begin cat:=kcat_code(kcatcodekey(fromBUFF(stringcast(buffer), limit+1, k-1))); incr(k);
+ end
+ else cat:=cat_code(cur_chr);
+@y
+begin repeat
+ cur_chr:=fromBUFF(stringcast(buffer), limit, k);
+ cat:=kcat_code(kcatcodekey(cur_chr));
+ if (multistrlen(stringcast(buffer), limit, k)>1) and check_kcat_code(cat) then begin
+ if (cat=not_cjk) then cat:=other_kchar;
+ k:=k+multistrlen(stringcast(buffer), limit, k) end
+ else begin {not multi-byte char}
+ cur_chr:=buffer[k];
+ cat:=cat_code(cur_chr);
+ incr(k);
+ end;
+@z
+
+@x
+until not((cat=letter)or(cat=kanji)or(cat=kana))or(k>limit);
+{@@<If an expanded...@@>;}
+if not((cat=letter)or(cat=kanji)or(cat=kana)) then decr(k);
+if cat=other_kchar then decr(k); {now |k| points to first nonletter}
+@y
+until not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul))or(k>limit);
+{@@<If an expanded...@@>;}
+if not((cat=letter)or(cat=kanji)or(cat=kana)or(cat=hangul)) then decr(k);
+if cat=other_kchar then k:=k-multilenbuffchar(cur_chr)+1; {now |k| points to first nonletter}
+@z
+
+@x
+ else if check_kanji(t) then {|wchar_token|}
+ begin cur_chr:=t; cur_cmd:=kcat_code(kcatcodekey(t));
+ end
+ else
+ begin cur_cmd:=Hi(t); cur_chr:=Lo(t);
+@y
+ else if check_kanji(t,3)=2 then {|wchar_token|}
+ begin cur_cmd:=t div max_cjk_val; cur_chr:=t mod max_cjk_val; end
+ else
+ begin cur_cmd:=t div max_char_val; cur_chr:=t mod max_char_val;
+@z
+
+@x
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|}
+ cur_tok:=cur_chr
+ else cur_tok:=(cur_cmd*@'400)+cur_chr
+@y
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|}
+ cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
+ else cur_tok:=(cur_cmd*max_char_val)+cur_chr
+@z
+
+@x
+ if check_kanji(info(p)) then {|wchar_token|}
+ begin buffer[j]:=Hi(info(p)); incr(j);
+ end;
+ buffer[j]:=Lo(info(p)); incr(j); p:=link(p);
+@y
+ if check_kanji(info(p),4)=2 then {|wchar_token|}
+ begin t:=toBUFF(info(p) mod max_cjk_val);
+ if BYTE1(t)<>0 then begin buffer[j]:=BYTE1(t); incr(j); end;
+ if BYTE2(t)<>0 then begin buffer[j]:=BYTE2(t); incr(j); end;
+ if BYTE3(t)<>0 then begin buffer[j]:=BYTE3(t); incr(j); end;
+ buffer[j]:=BYTE4(t); incr(j);
+ p:=link(p);
+ end
+ else
+ begin buffer[j]:=info(p) mod max_char_val; incr(j); p:=link(p);
+ end;
+@z
+
+@x
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+ cur_tok:=cur_chr
+ else cur_tok:=(cur_cmd*@'400)+cur_chr
+@y
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+ cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
+ else cur_tok:=(cur_cmd*max_char_val)+cur_chr
+@z
+
+@x
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+ cur_tok:=cur_chr
+ else cur_tok:=(cur_cmd*@'400)+cur_chr
+@y
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+ cur_tok:=(cur_cmd*max_cjk_val)+cur_chr
+ else cur_tok:=(cur_cmd*max_char_val)+cur_chr
+@z
+
+@x
+char_given,math_given: scanned_result(cur_chr)(int_val);
+@y
+kchar_given,
+char_given,math_given: scanned_result(cur_chr)(int_val);
+@z
+
+@x
+ begin if is_kanji(cur_val) then
+@y
+ begin if (cur_val<0)or(cur_val>255) then
+@z
+
+@x
+if not is_char_ascii(cur_val)and not check_kanji(cur_val) then {|wchar_token|}
+@y
+if ((cur_val<0)or(cur_val>255))and(check_kanji(cur_val,6)<>1) then {|wchar_token|}
+@z
+
+@x
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|}
+@y
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|}
+@z
+
+@x
+@!t:halfword; {token being appended}
+@!k:pool_pointer; {index into |str_pool|}
+begin str_room(1);
+p:=temp_head; link(p):=null; k:=b;
+while k<pool_ptr do
+ begin t:=so(str_pool[k]);
+ if multistrlen(stringcast(str_pool), pool_ptr, k)=2 then
+ begin t:=fromBUFF(stringcast(str_pool), pool_ptr, k); incr(k);
+ end
+ else if t=" " then t:=space_token
+ else t:=other_token+t;
+@y
+@!t:halfword; {token being appended}
+@!k:pool_pointer; {index into |str_pool|}
+@!cc:escape..max_char_code;
+begin str_room(1);
+p:=temp_head; link(p):=null; k:=b;
+while k<pool_ptr do
+ begin t:=fromBUFF(stringcast(str_pool), pool_ptr, k);
+ cc:=kcat_code(kcatcodekey(t));
+ if (multistrlen(stringcast(str_pool), pool_ptr, k)>1)and
+ check_kcat_code(cc) then
+ begin if (cc=not_cjk) then cc:=other_kchar;
+ t:=t+cc*max_cjk_val;
+ k:=k+multistrlen(stringcast(str_pool), pool_ptr, k)-1;
+ end
+ else begin t:=so(str_pool[k]);
+ if t=" " then t:=space_token
+ else t:=other_token+t;
+ end;
+@z
+
+@x
+@d ptex_convert_codes=10 {end of \eTeX's command codes}
+@y
+@d ucs_code=10 {command code for \.{\\ucs}}
+@d ptex_convert_codes=11 {end of \eTeX's command codes}
+@z
+
+@x
+@!@:kuten_}{\.{\\kuten} primitive@>
+@y
+@!@:kuten_}{\.{\\kuten} primitive@>
+primitive("ucs",convert,ucs_code);
+@!@:ucs_}{\.{\\ucs} primitive@>
+@z
+
+@x
+ kuten_code:print_esc("kuten");
+@y
+ kuten_code:print_esc("kuten");
+ ucs_code:print_esc("ucs");
+@z
+
+@x
+kansuji_code,euc_code,sjis_code,jis_code,kuten_code: scan_int;
+string_code, meaning_code: begin save_scanner_status:=scanner_status;
+ scanner_status:=normal; get_token;
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {|wchar_token|}
+@y
+kansuji_code,euc_code,sjis_code,jis_code,kuten_code,ucs_code: scan_int;
+string_code, meaning_code: begin save_scanner_status:=scanner_status;
+ scanner_status:=normal; get_token;
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|}
+@z
+
+@x
+kuten_code: print_int(fromKUTEN(cur_val));
+@y
+kuten_code: print_int(fromKUTEN(cur_val));
+ucs_code: print_int(fromUCS(cur_val));
+@z
+
+@x
+if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+@y
+if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+@z
+
+@x
+get_x_token_or_active_char;
+if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+@y
+get_x_token_or_active_char;
+if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+@z
+
+@x
+ if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then {is kanji}
+ begin str_room(2);
+ append_char(Hi(cur_chr)); {kanji upper byte}
+ append_char(Lo(cur_chr)); {kanji lower byte}
+@y
+ if (cur_cmd>=kanji)and(cur_cmd<=hangul) then {|wchar_token|}
+ begin str_room(4); {4 is maximum}
+ cur_chr:=toBUFF(cur_chr);
+ if BYTE1(cur_chr)<>0 then append_char(BYTE1(cur_chr));
+ if BYTE2(cur_chr)<>0 then append_char(BYTE2(cur_chr));
+ if BYTE3(cur_chr)<>0 then append_char(BYTE3(cur_chr));
+ append_char(BYTE4(cur_chr));
+@z
+
+@x
+ fget; read_sixteen(cx); font_info[k].hh.rh:=tokanji(cx); {|kchar_code|}
+@y
+ fget; read_sixteenx(cx); font_info[k].hh.rh:=tokanji(cx); {|kchar_code|}
+@z
+
+@x
+@d set2=129 {typeset a character and move right}
+@y
+@d set2=129 {typeset a character and move right}
+@d set3=130 {typeset a character and move right}
+@z
+
+@x
+ jc:=toDVI(KANJI(info(p)));
+ dvi_out(set2); dvi_out(Hi(jc)); dvi_out(Lo(jc));
+@y
+ jc:=toDVI(KANJI(info(p)) mod max_cjk_val);
+ if (jc<@"10000) then begin
+ dvi_out(set2);
+ end else begin
+ dvi_out(set3); dvi_out(BYTE2(jc));
+ end;
+ dvi_out(BYTE3(jc)); dvi_out(BYTE4(jc));
+@z
+
+@x
+loop@+ begin get_x_token;
+ reswitch: case cur_cmd of
+ letter,other_char,char_given:@<Append a new letter or hyphen@>;
+ char_num: begin scan_char_num; cur_chr:=cur_val; cur_cmd:=char_given;
+ goto reswitch;
+ end;
+@y
+loop@+ begin get_x_token;
+ reswitch: case cur_cmd of
+ letter,other_char,char_given,kchar_given:@<Append a new letter or hyphen@>;
+ char_num,kchar_num: begin scan_char_num; cur_chr:=cur_val; cur_cmd:=char_given;
+ goto reswitch;
+ end;
+@z
+
+@x
+hmode+kanji,hmode+kana,hmode+other_kchar: goto main_loop_j;
+hmode+char_given:
+ 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 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
+ (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar)or
+ (cur_cmd=char_given)or(cur_cmd=char_num) then cancel_boundary:=true;
+@y
+hmode+kanji,hmode+kana,hmode+other_kchar,hmode+hangul,hmode+kchar_given: goto main_loop_j;
+hmode+char_given:
+ if check_echar_range(cur_chr) then goto main_loop else goto main_loop_j;
+hmode+char_num: begin scan_char_num; cur_chr:=cur_val;
+ if check_echar_range(cur_chr) then goto main_loop else goto main_loop_j;
+ end;
+hmode+kchar_num: begin scan_char_num; cur_chr:=cur_val;
+ goto main_loop_j;
+ end;
+hmode+no_boundary: begin get_x_token;
+ if (cur_cmd=letter)or(cur_cmd=other_char)or
+ ((cur_cmd>=kanji)and(cur_cmd<=hangul))or
+ (cur_cmd=char_given)or(cur_cmd=char_num)or
+ (cur_cmd=kchar_given)or(cur_cmd=kchar_num) then cancel_boundary:=true;
+@z
+
+@x
+if cur_cmd=letter then goto main_loop_lookahead+1;
+if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+ @<goto |main_lig_loop|@>;
+if cur_cmd=other_char then goto main_loop_lookahead+1;
+if cur_cmd=char_given then
+ 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|}
+if cur_cmd=letter then goto main_loop_lookahead+1;
+if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+ @<goto |main_lig_loop|@>;
+if cur_cmd=other_char then goto main_loop_lookahead+1;
+if cur_cmd=char_given then
+ 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 is_char_ascii(cur_chr) then goto main_loop_lookahead+1
+ else @<goto |main_lig_loop|@>;
+ end;
+@y
+if cur_cmd=letter then goto main_loop_lookahead+1;
+if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+ @<goto |main_lig_loop|@>;
+if cur_cmd=other_char then goto main_loop_lookahead+1;
+if cur_cmd=char_given then
+ begin if check_echar_range(cur_chr) then goto main_loop_lookahead+1
+ else @<goto |main_lig_loop|@>;
+ end;
+if cur_cmd=kchar_given then
+ @<goto |main_lig_loop|@>;
+x_token; {now expand and set |cur_cmd|, |cur_chr|, |cur_tok|}
+if cur_cmd=letter then goto main_loop_lookahead+1;
+if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+ @<goto |main_lig_loop|@>;
+if cur_cmd=other_char then goto main_loop_lookahead+1;
+if cur_cmd=char_given then
+ begin if check_echar_range(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 check_echar_range(cur_chr) then goto main_loop_lookahead+1
+ else @<goto |main_lig_loop|@>;
+ end;
+if cur_cmd=kchar_num then
+ begin scan_char_num; cur_chr:=cur_val;
+ @<goto |main_lig_loop|@>;
+ end;
+@z
+
+@x
+vmode+letter,vmode+other_char,vmode+char_num,vmode+char_given,
+ vmode+math_shift,vmode+un_hbox,vmode+vrule,
+ vmode+accent,vmode+discretionary,vmode+hskip,vmode+valign,
+ vmode+kanji,vmode+kana,vmode+other_kchar,
+@y
+vmode+letter,vmode+other_char,vmode+char_num,vmode+char_given,
+ vmode+kchar_num,vmode+kchar_given,
+ vmode+math_shift,vmode+un_hbox,vmode+vrule,
+ vmode+accent,vmode+discretionary,vmode+hskip,vmode+valign,
+ vmode+kanji,vmode+kana,vmode+other_kchar,vmode+hangul,
+@z
+
+@x
+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));
+ if p<>null then
+ begin
+ link(p):=get_avail; info(link(p)):=KANJI(cx);
+ end;
+@y
+if check_echar_range(cur_val)=0 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));
+ if p<>null then
+ begin
+ link(p):=get_avail;
+ info(link(p)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val;
+ end;
+@z
+
+@x
+if (cur_cmd=letter)or(cur_cmd=other_char) then
+ q:=new_character(f,cur_chr)
+else if (cur_cmd=kanji)or(cur_cmd=kana)or(cur_cmd=other_kchar) then
+ begin if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ cx:=cur_chr;
+ end
+else if cur_cmd=char_given then
+ 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 is_char_ascii(cur_val) then q:=new_character(f,cur_val)
+ else begin
+ if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ KANJI(cx):=cur_val
+ end
+ end
+@y
+if (cur_cmd=letter)or(cur_cmd=other_char) then
+ q:=new_character(f,cur_chr)
+else if (cur_cmd>=kanji)and(cur_cmd<=hangul) then
+ begin if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ cx:=cur_chr;
+ end
+else if cur_cmd=char_given then
+ if check_echar_range(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 check_echar_range(cur_val) then q:=new_character(f,cur_val)
+ else begin
+ if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ KANJI(cx):=cur_val
+ end
+ end
+else if cur_cmd=kchar_given then
+ begin
+ if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ KANJI(cx):=cur_chr
+ end
+else if cur_cmd=kchar_num then
+ begin scan_char_num;
+ if direction=dir_tate then f:=cur_tfont else f:=cur_jfont;
+ KANJI(cx):=cur_val
+ end
+@z
+
+@x
+ begin q:=new_character(f,get_jfm_pos(KANJI(cx),f));
+ link(q):=get_avail; info(link(q)):=KANJI(cx); last_jchr:=q;
+@y
+ begin q:=new_character(f,get_jfm_pos(KANJI(cx),f));
+ link(q):=get_avail;
+ info(link(q)):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val;
+ last_jchr:=q;
+@z
+
+@x
+letter,other_char,char_given:
+ if (is_char_ascii(cur_chr) or (cur_chr=256)) then begin
+@y
+letter,other_char,char_given:
+ if (cur_chr>=0)and(cur_chr<=256) then begin
+@z
+
+@x
+ KANJI(cx):=cur_chr;
+kanji,kana,other_kchar: cx:=cur_chr;
+@y
+ KANJI(cx):=cur_chr;
+kchar_given:
+ KANJI(cx):=cur_chr;
+kanji,kana,other_kchar,hangul: cx:=cur_chr;
+@z
+
+@x
+ math_type(p):=math_jchar; fam(p):=cur_jfam; character(p):=qi(0);
+ math_kcode(p-1):=KANJI(cx);
+@y
+ math_type(p):=math_jchar; fam(p):=cur_jfam; character(p):=qi(0);
+ math_kcode(p-1):=KANJI(cx) + kcat_code(kcatcodekey(cx))*max_cjk_val;
+@z
+
+@x
+mmode+letter,mmode+other_char,mmode+char_given:
+ 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);
+mmode+kanji,mmode+kana,mmode+other_kchar: begin
+ cx:=cur_chr; set_math_kchar(KANJI(cx));
+ end;
+mmode+char_num: begin scan_char_num; cur_chr:=cur_val;
+ 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);
+ end;
+@y
+mmode+letter,mmode+other_char,mmode+char_given:
+ if check_echar_range(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);
+mmode+kanji,mmode+kana,mmode+other_kchar,mmode+hangul: begin
+ cx:=cur_chr; set_math_kchar(KANJI(cx));
+ end;
+mmode+char_num: begin scan_char_num; cur_chr:=cur_val;
+ if check_echar_range(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);
+ end;
+mmode+kchar_given:
+ set_math_kchar(cur_chr);
+mmode+kchar_num: begin scan_char_num; cur_chr:=cur_val;
+ set_math_kchar(cur_chr);
+ end;
+@z
+
+@x
+any_mode(assign_inhibit_xsp_code),
+any_mode(set_auto_spacing),
+@y
+any_mode(assign_inhibit_xsp_code),
+any_mode(set_auto_spacing),
+any_mode(set_enable_cjk_token),
+@z
+
+@x l.23666 - upTeX
+@d char_sub_def_code=7 {|shorthand_def| for \.{\\charsubdef}}
+
+@<Put each...@>=
+primitive("chardef",shorthand_def,char_def_code);@/
+@!@:char_def_}{\.{\\chardef} primitive@>
+@y
+@d char_sub_def_code=7 {|shorthand_def| for \.{\\charsubdef}}
+@d kchar_def_code=8 {|shorthand_def| for \.{\\kchardef}}
+
+@<Put each...@>=
+primitive("chardef",shorthand_def,char_def_code);@/
+@!@:char_def_}{\.{\\chardef} primitive@>
+primitive("kchardef",shorthand_def,kchar_def_code);@/
+@!@:kchar_def_}{\.{\\kchardef} primitive@>
+@z
+
+@x l.23698 - upTeX
+char_given: begin print_esc("char"); print_hex(chr_code);
+ end;
+@y
+char_given: begin print_esc("char"); print_hex(chr_code);
+ end;
+kchar_given: begin print_esc("kchar"); print_hex(chr_code);
+ end;
+@z
+
+@x l.23729 - upTeX
+ char_def_code: begin scan_char_num; define(p,char_given,cur_val);
+ end;
+@y
+ char_def_code: begin scan_char_num; define(p,char_given,cur_val);
+ end;
+ kchar_def_code: begin scan_char_num; define(p,kchar_given,cur_val);
+ end;
+@z
+
+@x
+@ @<Let |m| be the minimal...@>=
+if cur_chr=kcat_code_base then m:=kanji else m:=0
+@y
+@ @<Let |m| be the minimal...@>=
+if cur_chr=kcat_code_base then m:=not_cjk else m:=0
+@z
+
+@x
+@<Change the case of the token in |p|, if a change is appropriate@>=
+t:=info(p);
+if (t<cs_token_flag+single_base)and(not check_kanji(t)) then
+ begin c:=t mod 256;
+@y
+@<Change the case of the token in |p|, if a change is appropriate@>=
+t:=info(p);
+if (t<cs_token_flag+single_base)and(check_kanji(t,7)<2) then
+ begin c:=t mod max_char_val;
+@z
+
+@x
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if not check_kanji(cur_val) then
+@y
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if check_kanji(cur_val,8)<>1 then
+@z
+
+@x
+@d set_auto_xspacing_code=3
+@y
+@d set_auto_xspacing_code=3
+@d reset_enable_cjk_token_code=0
+@d set_enable_cjk_token_code=1
+@d set_force_cjk_token_code=2
+@z
+
+@x
+@!@:no_auto_xspacing_}{\.{\\noautoxspacing} primitive@>
+@y
+@!@:no_auto_xspacing_}{\.{\\noautoxspacing} primitive@>
+primitive("enablecjktoken",set_enable_cjk_token,reset_enable_cjk_token_code);
+@!@:enable_cjk_token_}{\.{\\enablecjktoken} primitive@>
+primitive("disablecjktoken",set_enable_cjk_token,set_enable_cjk_token_code);
+@!@:disable_cjk_token_}{\.{\\disablecjktoken} primitive@>
+primitive("forcecjktoken",set_enable_cjk_token,set_force_cjk_token_code);
+@!@:force_cjk_token_}{\.{\\forcecjktoken} primitive@>
+@z
+
+@x
+ if (chr_code mod 2)=0 then print_esc("noauto") else print_esc("auto");
+ if chr_code<2 then print("spacing") else print("xspacing");
+end;
+@y
+ if (chr_code mod 2)=0 then print_esc("noauto") else print_esc("auto");
+ if chr_code<2 then print("spacing") else print("xspacing");
+end;
+set_enable_cjk_token:begin
+ if chr_code=0 then print_esc("enable")
+ else if chr_code=1 then print_esc("disable") else print_esc("force");
+ print("cjktoken");
+end;
+@z
+
+@x
+ else begin p:=auto_xspacing_code; cur_chr:=(cur_chr mod 2); end;
+ define(p,data,cur_chr);
+end;
+@y
+ else begin p:=auto_xspacing_code; cur_chr:=(cur_chr mod 2); end;
+ define(p,data,cur_chr);
+end;
+set_enable_cjk_token: define(enable_cjk_token_code,data,cur_chr);
+@z
+
+@x
+assign_inhibit_xsp_code:
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if check_kanji(n) then
+@y
+assign_inhibit_xsp_code:
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if check_kanji(n,9)=1 then
+@z
+
+@x
+assign_kinsoku:
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if is_char_ascii(n) or check_kanji(n) then
+@y
+assign_kinsoku:
+begin p:=cur_chr; scan_int; n:=cur_val; scan_optional_equals; scan_int;
+if abs(check_kanji(n,10))=1 then
+@z
+
+@x
+@ @<Insert a space around the character |p|@>=
+if font_dir[font(p)]<>dir_default then
+ begin KANJI(cx):=info(link(p));
+@y
+@ @<Insert a space around the character |p|@>=
+if font_dir[font(p)]<>dir_default then
+ begin KANJI(cx):=info(link(p)) mod max_cjk_val;
+@z
+
+@x
+@ @<Insert a space before the |first_char|@>=
+if font_dir[font(first_char)]<>dir_default then
+ begin KANJI(cx):=info(link(first_char));
+@y
+@ @<Insert a space before the |first_char|@>=
+if font_dir[font(first_char)]<>dir_default then
+ begin KANJI(cx):=info(link(first_char)) mod max_cjk_val;
+@z
+
+@x
+begin if is_char_node(link(p)) then
+ begin q:=p; p:=link(p);
+ if font_dir[font(p)]<>dir_default then
+ begin KANJI(cx):=info(link(p));
+@y
+begin if is_char_node(link(p)) then
+ begin q:=p; p:=link(p);
+ if font_dir[font(p)]<>dir_default then
+ begin KANJI(cx):=info(link(p)) mod max_cjk_val;
+@z
+
+@x
+ 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;
+@y
+ begin KANJI(cx):=info(link(p)) mod max_cjk_val;
+ i:=info(link(p)) div max_cjk_val; k:=0;
+ if (i=kanji)or(i=kana)or(i=hangul) then begin t:=q; s:=p; end;
+@z
+
+@x
+ fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
+ link(tail):=main_p; tail:=main_p; last_jchr:=tail;
+ fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
+@y
+ fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
+ link(tail):=main_p; tail:=main_p; last_jchr:=tail;
+ fast_get_avail(main_p); info(main_p):=KANJI(cur_chr)+cur_cmd*max_cjk_val;
+@z
+
+@x
+ main_i:=orig_char_info(main_f)(cur_l);
+ case cur_cmd of
+ kanji,kana,other_kchar: begin
+@y
+ main_i:=orig_char_info(main_f)(cur_l);
+ case cur_cmd of
+ kanji,kana,other_kchar,hangul: begin
+@z
+
+@x
+ 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 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 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;
+@y
+ kanji,kana,other_kchar,hangul: 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 check_echar_range(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 check_echar_range(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;
+ kchar_given: begin
+ cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f));
+ end;
+ kchar_num: begin scan_char_num; cur_chr:=cur_val;
+ cur_l:=qi(get_jfm_pos(KANJI(cur_chr),main_f));
+ end;
+@z
+
+@x
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+begin
+if s>255 then
+ begin print_char(Hi(s)); print_char(Lo(s));
+ end else print_char(s);
+@y
+procedure print_kanji(@!s:KANJI_code); {prints a single character}
+begin
+s:=toBUFF(s mod max_cjk_val);
+if BYTE1(s)<>0 then print_char(BYTE1(s));
+if BYTE2(s)<>0 then print_char(BYTE2(s));
+if BYTE3(s)<>0 then print_char(BYTE3(s));
+ print_char(BYTE4(s));
+end;
+
+function check_kcat_code(@!ct:integer):integer;
+begin
+if ((ct>=kanji)and(enable_cjk_token=0))or(enable_cjk_token=2)then
+ check_kcat_code:=1
+else check_kcat_code:=0;
+end;
+
+function check_echar_range(@!c:integer):integer;
+begin
+if (c>=0)and(c<256)then
+ check_echar_range:=1
+else check_echar_range:=0;
+@z
diff --git a/Build/source/texk/web2c/uptexdir/uptex.defines b/Build/source/texk/web2c/uptexdir/uptex.defines
new file mode 100644
index 00000000000..e477f082092
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/uptex.defines
@@ -0,0 +1,48 @@
+{ defined at kanji.c, kanji.h, ptexenc/ptexenc.h, ptexenc/unicode.h }
+@define function BYTE1 ();
+@define function BYTE2 ();
+@define function BYTE3 ();
+@define function BYTE4 ();
+@define function Hi ();
+@define function Lo ();
+@define procedure initdefaultkanji;
+@define procedure forcesjisterm ();
+
+@define function getencstring;
+@define function setencstring ();
+@define procedure setpriorfileenc;
+@define function isinternalUPTEX;
+@define procedure setptexencuptex;
+
+@define function iskanji1 ();
+@define function is1stchr ();
+@define function ismultichr ();
+
+@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 fromUCS ();
+
+@define function checkkanji ();
+@define function iskanji ();
+@define function ischarascii ();
+@define function iswcharascii ();
+@define function ismultiprn ();
+@define function calcpos ();
+@define function kcatcodekey ();
+@define function multilenbuffchar ();
+@define function nrestmultichr ();
+
+@define const PTEXTFTOPLHELP;
+@define const PTEXPLTOTFHELP;
+@define const UPDVITYPEHELP;
diff --git a/Build/source/texk/web2c/uptexdir/uptexextra.c b/Build/source/texk/web2c/uptexdir/uptexextra.c
new file mode 100644
index 00000000000..055f1ae613a
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/uptexextra.c
@@ -0,0 +1,11 @@
+/* uptexextra.c: Hand-coded routines for upTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from uptexd.h here. */
+
+/* This file defines TeX and upTeX. */
+#include <uptexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/uptexdir/uptexextra.h b/Build/source/texk/web2c/uptexdir/uptexextra.h
new file mode 100644
index 00000000000..833a82ce3b9
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/uptexextra.h
@@ -0,0 +1,25 @@
+/* uptexextra.h: banner etc. for upTeX.
+
+ This is included by upTeX, from uptexextra.c
+*/
+
+#include <uptexdir/ptex_version.h> /* for PTEX_VERSION */
+#include <uptexdir/uptex_version.h> /* for UPTEX_VERSION */
+
+#define BANNER "This is upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION
+#define COPYRIGHT_HOLDER "D.E. Knuth"
+#define AUTHOR NULL
+#define PROGRAM_HELP UPTEXHELP
+#define BUG_ADDRESS "ptex-staff@ml.asciimw.jp"
+#define DUMP_VAR TEXformatdefault
+#define DUMP_LENGTH_VAR formatdefaultlength
+#define DUMP_OPTION "fmt"
+#define DUMP_EXT ".fmt"
+#define INPUT_FORMAT kpse_tex_format
+#define INI_PROGRAM "iniuptex"
+#define VIR_PROGRAM "viruptex"
+
+#ifdef Xchr
+#undef Xchr
+#define Xchr(x) (x)
+#endif /* Xchr */
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 60b83732544..d0cd756b8f8 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * convert, splitup.c: Add upTeX and e-upTeX.
+
2011-04-18 Peter Breitenlohner <peb@mppmu.mpg.de>
Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 401454132df..61adae5d8a1 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -60,7 +60,7 @@ case $basefile in
midcmd="| sed -f $srcdir/web2c/cvtbib.sed"
;;
- mf|tex|aleph|etex|pdftex|ptex|eptex|xetex)
+ mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
case $basefile in
mf)
more_defines="$srcdir/web2c/texmf.defines $srcdir/web2c/mfmp.defines"
@@ -117,7 +117,7 @@ case $basefile in
sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <$basefile.h >x$basefile.h
mv x$basefile.h $basefile.h
;;
- mf|tex|aleph|etex|pdftex|ptex|eptex|xetex)
+ mf|tex|aleph|etex|pdftex|ptex|eptex|euptex|uptex|xetex)
sleep 2 # so timestamps are definitely later, to avoid make weirdness
cat $srcdir/web2c/coerce.h >>${basefile}coerce.h
touch ${basefile}d.h
diff --git a/Build/source/texk/web2c/web2c/splitup.c b/Build/source/texk/web2c/web2c/splitup.c
index 93c025083d7..f40c9b820e1 100644
--- a/Build/source/texk/web2c/web2c/splitup.c
+++ b/Build/source/texk/web2c/web2c/splitup.c
@@ -129,11 +129,17 @@ main (int argc, string *argv)
} else if (STREQ (output_name, "eptex")) {
fputs ("#define INITEX\n#define TeX\n#define epTeX\n", out);
coerce = "eptexcoerce.h";
+ } else if (STREQ (output_name, "euptex")) {
+ fputs ("#define INITEX\n#define TeX\n#define eupTeX\n", out);
+ coerce = "euptexcoerce.h";
+ } else if (STREQ (output_name, "uptex")) {
+ fputs ("#define INITEX\n#define TeX\n#define upTeX\n", out);
+ coerce = "uptexcoerce.h";
} else if (STREQ (output_name, "xetex")) {
fputs ("#define INITEX\n#define TeX\n#define XeTeX\n", out);
coerce = "xetexcoerce.h";
} else
- FATAL1 ("Can only split mf, tex, aleph, eptex, etex, pdftex, ptex, or xetex,\n not %s", output_name);
+ FATAL1 ("Can only split mf, tex, aleph, eptex, euptex, etex, pdftex, ptex, uptex, or xetex,\n not %s", output_name);
coerce_len = strlen (coerce);
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 362f1782378..821be5f82fb 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -699,6 +699,10 @@ enable_ptex
enable_ptex_synctex
enable_eptex
enable_eptex_synctex
+enable_uptex
+enable_uptex_synctex
+enable_euptex
+enable_euptex_synctex
enable_aleph
enable_pdftex
enable_pdftex_synctex
@@ -1482,6 +1486,10 @@ Optional Features:
--disable-ptex-synctex build pTeX without SyncTeX support
--disable-eptex do not compile and install e-pTeX
--disable-eptex-synctex build e-pTeX without SyncTeX support
+ --disable-uptex do not compile and install upTeX
+ --disable-uptex-synctex build upTeX without SyncTeX support
+ --disable-euptex do not compile and install e-upTeX
+ --disable-euptex-synctex build e-upTeX without SyncTeX support
--disable-aleph do not compile and install Aleph
--disable-pdftex do not compile and install pdfTeX
--disable-pdftex-synctex build pdfTeX without SyncTeX support
@@ -3544,6 +3552,44 @@ fi
test "x$enable_web2c:$enable_eptex" = xyes:yes && {
need_ptexenc=yes
}
+# Check whether --enable-uptex was given.
+if test "${enable_uptex+set}" = set; then :
+ enableval=$enable_uptex;
+fi
+case $enable_uptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_uptex=yes ;;
+esac
+
+# Check whether --enable-uptex-synctex was given.
+if test "${enable_uptex_synctex+set}" = set; then :
+ enableval=$enable_uptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_uptex" = xyes:yes && {
+ need_ptexenc=yes
+}
+# Check whether --enable-euptex was given.
+if test "${enable_euptex+set}" = set; then :
+ enableval=$enable_euptex;
+fi
+case $enable_euptex in #(
+ yes | no) :
+ ;; #(
+ *) :
+ enable_euptex=yes ;;
+esac
+
+# Check whether --enable-euptex-synctex was given.
+if test "${enable_euptex_synctex+set}" = set; then :
+ enableval=$enable_euptex_synctex;
+fi
+
+test "x$enable_web2c:$enable_euptex" = xyes:yes && {
+ need_ptexenc=yes
+}
# Check whether --enable-aleph was given.
if test "${enable_aleph+set}" = set; then :
enableval=$enable_aleph;