From 8ec7e9e16594cda561fc22fc6607f7cbb95d4aed Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 18 Aug 2011 13:52:11 +0000 Subject: more upTeX and e-upTeX git-svn-id: svn://tug.org/texlive/trunk@23592 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ptexenc/ChangeLog | 313 ++++------------ Build/source/texk/ptexenc/ChangeLog.TL | 88 ----- Build/source/texk/ptexenc/ChangeLog.jp | 279 ++++++++++++++ Build/source/texk/ptexenc/Makefile.am | 4 +- Build/source/texk/ptexenc/Makefile.in | 2 +- Build/source/texk/ptexenc/configure | 28 +- Build/source/texk/ptexenc/ptexenc.c | 22 +- Build/source/texk/ptexenc/ptexenc/ptexenc.h | 7 + Build/source/texk/ptexenc/version.ac | 2 +- Build/source/texk/web2c/ChangeLog | 9 + Build/source/texk/web2c/Makefile.in | 405 +++++++++++---------- Build/source/texk/web2c/alephdir/com16bit.ch | 10 +- Build/source/texk/web2c/configure | 20 + Build/source/texk/web2c/configure.ac | 5 + Build/source/texk/web2c/eptexdir/ChangeLog | 257 ++++++------- Build/source/texk/web2c/eptexdir/ChangeLog.TL | 110 ------ Build/source/texk/web2c/eptexdir/Changes.txt | 147 ++++++++ Build/source/texk/web2c/eptexdir/am/eptex.am | 2 +- Build/source/texk/web2c/eptexdir/fam256.ch | 2 +- Build/source/texk/web2c/euptexdir/am/euptex.am | 11 - Build/source/texk/web2c/euptexdir/euptex.defines | 2 - Build/source/texk/web2c/euptexdir/fam256-eup.ch | 5 - .../source/texk/web2c/euptexdir/pdfsavepos-eup.ch | 5 - Build/source/texk/web2c/help.h | 199 +++++++--- Build/source/texk/web2c/lib/ChangeLog | 4 + Build/source/texk/web2c/lib/texmfmp.c | 23 +- Build/source/texk/web2c/luatexdir/tex/stringpool.w | 10 +- Build/source/texk/web2c/ptexdir/ChangeLog | 17 + Build/source/texk/web2c/ptexdir/am/ptex.am | 4 +- Build/source/texk/web2c/ptexdir/kanji.c | 12 +- Build/source/texk/web2c/ptexdir/kanji.h | 7 +- Build/source/texk/web2c/ptexdir/pbibtex.ch | 21 +- Build/source/texk/web2c/ptexdir/pdvitype.ch | 19 +- Build/source/texk/web2c/ptexdir/ppltotf.ch | 22 +- Build/source/texk/web2c/ptexdir/ptex-base.ch | 21 +- Build/source/texk/web2c/ptexdir/ptex.defines | 4 + Build/source/texk/web2c/ptexdir/ptftopl.ch | 22 +- Build/source/texk/web2c/tex.ch | 10 +- Build/source/texk/web2c/texmfmp-help.h | 20 +- Build/source/texk/web2c/uptexdir/am/uptex.am | 30 +- Build/source/texk/web2c/uptexdir/kanji.c | 9 + Build/source/texk/web2c/uptexdir/kanji.h | 6 + Build/source/texk/web2c/uptexdir/updvitype.ch | 40 ++ Build/source/texk/web2c/uptexdir/uptex-m.ch | 14 +- Build/source/texk/web2c/uptexdir/uptex.defines | 8 +- Build/source/texk/web2c/web2c/ChangeLog | 6 + Build/source/texk/web2c/web2c/common.defines | 7 +- Build/source/texk/web2c/web2c/convert | 8 +- Build/source/texk/web2c/xetexdir/XeTeXFontInst.h | 2 +- .../source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp | 2 +- .../texk/web2c/xetexdir/XeTeXOTLayoutEngine.cpp | 2 +- .../texk/web2c/xetexdir/XeTeXOTLayoutEngine.h | 2 +- Build/source/texk/web2c/xetexdir/XeTeX_ext.c | 2 +- Build/source/texk/web2c/xetexdir/XeTeX_ext.h | 2 +- Build/source/texk/web2c/xetexdir/pdfimage.cpp | 2 +- Build/source/texk/web2c/xetexdir/xetex-latex3.ch | 2 +- 56 files changed, 1347 insertions(+), 947 deletions(-) delete mode 100644 Build/source/texk/ptexenc/ChangeLog.TL create mode 100644 Build/source/texk/ptexenc/ChangeLog.jp delete mode 100644 Build/source/texk/web2c/eptexdir/ChangeLog.TL create mode 100644 Build/source/texk/web2c/eptexdir/Changes.txt delete mode 100644 Build/source/texk/web2c/euptexdir/fam256-eup.ch delete mode 100644 Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch create mode 100644 Build/source/texk/web2c/uptexdir/updvitype.ch (limited to 'Build/source') diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog index 2f697488f42..bc2329487f3 100644 --- a/Build/source/texk/ptexenc/ChangeLog +++ b/Build/source/texk/ptexenc/ChangeLog @@ -1,279 +1,94 @@ -2010/ 2/25 (1.1.0) +2011-08-18 Peter Breitenlohner - * patches/makejvf-1.1a-ptexenc.patch, - patches/texlive2009-ptexenc.patch: - 同様に TL2009 用に書き換えた。 + * version.ac: Update version number 1.2.0 => 1.3.0dev. + * ptexenc.c, ptexenc/ptexenc.h: Add sjisterminal, + infile_enc_auto, and enable_UPTEX(). - * configure.ac (AC_INIT): New version 1.1.0. + Renamed ChangeLog => ChangeLog.jp, ChangeLog.TL => ChangeLog. + * Makefile.am (EXTRA_DIST): Adapted. -2010/ 2/18 +2011-08-12 Peter Breitenlohner - * patches/mendexk2.6e-ptexenc.patch: - stamp-* を削除、reautoconf を新しくした。 - K&R コンパイラを捨てた。 - を削除。 + Add support for upTeX and e-upTeX. + * ptexenc/ptexenc.h, ptexenc.c: Export fromUCS(). -2010/ 2/17 +2011-07-15 Peter Breitenlohner - * ac/withenable.ac, ac/ptexenc.ac, configure.ac, Makefile.am: - とにかく TL2009 で compile できるようになった。 + * version.ac: New file defining the ptexenc version. + * configure.ac: Adapt. Use KPSE_LT_VERSION. -2010/ 2/15 +2011-01-11 Peter Breitenlohner - * *.c: P1C() などを削除。 - * *.h: P1H() などを削除。kpathsea/c-proto.h を include しない。 - TL2009 の kpathsea で K&R コンパイラを捨てた模様。 + For e-pTeX, adapted from eptex-110102.tar.xz by Hironori Kitagawa. + * ptexenc.c, ptexenc/ptexenc.h: Export toUCS(). + * ptexenc/unicode.h: Export UCStoUTF8(). + * ptexenc.c: Change version string "ptetex" => "ptexenc". + * Makefile.am: Install ptexenc/unicode.h. -2009/10/ 9 (1.0.6) + * configure.ac: Version 1.2.0. - * Makefile.in (version-info): 2:0:2 に更新。 - 今までのバージョン番号は不適切であった。 - 岡山様に指摘いただきました。 +2010-10-02 Peter Breitenlohner - * configure.in, configure, stamp-* (PTEXENC_VERSION): - New version 1.0.6. + * Makefile.am (libptexenc_la_LDFLAGS): Add -no-undefined. -2009/ 9/ 2 (1.0.5) +2010-06-14 Peter Breitenlohner - * README, patches/ptex-src-3.1.11-ptexenc.patch, - COPYRIGHT, patches/mendexk2.6f-ptexenc.patch: 更新。 + * Makefile.am (libptexenc_la_CPPFLAGS): Define MAKE_PTENC_DLL + instead of MAKE_KPSE_DLL. + (libptexenc_la_SOURCES, nobase_include_HEADERS): Do not install + kanjicnv.h, unicode-jp.h, and unicode.h. + * ptexenc/ptexenc.h: Define and use PTENCDLL instead of KPSEDLL. + * ptexenc/kanjicnv.h, ptexenc/unicode-jp.h, ptexenc/unicode.h: + Remove KPSEDLL, everything is internal to the library. - * configure.in, configure, stamp-* (PTEXENC_VERSION): - New version 1.0.5. +2010-06-04 Karl Berry + + * configure.ac (ptexenc_lib_devel): no more dev. -2009/ 7/16 (1.0.4) +2010-05-29 Peter Breitenlohner - * ptexenc.c (input_line2): int から long に変更。 - (input_line3): pbibtex 専用に新設。 + * Makefile.am (nobase_nodist_include_HEADERS): Removed, + don't install ptexenc/c-auto.h. - * patches/texlive2008.sh, patches/ptex-src-3.1.10-ptexenc.patch: - pbibtex を有効にした。 +2010-05-20 Peter Breitenlohner - * patches/mendexk2.6e-ptexenc.patch (mfgets): - '\n' を付加するときに、バッファ溢れを考慮してなかった。 + Moved headers (except jisx0208.h) to ptexenc/, removed patches/. + * Makefile.am, configure.ac: Adjusted. - * configure.in, configure, stamp-* (PTEXENC_VERSION): - New version 1.0.4. +2010-04-22 Peter Breitenlohner -2009/ 7/ 3 (1.0.3) + * ptexenc.[ch] (input_line3): Removed. + * ptexenc.h (inputline3): Removed. + (inputline2): Moved from here to ../web2c/ptexdir/kanji.h. - * ptexenc.c (input_line2,isUTF8Nstream,getc4,ungetc4): - UTF-8N のファイルの文字コード自動認識機能を入れた。 - (getcUTF8): getc2() から getcUTF8() に名称変更した。 +2010-04-19 Peter Breitenlohner - * configure.in, configure, stamp-* (PTEXENC_VERSION): - New version 1.0.3. + * jisx0208.h (new): Copy of ../../libs/gd/gd-2.0.35/jisx0208.h. + * Makefile.am, unicode-jp.c: Adjusted. -2009/ 6/25 +2010-04-16 Peter Breitenlohner - * ptexenc.c, ptexenc.h (ENC_UPTEX,is_internalUPTEX,fromUCS): - 未使用なので廃止。 + * configure.ac: Version 1.1.1 (dev). - * unicode.c, unicode.h (UCStoUPTEX,UPTEXtoUCS): 同じく廃止。 +2010-04-15 Peter Breitenlohner -2009/ 6/ 4 (1.0.2) + Avoid compiler warnings. + * ptexenc.[ch]: Declare ptexenc_version_string, get_enc_string, + and set_enc_string's params as const. + * ptexenc.c (enc_to_string): Declare return value as const. + (string_to_enc): Declare param as const. + (in_filter): Declare as const. + (getc4, ungetc4): Declare as static. + (get_terminal_enc): Declare as static and string var s as const. + * unicode.c (UCStoUTF8S): Skip unused function. - * patches/ptex-src-3.1.10-ptexenc.patch: - 細かな typo を修正。 +2010-04-14 Peter Breitenlohner - * configure.in, configure, stamp-* (PTEXENC_VERSION): - New version 1.0.2. + * Makefile.am (rebuild): New target for forced (re-)build. + (INCLUDES): Add $(KPATHSEA_INCLUDES) in case we use an installed + (system) version. + Add rule to rebuild libkpathsea, if necessary. -2009/ 6/ 3 +2010-04-12 Peter Breitenlohner - * patches/ptex-src-3.1.10-ptexenc.patch: - ptex.pool をインストールしないようにした。 - -2009/ 5/31 (1.0.1) - - * Makefile.in (tkpathsea.mk): include が抜けていた。 - - * configure.in, withenable.ac, reautoconf: - 警告が出ていたので AC_CONFIG_HEADERS など、 - 新しいマクロを使うようにした。 - * configure, c-auto.in: reautoconf で生成しなおした。 - * Makefile.in: acconfig.h, config.h.in が不要になった。 - aclocal.m4, stamp-aclocal, stamp-auto.in を追加した。 - - * patches/mendexk2.6e-ptexenc.patch: - stamp-* を追加、reautoconf を新しくした。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 1.0.1. - -2009/ 5/28 - - * ptexenc.c (nkf_open): nkf がフルパスでなくてもよいことにした。 - - * patches/texlive2008-ptexenc.patch: mendex に k がついてなかった。 - * patches/mendexk2.6e-ptexenc.patch: @KFLAGS@ が展開されてなかった。 - 初めから "-DKPATHSEA -DKPATHSEA3" に展開しておいた。 - 以上２点は岡山様に指摘いただきました。 - -2009/ 5/28 (1.0.0) - - * patches/{jmpost-0.04b-ptexenc.patch, - mendexk2.6e-ptexenc.patch,texlive2008-ptexenc.patch, - makejvf-1.1a-ptexenc.patch,ptex-src-3.1.10-ptexenc.patch, - texlive2008.sh}: TeX Live 2008 専用に統一。 - - * Makefile.in, aclocal.m4, c-auto.in, reautoconf: - 新しい autoconf に対応。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 1.0.0. - - * Makefile.in (tar): .tar.lzma に形式を変更。 - サイズが 160KB → 120KB ほどに節約できた。 - -2008/ 7/ 7 (0.999) - - * patches/ptex-src-3.1.10-texlive200{7,8}.patch: 更新。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 0.999. - -2008/ 7/ 4 - - * ptexenc.c, ptexenc.h (get_enc_string, set_enc_string): - get/set_kanji_enc_string() を get/set_enc_string() に変更。 - - * Makefile.in (lib$(library).la): -version-info を - 1:0:0 にインクリメント。 - -2008/ 7/ 3 - - * patches/ptex-src-3.1.10-ptexenc.patch - (Makefile.in): sjis と euc の fmt を生成しないようにした。 - (ptexextra.c): -kanji-internal オプションを廃止した。 - (mkconf): platex2e_inputs などのマクロを廃止した。 - TEXINPUTS.platex を見直して、ptex// の優先順位を下げた。 - - (jbibtex.ch, pdvitype.ch, pltotf.ch, tftopl.ch): - write() 等を stringcast() を使って短くした。 - -2008/ 6/19 (0.998) - - * patches/ptex-src-3.1.10-ptexenc.patch (Makefile.in), - patches/ptex-src-3.1.10-texlive*.patch (fmtutil.cnf): - fmtutil.cnf に --kanji=default を追記。PTEX_IN_FILTER - を無効にするため。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 0.998. - -2008/ 6/18 - - * ptexenc.h, ptexenc.c, unicode.h, unicode.c: - unsigned char * -> string. - -2008/ 6/12 (0.997) - - * patches/texlive2007.sh, patches/texlive2008.sh: - patch などのコマンドを環境変数で指定できるようにした。 - - * patches/ptex-src-3.1.10-texlive2007.patch (texmf.in): - TEXINPUTS.platex の定義を、ptex// が後ろの方になるよう修正した。 - アスキーさんの設定とは異なる。 - - * patches/ptex-src-3.1.10-texlive2008.patch (texmf.cnf): - そもそも texmf.cnf のパッチが抜けていた。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 0.997. - -2008/ 6/10 (0.996) - - * patches/texlive2007.sh, patches/texlive2008.sh: - ptex 以外に mendex などの面倒も見るようにした。 - 実行ディレクトリのチェックを強化した。 - 実行属性をつけた。pushd/popd -> (cd )。 - - * patches/ptex-src-3.1.10-texlive2007.patch: - PKGS の書き換えをパッチに含めた。 - - * README: 現状にあわせて書き直した。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 0.996. - -2008/ 6/ 8 (0.995) - - * patches/ptex-src-3.1.10-texlive2007.patch: - タイプミスを修正した。（"pdvips" -> "pdvipsk"） - - * patches/ptex-src-3.1.10-texlive2008.patch, - patches/texlive2008-ptex.sh: 新規。 - - * reautoconf, Makefile.in (stamp-configure): - TeX Live 2008 対策で、reautoconf の実行した時刻を - stamp-configure に記録し、 - stamp-configure 自体も配布物に含めた。 - - * configure.in, configure, stamp-configure (PTEXENC_VERSION): - New version 0.995. - -2008/ 6/ 5 - - * configure, withenable.ac (PTEXENC): ディフォルトの - エンコードを UTF-8 に変更した。 - - * Makefile (tar): ChangeLog を UTF-8 変換して固めることにした。 - - * patches/ptex-src-3.1.10-texlive2007.patch, - patches/texlive2007-ptex.sh: - ./configure に "--with-pdvipsk" などのオプションを追加した。 - -2008/ 6/ 2 (0.994) - - * patches/makejvf-1.1a-ptexenc.patch, - patches/mendexk2.6e-ptexenc.patch, patches/jmpost-0.04b-ptexenc.patch: - ptexenc.la を明示的にリンクした。 - - * patches/ptex-src-3.1.10-texlive2007.patch: - パッチを作りなおした。 - TeX Live の ./Build スクリプトでもコンパイルできるようにした。 - - * patches/texlive2007-ptex.sh: 新規。 - 上のパッチを当てるためのスクリプト。 - -2008/ 5/30 - - * Makefile.in (install_headers): ヘッダファイルを列挙せずに、 - ワイルドカードで、$(srcdir) 以下のファイルも指定するようにした。 - カレントディレクトリ以外で configure を走らせても、 - make install が成功するようにした。 - - * configure.in, configure (PTEXENC_VERSION): New version 0.994. - -2008/ 5/29 - - * programs.mk (LOADLIBES), patches/ptex-src-3.1.10-ptexenc.patch: - LOADLIBES を変更しないようにした。 - ptexenc.la は明示的にリンクすることにする。 - -2008/ 5/27 (0.993) - - * ptexenc.c (nkf_open): 文字列バッファを - PATH_MAX を用いて確保するように変更した。 - - * configure.in, configure (PTEXENC_VERSION): New version 0.993. - -2008/ 4/ 4 (0.992) - - * ptexenc.c, ptexenc.h (ptexenc_version_string): - バージョン文字列を新設。 - ptex --version で表示させるようにしてみた。 - - * configure.in, configure (PTEXENC_VERSION): New version 0.992. - -2008/ 3/ 3 (0.991) - - * Makefile.in (lib$(library).la): - --enable-shared でインストールに失敗していた。 - リンクのオプションに kpathsea と -lm を書いていたのがいけなかった。 - 動作報告/101 で Thor 様に報告いただきました。 - (TARS): ChangeLog を追加した。 - - * configure.in, configure, c-auto.in: - kpathsea との差分を小さくなるよう更新した。 + * ptexenc.c (NOFILE) [MinGW32]: Always define it. diff --git a/Build/source/texk/ptexenc/ChangeLog.TL b/Build/source/texk/ptexenc/ChangeLog.TL deleted file mode 100644 index c0123ad83bd..00000000000 --- a/Build/source/texk/ptexenc/ChangeLog.TL +++ /dev/null @@ -1,88 +0,0 @@ -ChangeLog.TL: TeX Live (TL) changes for ptexenc -=============================================== - -2011-08-12 Peter Breitenlohner - - Add support for upTeX and e-upTeX. - * ptexenc/ptexenc.h, ptexenc.c: Export fromUCS(). - -2011-07-15 Peter Breitenlohner - - * version.ac: New file defining the ptexenc version. - * configure.ac: Adapt. Use KPSE_LT_VERSION. - -2011-01-11 Peter Breitenlohner - - For e-pTeX, adapted from eptex-110102.tar.xz by Hironori Kitagawa. - * ptexenc.c, ptexenc/ptexenc.h: Export toUCS(). - * ptexenc/unicode.h: Export UCStoUTF8(). - * ptexenc.c: Change version string "ptetex" => "ptexenc". - * Makefile.am: Install ptexenc/unicode.h. - - * configure.ac: Version 1.2.0. - -2010-10-02 Peter Breitenlohner - - * Makefile.am (libptexenc_la_LDFLAGS): Add -no-undefined. - -2010-06-14 Peter Breitenlohner - - * Makefile.am (libptexenc_la_CPPFLAGS): Define MAKE_PTENC_DLL - instead of MAKE_KPSE_DLL. - (libptexenc_la_SOURCES, nobase_include_HEADERS): Do not install - kanjicnv.h, unicode-jp.h, and unicode.h. - * ptexenc/ptexenc.h: Define and use PTENCDLL instead of KPSEDLL. - * ptexenc/kanjicnv.h, ptexenc/unicode-jp.h, ptexenc/unicode.h: - Remove KPSEDLL, everything is internal to the library. - -2010-06-04 Karl Berry - - * configure.ac (ptexenc_lib_devel): no more dev. - -2010-05-29 Peter Breitenlohner - - * Makefile.am (nobase_nodist_include_HEADERS): Removed, - don't install ptexenc/c-auto.h. - -2010-05-20 Peter Breitenlohner - - Moved headers (except jisx0208.h) to ptexenc/, removed patches/. - * Makefile.am, configure.ac: Adjusted. - -2010-04-22 Peter Breitenlohner - - * ptexenc.[ch] (input_line3): Removed. - * ptexenc.h (inputline3): Removed. - (inputline2): Moved from here to ../web2c/ptexdir/kanji.h. - -2010-04-19 Peter Breitenlohner - - * jisx0208.h (new): Copy of ../../libs/gd/gd-2.0.35/jisx0208.h. - * Makefile.am, unicode-jp.c: Adjusted. - -2010-04-16 Peter Breitenlohner - - * configure.ac: Version 1.1.1 (dev). - -2010-04-15 Peter Breitenlohner - - Avoid compiler warnings. - * ptexenc.[ch]: Declare ptexenc_version_string, get_enc_string, - and set_enc_string's params as const. - * ptexenc.c (enc_to_string): Declare return value as const. - (string_to_enc): Declare param as const. - (in_filter): Declare as const. - (getc4, ungetc4): Declare as static. - (get_terminal_enc): Declare as static and string var s as const. - * unicode.c (UCStoUTF8S): Skip unused function. - -2010-04-14 Peter Breitenlohner - - * Makefile.am (rebuild): New target for forced (re-)build. - (INCLUDES): Add $(KPATHSEA_INCLUDES) in case we use an installed - (system) version. - Add rule to rebuild libkpathsea, if necessary. - -2010-04-12 Peter Breitenlohner - - * ptexenc.c (NOFILE) [MinGW32]: Always define it. diff --git a/Build/source/texk/ptexenc/ChangeLog.jp b/Build/source/texk/ptexenc/ChangeLog.jp new file mode 100644 index 00000000000..2f697488f42 --- /dev/null +++ b/Build/source/texk/ptexenc/ChangeLog.jp @@ -0,0 +1,279 @@ +2010/ 2/25 (1.1.0) + + * patches/makejvf-1.1a-ptexenc.patch, + patches/texlive2009-ptexenc.patch: + 同様に TL2009 用に書き換えた。 + + * configure.ac (AC_INIT): New version 1.1.0. + +2010/ 2/18 + + * patches/mendexk2.6e-ptexenc.patch: + stamp-* を削除、reautoconf を新しくした。 + K&R コンパイラを捨てた。 + を削除。 + +2010/ 2/17 + + * ac/withenable.ac, ac/ptexenc.ac, configure.ac, Makefile.am: + とにかく TL2009 で compile できるようになった。 + +2010/ 2/15 + + * *.c: P1C() などを削除。 + * *.h: P1H() などを削除。kpathsea/c-proto.h を include しない。 + TL2009 の kpathsea で K&R コンパイラを捨てた模様。 + +2009/10/ 9 (1.0.6) + + * Makefile.in (version-info): 2:0:2 に更新。 + 今までのバージョン番号は不適切であった。 + 岡山様に指摘いただきました。 + + * configure.in, configure, stamp-* (PTEXENC_VERSION): + New version 1.0.6. + +2009/ 9/ 2 (1.0.5) + + * README, patches/ptex-src-3.1.11-ptexenc.patch, + COPYRIGHT, patches/mendexk2.6f-ptexenc.patch: 更新。 + + * configure.in, configure, stamp-* (PTEXENC_VERSION): + New version 1.0.5. + +2009/ 7/16 (1.0.4) + + * ptexenc.c (input_line2): int から long に変更。 + (input_line3): pbibtex 専用に新設。 + + * patches/texlive2008.sh, patches/ptex-src-3.1.10-ptexenc.patch: + pbibtex を有効にした。 + + * patches/mendexk2.6e-ptexenc.patch (mfgets): + '\n' を付加するときに、バッファ溢れを考慮してなかった。 + + * configure.in, configure, stamp-* (PTEXENC_VERSION): + New version 1.0.4. + +2009/ 7/ 3 (1.0.3) + + * ptexenc.c (input_line2,isUTF8Nstream,getc4,ungetc4): + UTF-8N のファイルの文字コード自動認識機能を入れた。 + (getcUTF8): getc2() から getcUTF8() に名称変更した。 + + * configure.in, configure, stamp-* (PTEXENC_VERSION): + New version 1.0.3. + +2009/ 6/25 + + * ptexenc.c, ptexenc.h (ENC_UPTEX,is_internalUPTEX,fromUCS): + 未使用なので廃止。 + + * unicode.c, unicode.h (UCStoUPTEX,UPTEXtoUCS): 同じく廃止。 + +2009/ 6/ 4 (1.0.2) + + * patches/ptex-src-3.1.10-ptexenc.patch: + 細かな typo を修正。 + + * configure.in, configure, stamp-* (PTEXENC_VERSION): + New version 1.0.2. + +2009/ 6/ 3 + + * patches/ptex-src-3.1.10-ptexenc.patch: + ptex.pool をインストールしないようにした。 + +2009/ 5/31 (1.0.1) + + * Makefile.in (tkpathsea.mk): include が抜けていた。 + + * configure.in, withenable.ac, reautoconf: + 警告が出ていたので AC_CONFIG_HEADERS など、 + 新しいマクロを使うようにした。 + * configure, c-auto.in: reautoconf で生成しなおした。 + * Makefile.in: acconfig.h, config.h.in が不要になった。 + aclocal.m4, stamp-aclocal, stamp-auto.in を追加した。 + + * patches/mendexk2.6e-ptexenc.patch: + stamp-* を追加、reautoconf を新しくした。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 1.0.1. + +2009/ 5/28 + + * ptexenc.c (nkf_open): nkf がフルパスでなくてもよいことにした。 + + * patches/texlive2008-ptexenc.patch: mendex に k がついてなかった。 + * patches/mendexk2.6e-ptexenc.patch: @KFLAGS@ が展開されてなかった。 + 初めから "-DKPATHSEA -DKPATHSEA3" に展開しておいた。 + 以上２点は岡山様に指摘いただきました。 + +2009/ 5/28 (1.0.0) + + * patches/{jmpost-0.04b-ptexenc.patch, + mendexk2.6e-ptexenc.patch,texlive2008-ptexenc.patch, + makejvf-1.1a-ptexenc.patch,ptex-src-3.1.10-ptexenc.patch, + texlive2008.sh}: TeX Live 2008 専用に統一。 + + * Makefile.in, aclocal.m4, c-auto.in, reautoconf: + 新しい autoconf に対応。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 1.0.0. + + * Makefile.in (tar): .tar.lzma に形式を変更。 + サイズが 160KB → 120KB ほどに節約できた。 + +2008/ 7/ 7 (0.999) + + * patches/ptex-src-3.1.10-texlive200{7,8}.patch: 更新。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 0.999. + +2008/ 7/ 4 + + * ptexenc.c, ptexenc.h (get_enc_string, set_enc_string): + get/set_kanji_enc_string() を get/set_enc_string() に変更。 + + * Makefile.in (lib$(library).la): -version-info を + 1:0:0 にインクリメント。 + +2008/ 7/ 3 + + * patches/ptex-src-3.1.10-ptexenc.patch + (Makefile.in): sjis と euc の fmt を生成しないようにした。 + (ptexextra.c): -kanji-internal オプションを廃止した。 + (mkconf): platex2e_inputs などのマクロを廃止した。 + TEXINPUTS.platex を見直して、ptex// の優先順位を下げた。 + + (jbibtex.ch, pdvitype.ch, pltotf.ch, tftopl.ch): + write() 等を stringcast() を使って短くした。 + +2008/ 6/19 (0.998) + + * patches/ptex-src-3.1.10-ptexenc.patch (Makefile.in), + patches/ptex-src-3.1.10-texlive*.patch (fmtutil.cnf): + fmtutil.cnf に --kanji=default を追記。PTEX_IN_FILTER + を無効にするため。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 0.998. + +2008/ 6/18 + + * ptexenc.h, ptexenc.c, unicode.h, unicode.c: + unsigned char * -> string. + +2008/ 6/12 (0.997) + + * patches/texlive2007.sh, patches/texlive2008.sh: + patch などのコマンドを環境変数で指定できるようにした。 + + * patches/ptex-src-3.1.10-texlive2007.patch (texmf.in): + TEXINPUTS.platex の定義を、ptex// が後ろの方になるよう修正した。 + アスキーさんの設定とは異なる。 + + * patches/ptex-src-3.1.10-texlive2008.patch (texmf.cnf): + そもそも texmf.cnf のパッチが抜けていた。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 0.997. + +2008/ 6/10 (0.996) + + * patches/texlive2007.sh, patches/texlive2008.sh: + ptex 以外に mendex などの面倒も見るようにした。 + 実行ディレクトリのチェックを強化した。 + 実行属性をつけた。pushd/popd -> (cd )。 + + * patches/ptex-src-3.1.10-texlive2007.patch: + PKGS の書き換えをパッチに含めた。 + + * README: 現状にあわせて書き直した。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 0.996. + +2008/ 6/ 8 (0.995) + + * patches/ptex-src-3.1.10-texlive2007.patch: + タイプミスを修正した。（"pdvips" -> "pdvipsk"） + + * patches/ptex-src-3.1.10-texlive2008.patch, + patches/texlive2008-ptex.sh: 新規。 + + * reautoconf, Makefile.in (stamp-configure): + TeX Live 2008 対策で、reautoconf の実行した時刻を + stamp-configure に記録し、 + stamp-configure 自体も配布物に含めた。 + + * configure.in, configure, stamp-configure (PTEXENC_VERSION): + New version 0.995. + +2008/ 6/ 5 + + * configure, withenable.ac (PTEXENC): ディフォルトの + エンコードを UTF-8 に変更した。 + + * Makefile (tar): ChangeLog を UTF-8 変換して固めることにした。 + + * patches/ptex-src-3.1.10-texlive2007.patch, + patches/texlive2007-ptex.sh: + ./configure に "--with-pdvipsk" などのオプションを追加した。 + +2008/ 6/ 2 (0.994) + + * patches/makejvf-1.1a-ptexenc.patch, + patches/mendexk2.6e-ptexenc.patch, patches/jmpost-0.04b-ptexenc.patch: + ptexenc.la を明示的にリンクした。 + + * patches/ptex-src-3.1.10-texlive2007.patch: + パッチを作りなおした。 + TeX Live の ./Build スクリプトでもコンパイルできるようにした。 + + * patches/texlive2007-ptex.sh: 新規。 + 上のパッチを当てるためのスクリプト。 + +2008/ 5/30 + + * Makefile.in (install_headers): ヘッダファイルを列挙せずに、 + ワイルドカードで、$(srcdir) 以下のファイルも指定するようにした。 + カレントディレクトリ以外で configure を走らせても、 + make install が成功するようにした。 + + * configure.in, configure (PTEXENC_VERSION): New version 0.994. + +2008/ 5/29 + + * programs.mk (LOADLIBES), patches/ptex-src-3.1.10-ptexenc.patch: + LOADLIBES を変更しないようにした。 + ptexenc.la は明示的にリンクすることにする。 + +2008/ 5/27 (0.993) + + * ptexenc.c (nkf_open): 文字列バッファを + PATH_MAX を用いて確保するように変更した。 + + * configure.in, configure (PTEXENC_VERSION): New version 0.993. + +2008/ 4/ 4 (0.992) + + * ptexenc.c, ptexenc.h (ptexenc_version_string): + バージョン文字列を新設。 + ptex --version で表示させるようにしてみた。 + + * configure.in, configure (PTEXENC_VERSION): New version 0.992. + +2008/ 3/ 3 (0.991) + + * Makefile.in (lib$(library).la): + --enable-shared でインストールに失敗していた。 + リンクのオプションに kpathsea と -lm を書いていたのがいけなかった。 + 動作報告/101 で Thor 様に報告いただきました。 + (TARS): ChangeLog を追加した。 + + * configure.in, configure, c-auto.in: + kpathsea との差分を小さくなるよう更新した。 diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am index c7ba5905121..a3bcac840ca 100644 --- a/Build/source/texk/ptexenc/Makefile.am +++ b/Build/source/texk/ptexenc/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/ptexenc/ ## -## Copyright (C) 2010 Peter Breitenlohner +## Copyright (C) 2010, 2011 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -36,5 +36,5 @@ nobase_include_HEADERS = \ ptexenc/ptexenc.h \ ptexenc/unicode.h -EXTRA_DIST = COPYRIGHT ChangeLog.TL +EXTRA_DIST = COPYRIGHT ChangeLog.jp diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in index 873e3dbe0ad..a193ff62a83 100644 --- a/Build/source/texk/ptexenc/Makefile.in +++ b/Build/source/texk/ptexenc/Makefile.in @@ -271,7 +271,7 @@ nobase_include_HEADERS = \ ptexenc/ptexenc.h \ ptexenc/unicode.h -EXTRA_DIST = COPYRIGHT ChangeLog.TL +EXTRA_DIST = COPYRIGHT ChangeLog.jp all: all-am .SUFFIXES: diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure index 8f7ee188970..c58d72e9a07 100755 --- a/Build/source/texk/ptexenc/configure +++ b/Build/source/texk/ptexenc/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ptexenc 1.2.0. +# Generated by GNU Autoconf 2.68 for ptexenc 1.3.0dev. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ptexenc' PACKAGE_TARNAME='ptexenc' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='ptexenc 1.2.0' +PACKAGE_VERSION='1.3.0dev' +PACKAGE_STRING='ptexenc 1.3.0dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1305,7 +1305,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 ptexenc 1.2.0 to adapt to many kinds of systems. +\`configure' configures ptexenc 1.3.0dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1375,7 +1375,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ptexenc 1.2.0:";; + short | recursive ) echo "Configuration of ptexenc 1.3.0dev:";; esac cat <<\_ACEOF @@ -1490,7 +1490,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ptexenc configure 1.2.0 +ptexenc configure 1.3.0dev generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1970,7 +1970,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 ptexenc $as_me 1.2.0, which was +It was created by ptexenc $as_me 1.3.0dev, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2351,12 +2351,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -PTEXENCVERSION=1.2.0 +PTEXENCVERSION=1.3.0dev -$as_echo "#define PTEXENCVERSION \"ptexenc version 1.2.0\"" >>confdefs.h +$as_echo "#define PTEXENCVERSION \"ptexenc version 1.3.0dev\"" >>confdefs.h -PTEXENC_LT_VERSINFO=3:0:2 +PTEXENC_LT_VERSINFO=4:0:3 am__api_version='1.11' @@ -7331,7 +7331,7 @@ fi # Define the identity of the package. PACKAGE='ptexenc' - VERSION='1.2.0' + VERSION='1.3.0dev' cat >>confdefs.h <<_ACEOF @@ -12946,7 +12946,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -ptexenc config.lt 1.2.0 +ptexenc config.lt 1.3.0dev configured by $0, generated by GNU Autoconf 2.68. Copyright (C) 2010 Free Software Foundation, Inc. @@ -14713,7 +14713,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 ptexenc $as_me 1.2.0, which was +This file was extended by ptexenc $as_me 1.3.0dev, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14779,7 +14779,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="\\ -ptexenc config.status 1.2.0 +ptexenc config.status 1.3.0dev configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c index 7597b2b37a9..c58863ff498 100644 --- a/Build/source/texk/ptexenc/ptexenc.c +++ b/Build/source/texk/ptexenc/ptexenc.c @@ -32,6 +32,12 @@ #endif const char *ptexenc_version_string = "ptexenc " PTEXENC_VERSION; +#if defined(WIN32) +int sjisterminal; +int infile_enc_auto; +#else +static int infile_enc_auto = 1; +#endif static int file_enc = ENC_UNKNOWN; static int internal_enc = ENC_UNKNOWN; @@ -124,6 +130,12 @@ static int get_terminal_enc(void) return terminal_enc; } +/* enable/disable UPTEX */ +void enable_UPTEX (boolean enable) +{ + (void) enable; +} + const_string get_enc_string(void) { static char buffer[20]; /* enough large space */ @@ -144,7 +156,13 @@ boolean set_enc_string(const_string file_str, const_string internal_str) int internal = string_to_enc(internal_str); if (file < 0 || internal < 0) return false; /* error */ - if (file != ENC_UNKNOWN) { set_file_enc(file); nkf_disable(); } + if (file != ENC_UNKNOWN) { + set_file_enc(file); +#if !defined(WIN32) + infile_enc_auto =0; + nkf_disable(); +#endif + } if (internal != ENC_UNKNOWN) set_internal_enc(internal); return true; } @@ -319,7 +337,7 @@ int putc2(int c, FILE *fp) inkanji[fd] = 1; } else { /* ASCII */ if (inkanji[fd] < 0 && output_enc == ENC_JIS) { - ret = put_multibyte(KANJI_OUT, fp); + put_multibyte(KANJI_OUT, fp); } ret = putc(c, fp); inkanji[fd] = 0; diff --git a/Build/source/texk/ptexenc/ptexenc/ptexenc.h b/Build/source/texk/ptexenc/ptexenc/ptexenc.h index a780045e18d..05955ea1279 100644 --- a/Build/source/texk/ptexenc/ptexenc/ptexenc.h +++ b/Build/source/texk/ptexenc/ptexenc/ptexenc.h @@ -22,9 +22,16 @@ #endif extern PTENCDLL const char *ptexenc_version_string; +#if defined(WIN32) +extern PTENCDLL int sjisterminal; +extern PTENCDLL int infile_enc_auto; +#endif #define KANJI_OPTS "{jis|euc|sjis|utf8}" +/* enable/disable UPTEX */ +extern PTENCDLL void enable_UPTEX (boolean enable); + /* get/set Kanji encoding by string */ extern PTENCDLL const_string get_enc_string(void); extern PTENCDLL int set_enc_string(const_string file, const_string inter); diff --git a/Build/source/texk/ptexenc/version.ac b/Build/source/texk/ptexenc/version.ac index 848f7b9daab..0a69d319571 100644 --- a/Build/source/texk/ptexenc/version.ac +++ b/Build/source/texk/ptexenc/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 ptexenc version -m4_define([ptexenc_version], [1.2.0]) +m4_define([ptexenc_version], [1.3.0dev]) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index bdfd86ba8d7..b7249e71d60 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,12 @@ +2011-08-17 Peter Breitenlohner + + * help.h (PBIBTEXHELP, PDVITYPEHELP, PPLTOTFHELP, PTFTOPLHELP): + Add "-sjis-terminal" for WIN32 versions. Uniform appearance. + Add UPBIBTEXHELP, UPDVITYPEHELP, UPPLTOTFHELP, and UPTFTOPLHELP. + * texmfmp-help.h: WIN32 options also for MINGW32. + + * configure.ac: New conditional UPWEB for upBibTeX and Co. + 2011-08-17 Akira Kakuto * texmfmp-help.h: Recover help messages for w32tex. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 30b1bc70b2c..5c268e0d52f 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -36,29 +36,30 @@ 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) 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) \ - $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \ - $(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) \ - $(am__EXEEXT_23) $(am__EXEEXT_24) synctex$(EXEEXT) + $(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \ + euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ + pdftosrc$(EXEEXT) luatex$(EXEEXT) txt2zlib$(EXEEXT) \ + xetex$(EXEEXT) $(am__EXEEXT_6) aleph$(EXEEXT) +bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \ + ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_8) \ + $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \ + $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \ + $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \ + $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \ + $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \ + $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ + synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \ - $(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 \ + $(am__EXEEXT_34) $(am__EXEEXT_35) +check_PROGRAMS = $(am__EXEEXT_27) $(am__EXEEXT_28) $(am__EXEEXT_29) \ + $(am__EXEEXT_30) $(am__EXEEXT_31) $(am__EXEEXT_32) \ + $(am__EXEEXT_33) md5main$(EXEEXT) +TESTS = tangle.test $(am__EXEEXT_38) 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_47) $(am__append_54) $(am__append_68) \ - $(am__append_71) $(am__append_72) libmd5/md5.test + $(am__append_48) $(am__append_55) $(am__append_69) \ + $(am__append_72) $(am__append_73) libmd5/md5.test DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ $(srcdir)/../../build-aux/config.guess \ $(srcdir)/../../build-aux/config.sub \ @@ -139,36 +140,37 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @EPTEX_TRUE@am__append_42 = eptrip.diffs @EPTEX_TRUE@am__append_43 = eptrip-clean @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 = \ +@UPWEB_TRUE@am__append_45 = $(upweb_programs) +@EUPTEX_TRUE@am__append_46 = euptex +@PDFTEX_TRUE@am__append_47 = pdftex ttf2afm pdftosrc +@PDFTEX_TRUE@am__append_48 = $(pdftex_tests) +@MINGW32_TRUE@am__append_49 = \ @MINGW32_TRUE@ pdftexdir/regex/regex.c \ @MINGW32_TRUE@ pdftexdir/regex/regex.h -@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) \ +@LUATEX_TRUE@am__append_50 = luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_51 = call_luatex +@LUATEX_TRUE@@WIN32_TRUE@am__append_52 = install-luatex-links +@LUATEX_TRUE@@WIN32_TRUE@am__append_53 = uninstall-luatex-links +@LUATEX_TRUE@@WIN32_FALSE@am__append_54 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac +@LUATEX_TRUE@am__append_55 = $(luatex_tests) +@MINGW32_FALSE@am__append_56 = -DLUA_USE_POSIX +@XETEX_TRUE@am__append_57 = xetex +@XETEX_MACOSX_TRUE@am__append_58 = -DXETEX_MAC +@XETEX_MACOSX_TRUE@am__append_59 = libxetexmm.a +@XETEX_MACOSX_FALSE@am__append_60 = -DXETEX_OTHER $(POPPLER_INCLUDES) \ @XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES) -@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_FALSE@am__append_61 = $(POPPLER_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS) +@XETEX_MACOSX_FALSE@am__append_62 = $(POPPLER_DEPEND) $(LIBPNG_DEPEND) +@XETEX_GRAPHITE_TRUE@am__append_63 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES) +@XETEX_GRAPHITE_TRUE@am__append_64 = $(GRAPHITE_LIBS) +@XETEX_GRAPHITE_TRUE@am__append_65 = $(GRAPHITE_DEPEND) +@XETEX_MACOSX_TRUE@am__append_66 = \ @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_66 = \ +@XETEX_MACOSX_FALSE@am__append_67 = \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \ @XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \ @@ -185,96 +187,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_67 = \ +@XETEX_GRAPHITE_TRUE@am__append_68 = \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \ @XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h -@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 \ +@XETEX_TRUE@am__append_69 = $(xetex_tests) +@OTANGLE_TRUE@am__append_70 = $(omegaware_tools) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_71 = $(omegaware_font_tools) +@OTANGLE_TRUE@am__append_72 = $(OTANGLE_tests) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_73 = $(OMFONTS_tests) +@OTANGLE_TRUE@am__append_74 = pltotf tftopl +@ALEPH_TRUE@am__append_75 = aleph +@TEX_SYNCTEX_TRUE@am__append_76 = -I$(srcdir)/synctexdir \ @TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\" -@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@am__append_77 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_78 = $(ZLIB_DEPEND) +@TEX_SYNCTEX_TRUE@am__append_79 = \ @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_79 = -I$(srcdir)/synctexdir \ +@ETEX_SYNCTEX_TRUE@am__append_80 = -I$(srcdir)/synctexdir \ @ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\" -@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@am__append_81 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_82 = $(ZLIB_DEPEND) +@ETEX_SYNCTEX_TRUE@am__append_83 = \ @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_83 = -I$(srcdir)/synctexdir \ +@PTEX_SYNCTEX_TRUE@am__append_84 = -I$(srcdir)/synctexdir \ @PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\" -@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@am__append_85 = $(ZLIB_LIBS) +@PTEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_DEPEND) +@PTEX_SYNCTEX_TRUE@am__append_87 = \ @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 -@UPTEX_SYNCTEX_TRUE@am__append_87 = -I$(srcdir)/synctexdir \ +@UPTEX_SYNCTEX_TRUE@am__append_88 = -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@am__append_89 = $(ZLIB_LIBS) +@UPTEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_DEPEND) +@UPTEX_SYNCTEX_TRUE@am__append_91 = \ @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@am__append_92 = -I$(srcdir)/synctexdir \ @EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \ @EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\" -@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@am__append_93 = $(ZLIB_LIBS) +@EPTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_DEPEND) +@EPTEX_SYNCTEX_TRUE@am__append_95 = \ @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 -@EUPTEX_SYNCTEX_TRUE@am__append_95 = -I$(srcdir)/synctexdir \ +@EUPTEX_SYNCTEX_TRUE@am__append_96 = -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@am__append_97 = $(ZLIB_LIBS) +@EUPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_DEPEND) +@EUPTEX_SYNCTEX_TRUE@am__append_99 = \ @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@am__append_100 = -I$(srcdir)/synctexdir \ @PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\" -@PDFTEX_SYNCTEX_TRUE@am__append_100 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_101 = \ @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_101 = -I$(srcdir)/synctexdir \ +@XETEX_SYNCTEX_TRUE@am__append_102 = -I$(srcdir)/synctexdir \ @XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \ @XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\" -@XETEX_SYNCTEX_TRUE@am__append_102 = \ +@XETEX_SYNCTEX_TRUE@am__append_103 = \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ @XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ @@ -593,45 +595,47 @@ am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \ vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT) am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \ ptftopl$(EXEEXT) -am__EXEEXT_3 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) -am__EXEEXT_4 = ofm2opl$(EXEEXT) opl2ofm$(EXEEXT) ovf2ovp$(EXEEXT) \ +am__EXEEXT_3 = updvitype$(EXEEXT) +am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) +am__EXEEXT_5 = ofm2opl$(EXEEXT) opl2ofm$(EXEEXT) ovf2ovp$(EXEEXT) \ ovp2ovf$(EXEEXT) -am__EXEEXT_5 = $(am__EXEEXT_3) $(am__EXEEXT_4) -@WEB_TRUE@am__EXEEXT_6 = $(am__EXEEXT_1) -@TEX_TRUE@am__EXEEXT_7 = tex$(EXEEXT) -@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_8 = initex$(EXEEXT) -@MF_TRUE@am__EXEEXT_9 = mf$(EXEEXT) -@MFN_TRUE@@MF_TRUE@am__EXEEXT_10 = mf-nowin$(EXEEXT) -@MF_TRUE@@WIN32_TRUE@am__EXEEXT_11 = inimf$(EXEEXT) -@MP_TRUE@am__EXEEXT_12 = mpost$(EXEEXT) -@ETEX_TRUE@am__EXEEXT_13 = etex$(EXEEXT) -@PTEX_TRUE@am__EXEEXT_14 = ptex$(EXEEXT) -@PWEB_TRUE@am__EXEEXT_15 = $(am__EXEEXT_2) -@EPTEX_TRUE@am__EXEEXT_16 = eptex$(EXEEXT) -@UPTEX_TRUE@am__EXEEXT_17 = uptex$(EXEEXT) -@EUPTEX_TRUE@am__EXEEXT_18 = euptex$(EXEEXT) -@PDFTEX_TRUE@am__EXEEXT_19 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ +am__EXEEXT_6 = $(am__EXEEXT_4) $(am__EXEEXT_5) +@WEB_TRUE@am__EXEEXT_7 = $(am__EXEEXT_1) +@TEX_TRUE@am__EXEEXT_8 = tex$(EXEEXT) +@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_9 = initex$(EXEEXT) +@MF_TRUE@am__EXEEXT_10 = mf$(EXEEXT) +@MFN_TRUE@@MF_TRUE@am__EXEEXT_11 = mf-nowin$(EXEEXT) +@MF_TRUE@@WIN32_TRUE@am__EXEEXT_12 = inimf$(EXEEXT) +@MP_TRUE@am__EXEEXT_13 = mpost$(EXEEXT) +@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT) +@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT) +@PWEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2) +@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT) +@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT) +@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3) +@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT) +@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \ @PDFTEX_TRUE@ pdftosrc$(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) +@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT) +@XETEX_TRUE@am__EXEEXT_23 = xetex$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_24 = $(am__EXEEXT_4) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_25 = $(am__EXEEXT_5) +@ALEPH_TRUE@am__EXEEXT_26 = aleph$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(man5dir)" -@TEX_TRUE@am__EXEEXT_25 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@TEX_TRUE@am__EXEEXT_27 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @TEX_TRUE@ tftopl$(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) \ +@MF_TRUE@am__EXEEXT_28 = gftype$(EXEEXT) tftopl$(EXEEXT) +@MP_TRUE@am__EXEEXT_29 = pltotf$(EXEEXT) tftopl$(EXEEXT) +@ETEX_TRUE@am__EXEEXT_30 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @ETEX_TRUE@ tftopl$(EXEEXT) -@PTEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@PTEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @PTEX_TRUE@ tftopl$(EXEEXT) -@EPTEX_TRUE@am__EXEEXT_30 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ +@EPTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @EPTEX_TRUE@ tftopl$(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) +@OTANGLE_TRUE@am__EXEEXT_33 = pltotf$(EXEEXT) tftopl$(EXEEXT) +@MP_TRUE@@WIN32_TRUE@am__EXEEXT_34 = call_mpost$(EXEEXT) +@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_luatex$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) dist_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) \ aleph-alephextra.$(OBJEXT) @@ -795,7 +799,7 @@ 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_8 = $(pproglib) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_8 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) pbibtex_DEPENDENCIES = $(am__DEPENDENCIES_8) am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \ @@ -850,8 +854,8 @@ 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_10 = $(am__DEPENDENCIES_1) -ptex_DEPENDENCIES = libkanji.a $(am__DEPENDENCIES_8) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10) +ptex_DEPENDENCIES = $(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) @@ -892,6 +896,13 @@ ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS) ttf2afm_LDADD = $(LDADD) nodist_txt2zlib_OBJECTS = txt2zlib-txt2zlib.$(OBJEXT) txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS) +am_updvitype_OBJECTS = +nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT) +updvitype_OBJECTS = $(am_updvitype_OBJECTS) \ + $(nodist_updvitype_OBJECTS) +am__DEPENDENCIES_12 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) +updvitype_DEPENDENCIES = $(am__DEPENDENCIES_12) am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \ uptexdir/uptexextra.h synctexdir/synctex.c \ synctexdir/synctex.h synctexdir/synctex-common.h \ @@ -901,10 +912,9 @@ 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) +@UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1) +uptex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_13) nodist_vftovp_OBJECTS = vftovp.$(OBJEXT) vftovp_OBJECTS = $(nodist_vftovp_OBJECTS) vftovp_LDADD = $(LDADD) @@ -926,15 +936,15 @@ 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_13 = $(am__DEPENDENCIES_1) \ +@XETEX_MACOSX_FALSE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) \ @XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \ @XETEX_MACOSX_FALSE@ $(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) \ +@XETEX_GRAPHITE_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) +am__DEPENDENCIES_16 = $(libxetex) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_14) \ + $(am__DEPENDENCIES_15) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -xetex_DEPENDENCIES = $(am__DEPENDENCIES_15) $(am__DEPENDENCIES_2) \ +xetex_DEPENDENCIES = $(am__DEPENDENCIES_16) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_1) xetex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CXXLD) $(xetex_CXXFLAGS) $(CXXFLAGS) \ @@ -1001,7 +1011,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) $(dist_uptex_SOURCES) \ + $(nodist_txt2zlib_SOURCES) $(updvitype_SOURCES) \ + $(nodist_updvitype_SOURCES) $(dist_uptex_SOURCES) \ $(nodist_uptex_SOURCES) $(nodist_vftovp_SOURCES) \ $(nodist_vptovf_SOURCES) $(nodist_weave_SOURCES) \ $(dist_xetex_SOURCES) $(nodist_xetex_SOURCES) \ @@ -1024,7 +1035,8 @@ 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_uptex_SOURCES_DIST) $(am__dist_xetex_SOURCES_DIST) + $(updvitype_SOURCES) $(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 \ @@ -1066,13 +1078,13 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -am__EXEEXT_34 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ +am__EXEEXT_36 = 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_35 = $(am__EXEEXT_34) tests/bibtex-openout-test.pl \ +am__EXEEXT_37 = $(am__EXEEXT_36) tests/bibtex-openout-test.pl \ tests/bibtex-longline-test.pl tests/bibtex-mem.test -@WEB_TRUE@am__EXEEXT_36 = $(am__EXEEXT_35) +@WEB_TRUE@am__EXEEXT_38 = $(am__EXEEXT_37) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1383,14 +1395,15 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \ ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \ $(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \ - eptexdir/ChangeLog.TL eptexdir/README.txt \ + eptexdir/Changes.txt 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) \ + ptexdir/pdvitype.ch uptexdir/updvitype.ch $(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) \ pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \ luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \ $(luatex_tests) luatexdir/lua51/Makefile \ @@ -1592,9 +1605,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_53) -install_exe_links = $(am__append_20) $(am__append_51) -uninstall_exe_links = $(am__append_21) $(am__append_52) + $(am__append_54) +install_exe_links = $(am__append_20) $(am__append_52) +uninstall_exe_links = $(am__append_21) $(am__append_53) web2c = $(SHELL) ./web2c-sh $@ makecpool = web2c/makecpool @@ -1678,18 +1691,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_75) +tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_76) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_76) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_77) # 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_78) +dist_tex_SOURCES = texextra.c $(am__append_79) # We must create texd.h before building the tex_OBJECTS. -tex_prereq = texd.h $(am__append_77) +tex_prereq = texd.h $(am__append_78) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1757,19 +1770,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_79) +etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_80) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_80) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_81) # 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_82) + $(am__append_83) # 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_81) +etex_prereq = etexd.h etexdir/etex_version.h $(am__append_82) etex_web_srcs = \ tex.web \ etexdir/etex.ch @@ -1788,7 +1801,7 @@ etex_ch_srcs = \ # etex_tests = etexdir/etrip.test ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD) +ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE) pweb_programs = pbibtex pdvitype ppltotf ptftopl @@ -1803,20 +1816,19 @@ 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_83) +ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_84) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs) \ - $(am__append_84) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_85) # 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_86) + $(am__append_87) # 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_85) +ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_86) ptex_web_srcs = \ tex.web \ tex.ch @@ -1846,22 +1858,22 @@ ptftopl_LDADD = $(ptex_ldadd) # e-pTeX Tests # eptex_tests = eptexdir/eptrip.test -eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_91) +eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_92) # With --enable-ipc, e-pTeX may need to link with -lsocket. eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_92) + $(ipc_socketlibs) $(am__append_93) # 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/eptex_version.h eptexdir/ptex_version.h dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \ - $(am__append_94) + $(am__append_95) # 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/eptex_version.h eptexdir/ptex_version.h \ - $(am__append_93) + $(am__append_94) eptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1882,23 +1894,25 @@ eptex_ch_srcs = \ tex-binpool.ch uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) +uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) +up_tangle = WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE) +upweb_programs = updvitype libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h libukanji_a_CPPFLAGS = $(uptex_cppflags) -uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_87) +uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_88) # With --enable-ipc, upTeX may need to link with -lsocket. -uptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_88) +uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_89) # 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) + $(am__append_91) # 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) + uptexdir/uptex_version.h $(am__append_90) uptex_web_srcs = \ tex.web \ tex.ch @@ -1909,11 +1923,15 @@ uptex_ch_srcs = \ $(uptex_ch_synctex) \ tex-binpool.ch -euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_95) +nodist_updvitype_SOURCES = updvitype.c updvitype.h +updvitype_SOURCES = uptexdir/kanji.h +updvitype_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE +updvitype_LDADD = $(uptex_ldadd) +euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_96) # With --enable-ipc, e-upTeX may need to link with -lsocket. euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \ - $(ipc_socketlibs) $(am__append_96) + $(ipc_socketlibs) $(am__append_97) # e-upTeX C sources euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h @@ -1921,12 +1939,12 @@ 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) + $(am__append_99) # 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) + euptexdir/uptex_version.h $(am__append_98) euptex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1944,12 +1962,10 @@ euptex_ch_srcs = \ 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) \ @@ -1965,7 +1981,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_99) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_100) pdftex_CXXFLAGS = $(WARNING_CXXFLAGS) # With --enable-ipc, pdfTeX may need to link with -lsocket. @@ -1979,7 +1995,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_100) + $(am__append_101) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -2005,7 +2021,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_48) + pdftexdir/writezip.c $(am__append_49) 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 @@ -2046,7 +2062,7 @@ call_luatex_LDADD = # luaTeX Tests # luatex_tests = luatexdir/luatex.test -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_55) +liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_56) liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ @@ -2424,17 +2440,17 @@ txt2zlib_LDADD = $(ZLIB_LIBS) # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx -libxetex = libxetex.a $(am__append_58) +libxetex = libxetex.a $(am__append_59) xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \ - $(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) + $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_58) \ + $(am__append_60) $(am__append_63) $(ZLIB_INCLUDES) +xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_61) \ + $(am__append_64) $(FREETYPE2_LIBS) $(ZLIB_LIBS) xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \ - $(TECKIT_DEPEND) $(am__append_61) $(am__append_64) \ + $(TECKIT_DEPEND) $(am__append_62) $(am__append_65) \ $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_101) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_102) xetex_CFLAGS = # $(WARNING_CFLAGS) xetex_CXXFLAGS = # $(WARNING_CXXFLAGS) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) @@ -2446,7 +2462,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_102) + $(am__append_103) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -2477,7 +2493,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_65) $(am__append_66) $(am__append_67) + $(am__append_66) $(am__append_67) $(am__append_68) # We must create xetexd.h etc. before building the libxetex_a_OBJECTS. libxetex_prereq = xetexd.h $(xetex_dependencies) @@ -3015,6 +3031,9 @@ ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) txt2zlib$(EXEEXT): $(txt2zlib_OBJECTS) $(txt2zlib_DEPENDENCIES) @rm -f txt2zlib$(EXEEXT) $(LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS) +updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) + @rm -f updvitype$(EXEEXT) + $(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS) uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) @rm -f uptex$(EXEEXT) $(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS) @@ -3414,6 +3433,7 @@ 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)/updvitype-updvitype.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@ @@ -8000,6 +8020,20 @@ 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` +updvitype-updvitype.o: updvitype.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT updvitype-updvitype.o -MD -MP -MF $(DEPDIR)/updvitype-updvitype.Tpo -c -o updvitype-updvitype.o `test -f 'updvitype.c' || echo '$(srcdir)/'`updvitype.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/updvitype-updvitype.Tpo $(DEPDIR)/updvitype-updvitype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='updvitype.c' object='updvitype-updvitype.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o updvitype-updvitype.o `test -f 'updvitype.c' || echo '$(srcdir)/'`updvitype.c + +updvitype-updvitype.obj: updvitype.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT updvitype-updvitype.obj -MD -MP -MF $(DEPDIR)/updvitype-updvitype.Tpo -c -o updvitype-updvitype.obj `if test -f 'updvitype.c'; then $(CYGPATH_W) 'updvitype.c'; else $(CYGPATH_W) '$(srcdir)/updvitype.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/updvitype-updvitype.Tpo $(DEPDIR)/updvitype-updvitype.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='updvitype.c' object='updvitype-updvitype.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o updvitype-updvitype.obj `if test -f 'updvitype.c'; then $(CYGPATH_W) 'updvitype.c'; else $(CYGPATH_W) '$(srcdir)/updvitype.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 @@ -9669,9 +9703,14 @@ uptex.web: tie$(EXEEXT) $(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 +updvitype.c updvitype.h: updvitype-web2c + $(web2c) updvitype +updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines + $(web2c) updvitype +updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch + $(up_tangle) updvitype updvitype +updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch + $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch $(euptex_OBJECTS): $(euptex_prereq) $(euptex_c_h): euptex-web2c @@ -9719,14 +9758,6 @@ euptex.web: tie$(EXEEXT) $(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/alephdir/com16bit.ch b/Build/source/texk/web2c/alephdir/com16bit.ch index 369624148ca..b84d520013c 100644 --- a/Build/source/texk/web2c/alephdir/com16bit.ch +++ b/Build/source/texk/web2c/alephdir/com16bit.ch @@ -2805,11 +2805,11 @@ if (cur_val<0)or((cur_val>15)and(cur_val<>18)) then end; end; -@* \[54/web2c-string] The string recycling routines. \TeX{} uses 2 -upto 4 {\it new\/} strings when scanning a filename in an \.{\\input}, -\.{\\openin}, or \.{\\openout} operation. These strings are normally -lost because the reference to them are not saved after finishing the -operation. |search_string| searches through the string pool for the +@* \[54/web2c-string] The string recycling routines. +\TeX{} uses 2 upto 4 {\it new\/} strings when scanning a filename in an +\.{\\input}, \.{\\openin}, or \.{\\openout} operation. These strings are +normally lost because the reference to them are not saved after finishing +the operation. |search_string| searches through the string pool for the given string and returns either 0 or the found string number. @= diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index f5f46801802..1b8ae9945ea 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -679,6 +679,8 @@ LEX YFLAGS YACC KPATHSEA_PATHS_H +UPWEB_FALSE +UPWEB_TRUE PWEB_FALSE PWEB_TRUE WEB_FALSE @@ -19497,6 +19499,20 @@ else fi +if test "x$enable_uptex:$enable_euptex" = xno:no; then : + enable_upweb_progs=no +else + enable_upweb_progs=$enable_web_progs +fi + if test "x$enable_upweb_progs" != xno; then + UPWEB_TRUE= + UPWEB_FALSE='#' +else + UPWEB_TRUE='#' + UPWEB_FALSE= +fi + + if test "x$with_system_kpathsea" = xyes; then if test "x$with_kpathsea_includes" = x; then list="/usr/include /usr/local/include" @@ -23155,6 +23171,10 @@ if test -z "${PWEB_TRUE}" && test -z "${PWEB_FALSE}"; then as_fn_error $? "conditional \"PWEB\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${UPWEB_TRUE}" && test -z "${UPWEB_FALSE}"; then + as_fn_error $? "conditional \"UPWEB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index ce16cc8baee..7fa4163b377 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -201,6 +201,11 @@ AS_IF([test "x$enable_ptex:$enable_eptex" = xno:no], [enable_pweb_progs=$enable_web_progs]) AM_CONDITIONAL([PWEB], [test "x$enable_pweb_progs" != xno]) +AS_IF([test "x$enable_uptex:$enable_euptex" = xno:no], + [enable_upweb_progs=no], + [enable_upweb_progs=$enable_web_progs]) +AM_CONDITIONAL([UPWEB], [test "x$enable_upweb_progs" != xno]) + dnl Although quite unusual, it is possible to build Web2C (TeX & Co) dnl using installed (system) kpathsea headers and library. dnl In that case we need the location of . diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 20740858502..572244bc6bb 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,147 +1,112 @@ +2011-08-18 Peter Breitenlohner -2008. 1. 1: 一応第1版としておこう． - -2008. 1. 2: document の更新．数値積分という sample の追加． - -2008. 1. 3: いつのまにか作業中に etex.ch を書き換えていたので修正． - teTeX3 下でのコンパイルについての補足を追加． - -2008. 1. 4: TeX--XeT 機能を試験的にサポート． - 数式の baseline を揃え方を変える - \mathdisplacementstate を追加 (in pTeX) - -build 80105.11, 21 - o \lastnodetype, \currentiflevel を e-TeX の動作に合わせた． - o 日時表記を 80000+100*月+日+時間/100 の数値に変更． - o ./trip の使い方などを記入． - o \currentiflevel まわりの typo を fix． - o W32TeX と合わせたときの compile 手順（未チェック）を記入 - o upTeX と合わせたときの compile 手順を改稿（compileだけ） - o README.txt から HOWTOINST.txt を分離． - -build 80106.14, 19 - o W32TeX と合わせたときの compile 手順が正しくなかったのを修正． - o document のさらなる整備，resume.tex のコンパイル要件がわからなく - なった - -build 80108.19 - o 「peTeX との一本化」．角藤さんが Windows 用 build を提供してくれる - ことになったので，W32TeX と合わせた build の解説を削除． - o ↑に伴う，ptex-hack-1.diff の削除．余計な ptex-orig.diff の廃止． - -build 80110.20 - o upTeX とのマージ方法に関する部分を修正． - o 浮動小数点演算拡張の部分 fp.diff を WEB change file の形式に変更． - 同時に，減算で ∞ - ∞ の結果が NaN になっていなかったのを修正． - -build 80113.22 - o 浮動小数点演算（以下 fp）でのワーク領域を確保する量の間違いにより， - Segfault する可能性があるバグを修正（実際には平方根の計算などが - 54 桁で行われている場合があったことによるので，そちらの方を修正し - た） - o resume.pdf は発表時としては使わないことにした（スライドを別に作っ - て，そちらを使う予定）．しかしこのファイルがもと． - -build 80120.11, 19 - o fp → integer の変換ミスを修正． - o eptexdefs.lib を作成．それに伴い eptex.src を少々改定 - o upTeX-0.20 に合うように更新． - o license をちゃんと決めた．（「通りすがり2」さん，ありがとうございます） - o doc/ に浮動小数点演算のサンプル tri.tex を追加 - -build 80125.09 - o fp.pdf が壊れていたので修正． - -build 80131.21 - o TeX--XeT での displacement node の取扱いを改良し，和欧文混在時の - 組版結果がちょっと良くなった． - o resume.pdf の更新． - -build 80316.xx - o 生存証明（笑） - o 浮動小数点演算に MPFR library を使用してみた．格納形式が変更され， - 仮数部が10進21桁から2進 78 bit（implicit 79 bit)に． - -注意：上の 80316.xx の路線はもはや継続されていません． - -build 90111.20 - o TeX Live 2008 下でのコンパイルに対応 - o pteTeX3-20080616 (+ upTeX-0.25) 下でのコンパイルに対応 - （ttkさん，角藤さん，ありがとうございます） - o INSTALL.txt の大幅な書き直し． - -build 90218 - o 80131.21 版ぐらいの修正で trip test が異常な結果になっていたこと - への修正（副作用あるかも） - o ドキュメント類の書き直し． - o 小数点以下（大体の時間を表す）はあまり意味がないので今回から省略． - o e-pTeX, e-upTeX 本体の version も起動時に出力するようにした． - どんどん banner が長くなってくる（笑） - -注意：本来はこの 90218 のリリースの予定はなかった．FAM256 パッチの調整に手間 - 取りそうだったので，bugfix だけでも先に出すことにしたのだった． - -build 090220 - o 「FAM256パッチ」を作成，追加． - （このパッチを使用しない場合は 90218 版からの変更はバージョン番号 - の変更のみ） - o 「デビ丸」さんの指摘により，バージョン番号を 6 桁とした． - （デビ丸さん，ありがとうございます） - -build 090223 - o コンパイルスクリプトの変更． - できるだけ upTeX 側のversionが変わっても通るようにした． - -build 090309 - o FreeBSD (on qemu) でも一部開発を行うことに． - o ptexenc による pTeX の修正と，本 e-pTeX による pTeX の修正が全く - かち合わないと勘違いをしていた．これに伴い，ptexenc があることを - 動作要件とすることに． - o e-TeX の条件分岐拡張（\ifcsname ... \endcsname）の部分で - 漢字を考慮していなかった動作だったのを修正． - o texmfmem.h, ptexenc まわりの再検討．これにより，-funsigned-char や - 「case 12」が不要になり，eplatex.fmt 作成時に segfault するバグも - 潰せたと思う． - -build 090927 - o FAM256 patch を標準で有効に．このため，有効時にバージョンの末尾に - ついていた「FAM256-PATCHED」はもはやつかない． - o 黒木さんなどから「e-TeX ベースにした方が良いのでは」という意見を - いただいたので，そのようにしてみた． - o コンパイルのベースとなる環境がたくさんあるので，とりあえず - 今回は ptetex3-20090610 と ptexlive-20090904 のみ作業してみた． - o I forgot to include copy of BSD license ^^; - o Implementation of floating-point arithmetic is deleted due to - its half-hearted implementation. - (Someday I want to re-implement floating-point arithmetic in TeX, - but not inside e-pTeX) - o Several files rewrite in English. - -build 091003 - o Fixed several typos. (Thanks to Mr. Debimaru) - o In eptexdoc.tex, graphicx and color packages don't use anymore. - (now correctly displayed in xdvi) - -build 100131 - o languages.def was added in the archive. - o Support upTeX-0.29. - (In upTeX-0.29, pTeX is updated to 3.1.11.) - -build 100201 - o Bug fix: typo in script/install - (euptex.fmt and euplatex.fmt ware generated in compatible mode) - -build 100420 - o Based on ptexlive for TeX Live 2009. - o Change installation method. - o fam256.ch: fixed typo in error message. - -build 101231 - o Based on TeX Live 2010. - o \pdfstrcmp primitive (of pdfTeX) is now supported. - (Thanks to Akira Kakuto) - -build 110102 - o Fixed typo in scripts/unpack.sh. - o \pdfstrcmp compares Kanji characters by their UTF-8 encoded strings. - o re-included otfstable.zip and utfsrc.zip. + Renamed ChangeLog => Changes.txt, ChangeLog.TL => ChangeLog. + * am/eptex.am (EXTRA_DIST): Adapted. + +2011-08-12 Peter Breitenlohner + + * 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 + + * eptex.defines: Add newline at end of file. + +2011-07-04 Peter Breitenlohner + + * am/eptex.am (eptex_ch_srcs): SyncTeX infrastructure. + * pdfsavepos.ch: Slightly reformulate to simplify SyncTeX. + * eptrip/texmf.cnf (main_memory): Increase for SyncTeX. + +2011-04-15 Peter Breitenlohner + + * eptex.ech: Adapted to pTeX Version p3.2. + +2011-04-07 Peter Breitenlohner + + * eptrip/etrip.tex, eptrip/etrip.log, eptrip/eptrip.diffs: + Adapted to e-TeX Version 2.3. + +2011-04-01 Hironori Kitagawa + + * eptex.ech: Yet an other Bug fix. + +2011-03-31 Hironori Kitagawa + + * eptex.ech: Bug fix and TeX formatting. + * pdfsavepos.ch, pdfstrcmp.ch: TeX formatting. + +2011-03-30 Peter Breitenlohner + + * eptex.ech, etex.ch0: Handle disp_node from discretionary. + Set correct last_node_type from main vertical list. + +2011-03-29 Peter Breitenlohner + + * eptex.ech, etex.ch0: Redefine box_dir and box_lr to also work + for min_quarterword<0. + +2011-03-28 Peter Breitenlohner + + * am/eptex.am: Use AM_CFLAGS instead of eptex_CFLAGS. + +2011-03-27 Peter Breitenlohner + + * eptex.ech, etex.ch[01]: Reformulate @, begin_box, and delete_last to fix a bug in + \lastpenalty & Co; further reduce e-pTeX interferences. + +2011-03-25 Peter Breitenlohner + + * eptex.ech, etex.ch[01]: Reformulate begin_box and delete_last + to reduce interferences between e-TeX and pTeX. + + * pdfstrcmp.ch (save_warning_index): Drop unused variable. + +2011-03-22 Peter Breitenlohner + + * eptex.ech, etex.ch0: Reformulate @ to reduce interferences between e-TeX and pTeX. + +2011-03-18 Peter Breitenlohner + + e-pTeX update eptex-110315_tlsvn110318.diff [ptex:00248] + from Hironori Kitagawa . + + * eptex.ech: Update pTeX_version_string. + Redefine box_dir and set_box_dir from pTeX as well as box_lrstat + and set_box_lrstat from e-TeX to avoid interference. + + * pdfsavepos.ch (new): Implement \pdfsavepos primitive. + * am/eptex.am (eptex_ch_srcs): Add pdfsavepos.ch. + + * etex.ch1: Adapt to use of set_box_dir in ../ptexdir/ptex-base.ch. + Adapt to "setting/reading a box register dimension" bug fix. + +2011-01-19 Peter Breitenlohner + + * eptex.ech, etex.ch0: Adapt to modified ../ptexdir/ptex-base.ch. + + * eptex.ech: Make \lastnodetype consistent with e-TeX, based on + code from Hironori Kitagawa . + + * fam256.ch (max_reg_help_line): Use correct max_reg_num value. + +2011-01-17 Peter Breitenlohner + + * eptex.ech: banner_k==banner for e-pTeX. + + * am/eptex.am (eptrip.diffs): Use $(triptrap_diffs). + +2011-01-14 Peter Breitenlohner + + * am/eptex.am (eptrip-clean): Use TRIPTRAP_CLEAN. + +2011-01-13 Peter Breitenlohner + + * eptrip.test (new): Shell script for e-pTRIP test, + from Hironori Kitagawa . + * eptrip.diffs (new): Expected e-pTRIP test results. + + * eptex.ech: Increase pTeX if_*_codes above e-TeX codes. diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL deleted file mode 100644 index 86e7309f0ec..00000000000 --- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL +++ /dev/null @@ -1,110 +0,0 @@ -ChangeLog.TL: TeX Live (TL) changes for e-pTeX -============================================== - -2011-08-12 Peter Breitenlohner - - * 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 - - * eptex.defines: Add newline at end of file. - -2011-07-04 Peter Breitenlohner - - * am/eptex.am (eptex_ch_srcs): SyncTeX infrastructure. - * pdfsavepos.ch: Slightly reformulate to simplify SyncTeX. - * eptrip/texmf.cnf (main_memory): Increase for SyncTeX. - -2011-04-15 Peter Breitenlohner - - * eptex.ech: Adapted to pTeX Version p3.2. - -2011-04-07 Peter Breitenlohner - - * eptrip/etrip.tex, eptrip/etrip.log, eptrip/eptrip.diffs: - Adapted to e-TeX Version 2.3. - -2011-04-01 Hironori Kitagawa - - * eptex.ech: Yet an other Bug fix. - -2011-03-31 Hironori Kitagawa - - * eptex.ech: Bug fix and TeX formatting. - * pdfsavepos.ch, pdfstrcmp.ch: TeX formatting. - -2011-03-30 Peter Breitenlohner - - * eptex.ech, etex.ch0: Handle disp_node from discretionary. - Set correct last_node_type from main vertical list. - -2011-03-29 Peter Breitenlohner - - * eptex.ech, etex.ch0: Redefine box_dir and box_lr to also work - for min_quarterword<0. - -2011-03-28 Peter Breitenlohner - - * am/eptex.am: Use AM_CFLAGS instead of eptex_CFLAGS. - -2011-03-27 Peter Breitenlohner - - * eptex.ech, etex.ch[01]: Reformulate @, begin_box, and delete_last to fix a bug in - \lastpenalty & Co; further reduce e-pTeX interferences. - -2011-03-25 Peter Breitenlohner - - * eptex.ech, etex.ch[01]: Reformulate begin_box and delete_last - to reduce interferences between e-TeX and pTeX. - - * pdfstrcmp.ch (save_warning_index): Drop unused variable. - -2011-03-22 Peter Breitenlohner - - * eptex.ech, etex.ch0: Reformulate @ to reduce interferences between e-TeX and pTeX. - -2011-03-18 Peter Breitenlohner - - e-pTeX update eptex-110315_tlsvn110318.diff [ptex:00248] - from Hironori Kitagawa . - - * eptex.ech: Update pTeX_version_string. - Redefine box_dir and set_box_dir from pTeX as well as box_lrstat - and set_box_lrstat from e-TeX to avoid interference. - - * pdfsavepos.ch (new): Implement \pdfsavepos primitive. - * am/eptex.am (eptex_ch_srcs): Add pdfsavepos.ch. - - * etex.ch1: Adapt to use of set_box_dir in ../ptexdir/ptex-base.ch. - Adapt to "setting/reading a box register dimension" bug fix. - -2011-01-19 Peter Breitenlohner - - * eptex.ech, etex.ch0: Adapt to modified ../ptexdir/ptex-base.ch. - - * eptex.ech: Make \lastnodetype consistent with e-TeX, based on - code from Hironori Kitagawa . - - * fam256.ch (max_reg_help_line): Use correct max_reg_num value. - -2011-01-17 Peter Breitenlohner - - * eptex.ech: banner_k==banner for e-pTeX. - - * am/eptex.am (eptrip.diffs): Use $(triptrap_diffs). - -2011-01-14 Peter Breitenlohner - - * am/eptex.am (eptrip-clean): Use TRIPTRAP_CLEAN. - -2011-01-13 Peter Breitenlohner - - * eptrip.test (new): Shell script for e-pTRIP test, - from Hironori Kitagawa . - * eptrip.diffs (new): Expected e-pTRIP test results. - - * eptex.ech: Increase pTeX if_*_codes above e-TeX codes. diff --git a/Build/source/texk/web2c/eptexdir/Changes.txt b/Build/source/texk/web2c/eptexdir/Changes.txt new file mode 100644 index 00000000000..20740858502 --- /dev/null +++ b/Build/source/texk/web2c/eptexdir/Changes.txt @@ -0,0 +1,147 @@ + +2008. 1. 1: 一応第1版としておこう． + +2008. 1. 2: document の更新．数値積分という sample の追加． + +2008. 1. 3: いつのまにか作業中に etex.ch を書き換えていたので修正． + teTeX3 下でのコンパイルについての補足を追加． + +2008. 1. 4: TeX--XeT 機能を試験的にサポート． + 数式の baseline を揃え方を変える + \mathdisplacementstate を追加 (in pTeX) + +build 80105.11, 21 + o \lastnodetype, \currentiflevel を e-TeX の動作に合わせた． + o 日時表記を 80000+100*月+日+時間/100 の数値に変更． + o ./trip の使い方などを記入． + o \currentiflevel まわりの typo を fix． + o W32TeX と合わせたときの compile 手順（未チェック）を記入 + o upTeX と合わせたときの compile 手順を改稿（compileだけ） + o README.txt から HOWTOINST.txt を分離． + +build 80106.14, 19 + o W32TeX と合わせたときの compile 手順が正しくなかったのを修正． + o document のさらなる整備，resume.tex のコンパイル要件がわからなく + なった + +build 80108.19 + o 「peTeX との一本化」．角藤さんが Windows 用 build を提供してくれる + ことになったので，W32TeX と合わせた build の解説を削除． + o ↑に伴う，ptex-hack-1.diff の削除．余計な ptex-orig.diff の廃止． + +build 80110.20 + o upTeX とのマージ方法に関する部分を修正． + o 浮動小数点演算拡張の部分 fp.diff を WEB change file の形式に変更． + 同時に，減算で ∞ - ∞ の結果が NaN になっていなかったのを修正． + +build 80113.22 + o 浮動小数点演算（以下 fp）でのワーク領域を確保する量の間違いにより， + Segfault する可能性があるバグを修正（実際には平方根の計算などが + 54 桁で行われている場合があったことによるので，そちらの方を修正し + た） + o resume.pdf は発表時としては使わないことにした（スライドを別に作っ + て，そちらを使う予定）．しかしこのファイルがもと． + +build 80120.11, 19 + o fp → integer の変換ミスを修正． + o eptexdefs.lib を作成．それに伴い eptex.src を少々改定 + o upTeX-0.20 に合うように更新． + o license をちゃんと決めた．（「通りすがり2」さん，ありがとうございます） + o doc/ に浮動小数点演算のサンプル tri.tex を追加 + +build 80125.09 + o fp.pdf が壊れていたので修正． + +build 80131.21 + o TeX--XeT での displacement node の取扱いを改良し，和欧文混在時の + 組版結果がちょっと良くなった． + o resume.pdf の更新． + +build 80316.xx + o 生存証明（笑） + o 浮動小数点演算に MPFR library を使用してみた．格納形式が変更され， + 仮数部が10進21桁から2進 78 bit（implicit 79 bit)に． + +注意：上の 80316.xx の路線はもはや継続されていません． + +build 90111.20 + o TeX Live 2008 下でのコンパイルに対応 + o pteTeX3-20080616 (+ upTeX-0.25) 下でのコンパイルに対応 + （ttkさん，角藤さん，ありがとうございます） + o INSTALL.txt の大幅な書き直し． + +build 90218 + o 80131.21 版ぐらいの修正で trip test が異常な結果になっていたこと + への修正（副作用あるかも） + o ドキュメント類の書き直し． + o 小数点以下（大体の時間を表す）はあまり意味がないので今回から省略． + o e-pTeX, e-upTeX 本体の version も起動時に出力するようにした． + どんどん banner が長くなってくる（笑） + +注意：本来はこの 90218 のリリースの予定はなかった．FAM256 パッチの調整に手間 + 取りそうだったので，bugfix だけでも先に出すことにしたのだった． + +build 090220 + o 「FAM256パッチ」を作成，追加． + （このパッチを使用しない場合は 90218 版からの変更はバージョン番号 + の変更のみ） + o 「デビ丸」さんの指摘により，バージョン番号を 6 桁とした． + （デビ丸さん，ありがとうございます） + +build 090223 + o コンパイルスクリプトの変更． + できるだけ upTeX 側のversionが変わっても通るようにした． + +build 090309 + o FreeBSD (on qemu) でも一部開発を行うことに． + o ptexenc による pTeX の修正と，本 e-pTeX による pTeX の修正が全く + かち合わないと勘違いをしていた．これに伴い，ptexenc があることを + 動作要件とすることに． + o e-TeX の条件分岐拡張（\ifcsname ... \endcsname）の部分で + 漢字を考慮していなかった動作だったのを修正． + o texmfmem.h, ptexenc まわりの再検討．これにより，-funsigned-char や + 「case 12」が不要になり，eplatex.fmt 作成時に segfault するバグも + 潰せたと思う． + +build 090927 + o FAM256 patch を標準で有効に．このため，有効時にバージョンの末尾に + ついていた「FAM256-PATCHED」はもはやつかない． + o 黒木さんなどから「e-TeX ベースにした方が良いのでは」という意見を + いただいたので，そのようにしてみた． + o コンパイルのベースとなる環境がたくさんあるので，とりあえず + 今回は ptetex3-20090610 と ptexlive-20090904 のみ作業してみた． + o I forgot to include copy of BSD license ^^; + o Implementation of floating-point arithmetic is deleted due to + its half-hearted implementation. + (Someday I want to re-implement floating-point arithmetic in TeX, + but not inside e-pTeX) + o Several files rewrite in English. + +build 091003 + o Fixed several typos. (Thanks to Mr. Debimaru) + o In eptexdoc.tex, graphicx and color packages don't use anymore. + (now correctly displayed in xdvi) + +build 100131 + o languages.def was added in the archive. + o Support upTeX-0.29. + (In upTeX-0.29, pTeX is updated to 3.1.11.) + +build 100201 + o Bug fix: typo in script/install + (euptex.fmt and euplatex.fmt ware generated in compatible mode) + +build 100420 + o Based on ptexlive for TeX Live 2009. + o Change installation method. + o fam256.ch: fixed typo in error message. + +build 101231 + o Based on TeX Live 2010. + o \pdfstrcmp primitive (of pdfTeX) is now supported. + (Thanks to Akira Kakuto) + +build 110102 + o Fixed typo in scripts/unpack.sh. + o \pdfstrcmp compares Kanji characters by their UTF-8 encoded strings. + o re-included otfstable.zip and utfsrc.zip. diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index da582985d1c..7d16707132b 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -95,7 +95,7 @@ DISTCLEANFILES += $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c \ ## EXTRA_DIST += \ eptexdir/ChangeLog \ - eptexdir/ChangeLog.TL \ + eptexdir/Changes.txt \ eptexdir/README.txt if EPTEX diff --git a/Build/source/texk/web2c/eptexdir/fam256.ch b/Build/source/texk/web2c/eptexdir/fam256.ch index 829ee8113c5..d4db07b3499 100644 --- a/Build/source/texk/web2c/eptexdir/fam256.ch +++ b/Build/source/texk/web2c/eptexdir/fam256.ch @@ -1,5 +1,5 @@ % fam256.ch -% (C) 2009 by Hironori Kitagawa. +% (C) 2009, 2011 by Hironori Kitagawa. % % This patch is derived from om16bit.ch and omfi.ch (both in Omega). % (Omega is copyright by John Plaice and Yannis Haralambous.) diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 5fafa60045e..862cc44a611 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -87,12 +87,10 @@ euptex_ch_srcs = \ 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 @@ -100,12 +98,3 @@ 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.defines b/Build/source/texk/web2c/euptexdir/euptex.defines index 5c76fc01af1..ac1174a2b60 100644 --- a/Build/source/texk/web2c/euptexdir/euptex.defines +++ b/Build/source/texk/web2c/euptexdir/euptex.defines @@ -5,8 +5,6 @@ @define function BYTE4 (); @define function Hi (); @define function Lo (); -@define procedure initdefaultkanji; -@define procedure forcesjisterm (); @define function getencstring; @define function setencstring (); diff --git a/Build/source/texk/web2c/euptexdir/fam256-eup.ch b/Build/source/texk/web2c/euptexdir/fam256-eup.ch deleted file mode 100644 index b69bf067c8c..00000000000 --- a/Build/source/texk/web2c/euptexdir/fam256-eup.ch +++ /dev/null @@ -1,5 +0,0 @@ -@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 deleted file mode 100644 index a650c822694..00000000000 --- a/Build/source/texk/web2c/euptexdir/pdfsavepos-eup.ch +++ /dev/null @@ -1,5 +0,0 @@ -@x -@* \[54] System-dependent changes. -@y -@* \[56] System-dependent changes. -@z diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h index d4c0ca5e4e8..fb25e80f0bf 100644 --- a/Build/source/texk/web2c/help.h +++ b/Build/source/texk/web2c/help.h @@ -10,7 +10,7 @@ thing, the messages have a lot in common, so it's nice to have them in one place.) -Copyright 1995, 1996, 2009 Karl Berry. +Copyright 1995, 1996, 2009, 2011 Karl Berry. Copyright 2008 Taco Hoekwater. Copyright 2001, 2003, 2004 Olaf Weber. @@ -311,37 +311,46 @@ const_string PATGENHELP[] = { #endif /* PATGEN */ #ifdef PBIBTEX +const_string based_prog_name = "BibTeX"; const_string PBIBTEXHELP[] = { -"Usage: pbibtex [option] auxfile", -"", -" -min-crossrefs=INTEGER minimum number of cross-refs required", -" for automatic cite_list inclusion (default 2).", -" -terse do silently.", -" -version print version information and exit.", -" -help print this message and exit.", -" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", -NULL }; + "Usage: pbibtex [OPTION]... AUXFILE[.aux]", + " Write bibliography for entries in AUXFILE to AUXFILE.bbl,", + " along with a log file AUXFILE.blg." + "", + "-kanji={jis|euc|sjis|utf8} kanji code for output-file.", + "-min-crossrefs=NUMBER include item after NUMBER cross-refs; default 2", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-terse do not print progress reports", + "-help display this help and exit", + "-version output version information and exit", + NULL +}; #endif /* PBIBTEX */ #ifdef PDVITYPE +const_string based_prog_name = "DVItype"; const_string PDVITYPEHELP[] = { -"Usage: pdvitype [option] dvifile", -"", -" -dpi=REAL assumed device resolution in pixels per inch", -" (default 300.0).", -" -magnification=INTEGER overrride the postamble's magnification.", -" -max-pages=INTEGER maximum number of pages (default 1000000).", -" -output-level=1..4 verbosity level.", -" 1: terse, 2: medium-level, 3: verbose,", -" 4: plus check for postamble(default).", -" -page-start=PAGE type, e.g., `1.*.-5' to specify the first page", -" with \\count0=1, \\count2=4.", -" (see the TeX book chapter 15).", -" -show-opcodes show opcodes in decimal.", -" -kanji={jis|euc|sjis|utf8} kanji code for output-file.", -" -version print version information and exit.", -" -help print this message and exit.", -NULL }; + "Usage: pdvitype [OPTION]... DVIFILE[.dvi]", + " Verify and translate DVIFILE to human-readable form,", + " written to standard output.", + "", + "-dpi=REAL set resolution to REAL pixels per inch; default 300.0", + "-kanji={jis|euc|sjis|utf8}", + " kanji code for output-file.", + "-magnification=NUMBER override existing magnification with NUMBER", + "-max-pages=NUMBER process NUMBER pages; default one million", + "-output-level=NUMBER verbosity level, from 0 to 4; default 4", + "-page-start=PAGE-SPEC start at PAGE-SPEC, for example `2' or `5.*.-2'", + "-show-opcodes show numeric opcodes (in decimal)", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help display this help and exit", + "-version output version information and exit", + NULL +}; #endif /* PDVITYPE */ #ifdef PKTOGF @@ -394,29 +403,42 @@ const_string POOLTYPEHELP[] = { #endif /* POOLTYPE */ #ifdef PPLTOTF +const_string based_prog_name = "PLtoTF"; const_string PPLTOTFHELP[] = { -"Usage: ppltotf [option] plfile [tfmfile]", -"", -" -verbose output progress reports.", -" -version print version information and exit.", -" -help print this message and exit.", -" -kanji={jis|euc|sjis|utf8}", -" plfile kanji code.", -NULL }; + "Usage: ppltotf [OPTION]... PLFILE[.pl] [TFMFILE[.tfm]]", + " Translate the property list PLFILE to TFMFILE.", + " Default TFMFILE is basename of PLFILE extended with `.tfm'.", + "", + "-kanji={jis|euc|sjis|utf8} plfile kanji code.", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help print this message and exit.", + "-verbose output progress reports.", + "-version print version information and exit.", + NULL +}; #endif /* PPLTOTF */ #ifdef PTFTOPL +const_string based_prog_name = "TFtoPL"; const_string PTFTOPLHELP[] = { -"Usage: ptftopl [option] tfmfile [plfile]", -"", -"-charcode-format=TYPE output character codes according to TYPE,", -" either `octal' or `ascii'; default is ascii.", -"-verbose output progress reports.", -"-version print version information and exit.", -"-help print this message and exit.", -"-kanji={jis|euc|sjis|utf8}", -" plfile kanji code.", -NULL }; + "Usage: ptftopl [OPTION]... TFMNAME[.tfm] [PLFILE[.pl]]", + " Translate the font metrics TFMNAME to human-readable property list file", + " PLFILE or standard output.", + "", + "-charcode-format=TYPE output character codes according to TYPE,", + " either `octal' or `ascii'; default is ascii for", + " letters and digits, octal for all else", + "-kanji={jis|euc|sjis|utf8} plfile kanji code.", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help display this help and exit", + "-verbose display progress reports", + "-version output version information and exit", + NULL +}; #endif /* PTFTOPL */ #if defined (TANGLE) || defined (TANGLEBOOT) @@ -427,7 +449,6 @@ const_string TANGLEHELP[] = { " Pascal output goes to the basename of WEBFILE extended with `.p',", " and a string pool file, if necessary, to the same extended with `.pool'.", "", - "-help display this help and exit", "-length=NUMBER the first NUMBER characters of an identifier have to be", " unique (default 32)", "-loose honor the upper/lower/mixedcase and underline options when", @@ -438,6 +459,7 @@ const_string TANGLEHELP[] = { " identifiers", "-underline do not remove underline characters from indentifiers", "-uppercase make all identifiers uppercase", + "-help display this help and exit", "-version output version information and exit", NULL }; @@ -459,6 +481,91 @@ const_string TFTOPLHELP[] = { }; #endif /* TFTOPL */ +#ifdef UPBIBTEX +const_string based_prog_name = "BibTeX"; +const_string UPBIBTEXHELP[] = { + "Usage: upbibtex [OPTION]... AUXFILE[.aux]", + " Write bibliography for entries in AUXFILE to AUXFILE.bbl,", + " along with a log file AUXFILE.blg." + "", + "-kanji={jis|euc|sjis|utf8|uptex}", + " kanji code for output-file.", + "-min-crossrefs=NUMBER include item after NUMBER cross-refs; default 2", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-terse do not print progress reports", + "-help display this help and exit", + "-version output version information and exit", + NULL +}; +#endif /* UPBIBTEX */ + +#ifdef UPDVITYPE +const_string based_prog_name = "DVItype"; +const_string UPDVITYPEHELP[] = { + "Usage: updvitype [OPTION]... DVIFILE[.dvi]", + " Verify and translate DVIFILE to human-readable form,", + " written to standard output.", + "", + "-dpi=REAL set resolution to REAL pixels per inch; default 300.0", + "-kanji={jis|euc|sjis|utf8|uptex}", + " kanji code for output-file.", + "-magnification=NUMBER override existing magnification with NUMBER", + "-max-pages=NUMBER process NUMBER pages; default one million", + "-output-level=NUMBER verbosity level, from 0 to 4; default 4", + "-page-start=PAGE-SPEC start at PAGE-SPEC, for example `2' or `5.*.-2'", + "-show-opcodes show numeric opcodes (in decimal)", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help display this help and exit", + "-version output version information and exit", + NULL +}; +#endif /* UPDVITYPE */ + +#ifdef UPPLTOTF +const_string based_prog_name = "PLtoTF"; +const_string UPPLTOTFHELP[] = { + "Usage: uppltotf [OPTION]... PLFILE[.pl] [TFMFILE[.tfm]]", + " Translate the property list PLFILE to TFMFILE.", + " Default TFMFILE is basename of PLFILE extended with `.tfm'.", + "", + "-kanji={jis|euc|sjis|utf8|uptex}", + " plfile kanji code.", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help print this message and exit.", + "-verbose output progress reports.", + "-version print version information and exit.", + NULL +}; +#endif /* UPPLTOTF */ + +#ifdef UPTFTOPL +const_string based_prog_name = "TFtoPL"; +const_string UPTFTOPLHELP[] = { + "Usage: uptftopl [OPTION]... TFMNAME[.tfm] [PLFILE[.pl]]", + " Translate the font metrics TFMNAME to human-readable property list file", + " PLFILE or standard output.", + "", + "-charcode-format=TYPE output character codes according to TYPE,", + " either `octal' or `ascii'; default is ascii for", + " letters and digits, octal for all else", + "-kanji={jis|euc|sjis|utf8|uptex}", + " plfile kanji code.", +#if defined(WIN32) + "-sjis-terminal always output to stdout and stderr by CP932", +#endif + "-help display this help and exit", + "-verbose display progress reports", + "-version output version information and exit", + NULL +}; +#endif /* UPTFTOPL */ + #ifdef VFTOVP const_string VFTOVPHELP[] = { "Usage: vftovp [OPTION]... VFNAME[.vf] [TFMNAME[.tfm] [VPLFILE[.vpl]]]", diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index c24f6863a20..685024368ee 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,7 @@ +2011-08-18 Peter Breitenlohner + + * texmfmp.c: Options for (e-)pTeX and (e-)upTeX. + 2011-08-12 Peter Breitenlohner * texmfmp.c: Add upTeX and e-upTeX. diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 1e100e18043..e4e625e8eca 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -639,6 +639,11 @@ maininit (int ac, string *av) synctexoption = SYNCTEX_NO_OPTION; #endif +#if IS_pTeX + kpse_set_program_name (argv[0], NULL); + initdefaultkanji (); +#endif + /* If the user says --help or --version, we need to notice early. And since we want the --ini option, have to do it before getting into the web (which would read the base file, etc.). */ @@ -651,7 +656,12 @@ maininit (int ac, string *av) /* Do this early so we can inspect kpse_invocation_name and kpse_program_name below, and because we have to do this before any path searching. */ +#if IS_pTeX + if (user_progname) + kpse_reset_program_name (user_progname); +#else kpse_set_program_name (argv[0], user_progname); +#endif /* FIXME: gather engine names in a single spot. */ xputenv ("engine", TEXMFENGINENAME); @@ -1383,14 +1393,19 @@ static struct option long_options[] { "default-translate-file", 1, 0, 0 }, { "8bit", 0, &eightbitp, 1 }, #if defined(XeTeX) - { "no-pdf", 0, &nopdfoutput, 1 }, - { "output-driver", 1, 0, 0 }, - { "papersize", 1, 0, 0 }, + { "no-pdf", 0, &nopdfoutput, 1 }, + { "output-driver", 1, 0, 0 }, + { "papersize", 1, 0, 0 }, #endif /* XeTeX */ { "mktex", 1, 0, 0 }, { "no-mktex", 1, 0, 0 }, #endif /* TeX or MF */ #if IS_pTeX +#ifdef WIN32 + { "sjis-terminal", 0, &sjisterminal, 1 }, + { "guess-input-enc", 0, &infile_enc_auto, 1 }, + { "no-guess-input-enc", 0, &infile_enc_auto, 0 }, +#endif { "kanji", 1, 0, 0 }, #endif #if IS_upTeX @@ -1551,7 +1566,7 @@ parse_options (int argc, string *argv) #if IS_upTeX } else if (ARGUMENT_IS ("kanji-internal")) { if (!set_enc_string (NULL, optarg)) { - WARNING1 ("Ignoring unknown argument `%s' to --kanji-internal",optarg); + WARNING1 ("Ignoring unknown argument `%s' to --kanji-internal", optarg); } #endif diff --git a/Build/source/texk/web2c/luatexdir/tex/stringpool.w b/Build/source/texk/web2c/luatexdir/tex/stringpool.w index 330ad02dee9..29dc6be9132 100644 --- a/Build/source/texk/web2c/luatexdir/tex/stringpool.w +++ b/Build/source/texk/web2c/luatexdir/tex/stringpool.w @@ -334,11 +334,11 @@ boolean get_strings_started(void) return true; } -@ The string recycling routines. \TeX{} uses 2 - upto 4 {\it new\/} strings when scanning a filename in an \.{\\input}, - \.{\\openin}, or \.{\\openout} operation. These strings are normally - lost because the reference to them are not saved after finishing the - operation. |search_string| searches through the string pool for the +@ The string recycling routines. + \TeX{} uses 2 upto 4 {\it new\/} strings when scanning a filename in an + \.{\\input}, \.{\\openin}, or \.{\\openout} operation. These strings are + normally lost because the reference to them are not saved after finishing + the operation. |search_string| searches through the string pool for the given string and returns either 0 or the found string number. @c diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index fc5bdf9cfcd..2ac952686ad 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,20 @@ +2011-08-18 Peter Breitenlohner + + * pbibtex.ch, pdvitype.ch, ppltotf.ch, ptftopl.ch: Add WIN32 + option "sjis-terminal" and init_default_kanji(). + * ptex.defines: Add sjisterminal and initdefaultkanji. + * kanji.[ch]: Add support for WIN32 option "sjis-terminal". + (check_kanji): Change return type boolean => int (for -1, 0, +1). + (initdefaultkanji): New function from W32TeX kanjiextra.c. + * am/ptex.am (*_LDADD): Use libkanji.a for all binaries. + +2011-08-18 Peter Breitenlohner + + pTeX update tlsvn23478-uptex-1108111825 [ptex:00267] + from Hironori Kitagawa + + * ptex-base.ch: Merged with ptex-20110723-nullfont.ch (bug fix). + 2011-08-12 Peter Breitenlohner * ptex-base.ch: Slightly reformulate to simplify e-upTeX. diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am index 51c38bdf5f2..e9f3c835936 100644 --- a/Build/source/texk/web2c/ptexdir/am/ptex.am +++ b/Build/source/texk/web2c/ptexdir/am/ptex.am @@ -4,7 +4,7 @@ ## You may freely use, modify and/or distribute this file. ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD) +ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE) pweb_programs = pbibtex pdvitype ppltotf ptftopl @@ -50,7 +50,7 @@ EXTRA_PROGRAMS += ptex $(pweb_programs) ptex_CPPFLAGS = $(ptex_cppflags) # With --enable-ipc, pTeX may need to link with -lsocket. -ptex_LDADD = libkanji.a $(ptex_ldadd) $(ipc_socketlibs) +ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) # pTeX C sources ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h diff --git a/Build/source/texk/web2c/ptexdir/kanji.c b/Build/source/texk/web2c/ptexdir/kanji.c index c4d1d3d7a5b..5852be396e1 100644 --- a/Build/source/texk/web2c/ptexdir/kanji.c +++ b/Build/source/texk/web2c/ptexdir/kanji.c @@ -5,8 +5,11 @@ #include "kanji.h" -/* FIXME: why not boolean value */ -boolean check_kanji(integer c) +#if !defined(WIN32) +int sjisterminal; +#endif + +int check_kanji(integer c) { /* FIXME: why not 255 (0xff) */ if (0 <= c && c <= 256) return -1; /* ascii without catcode */ @@ -77,3 +80,8 @@ integer kcatcodekey(integer c) { return Hi(toDVI(c)); } + +void initdefaultkanji (void) +{ + enable_UPTEX (false); /* disable */ +} diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h index 421a524b56d..67a3d18f05b 100644 --- a/Build/source/texk/web2c/ptexdir/kanji.h +++ b/Build/source/texk/web2c/ptexdir/kanji.h @@ -13,11 +13,15 @@ #define KANJI +#if !defined(WIN32) +extern int sjisterminal; +#endif + /* functions */ #define Hi(x) (((x) >> 8) & 0xff) #define Lo(x) ((x) & 0xff) -extern boolean check_kanji (integer c); +extern int check_kanji (integer c); #define checkkanji check_kanji extern boolean is_kanji (integer c); #define iskanji is_kanji @@ -29,6 +33,7 @@ extern boolean ismultiprn (integer c); extern integer calc_pos (integer c); #define calcpos calc_pos extern integer kcatcodekey (integer c); +extern void initdefaultkanji (void); #ifndef PRESERVE_PUTC #undef putc diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch index ee2cd84682f..fd55579304b 100644 --- a/Build/source/texk/web2c/ptexdir/pbibtex.ch +++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch @@ -35,7 +35,7 @@ @y \def\titlepage{F} \centerline{\:\titlefont The {\:\ttitlefont J\BibTeX} preprocessor} - \vskip 15pt \centerline{(Version 0.32 base on C Version \BibTeX 0.99d---\today)} \vfill} + \vskip 15pt \centerline{(Version 0.33 based on C Version \BibTeX 0.99d---\today)} \vfill} @z %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -226,6 +226,13 @@ begin @ @z +@x +parse_arguments; +@y +init_default_kanji; +parse_arguments; +@z + @x Changes for JBibTeX by Shouichi Matsui [332] @!b_write : hash_loc; {\.{write\$}} @!b_default : hash_loc; {either \.{skip\$} or \.{default.type}} @@ -514,7 +521,7 @@ var @!long_options: array[0..n_options] of getopt_struct; begin @; @y -const n_options = 5; {Pascal won't count array lengths for us.} +const n_options = 6; {Pascal won't count array lengths for us.} var @!long_options: array[0..n_options] of getopt_struct; @!getopt_return_val: integer; @!option_index: c_int_type; @@ -578,6 +585,16 @@ long_options[current_option].flag := 0; long_options[current_option].val := 0; incr (current_option); +@ Shift-JIS terminal (the flag is ignored except for WIN32). +@.-sjis-terminal@> + +@ = +long_options[current_option].name := 'sjis-terminal'; +long_options[current_option].has_arg := 0; +long_options[current_option].flag := address_of (sjis_terminal); +long_options[current_option].val := 1; +incr (current_option); + @ Kanji option. @.-kanji@> diff --git a/Build/source/texk/web2c/ptexdir/pdvitype.ch b/Build/source/texk/web2c/ptexdir/pdvitype.ch index 02b245a63b4..143377709a6 100644 --- a/Build/source/texk/web2c/ptexdir/pdvitype.ch +++ b/Build/source/texk/web2c/ptexdir/pdvitype.ch @@ -9,6 +9,13 @@ {printed when the program starts} @z +@x + parse_arguments; +@y + init_default_kanji; + parse_arguments; +@z + @x for i:=@'177 to 255 do xchr[i]:='?'; @y @@ -478,7 +485,7 @@ if (m<>id_byte) and (m<>ptex_id_byte) then @x const n_options = 8; {Pascal won't count array lengths for us.} @y -const n_options = 9; {Pascal won't count array lengths for us.} +const n_options = 10; {Pascal won't count array lengths for us.} @z @x @@ -515,6 +522,16 @@ const n_options = 9; {Pascal won't count array lengths for us.} @x @ An element with all zeros always ends the list. @y +@ Shift-JIS terminal (the flag is ignored except for WIN32). +@.-sjis-terminal@> + +@ = +long_options[current_option].name := 'sjis-terminal'; +long_options[current_option].has_arg := 0; +long_options[current_option].flag := address_of (sjis_terminal); +long_options[current_option].val := 1; +incr (current_option); + @ Decide kanji encode @.-kanji@> diff --git a/Build/source/texk/web2c/ptexdir/ppltotf.ch b/Build/source/texk/web2c/ptexdir/ppltotf.ch index bdba99662ba..b9903aa265e 100644 --- a/Build/source/texk/web2c/ptexdir/ppltotf.ch +++ b/Build/source/texk/web2c/ptexdir/ppltotf.ch @@ -17,6 +17,13 @@ {printed when the program starts} @z +@x + parse_arguments; +@y + init_default_kanji; + parse_arguments; +@z + @x [6] l.140 - pTeX: print_ln (version_string); @y @@ -346,7 +353,7 @@ end; @x const n_options = 3; {Pascal won't count array lengths for us.} @y -const n_options = 4; {Pascal won't count array lengths for us.} +const n_options = 5; {Pascal won't count array lengths for us.} @z @x var @!long_options: array[0..n_options] of getopt_struct; @@ -392,7 +399,18 @@ begin @x @ An element with all zeros always ends the list. @y -@ kanji option. +@ Shift-JIS terminal (the flag is ignored except for WIN32). +@.-sjis-terminal@> + +@ = +long_options[current_option].name := 'sjis-terminal'; +long_options[current_option].has_arg := 0; +long_options[current_option].flag := address_of (sjis_terminal); +long_options[current_option].val := 1; +incr (current_option); + +@ Kanji option. +@.-kanji@> @ = long_options[current_option].name := 'kanji'; diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index 010ca831e5a..74325111e22 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -46,6 +46,7 @@ % (31/12/2010) AK Bug fix and accent Kanji by Hironori Kitagawa. % (19/01/2011) PB Let \lastkern etc act through disp node. % (15/04/2011) PB pTeX p3.2 Add \ifdbox and \ifddir +% (2011-08-18) PB Bug fix by Hironori Kitagawa. % @x [1.2] l.200 - pTeX: @d banner==TeX_banner @@ -5848,6 +5849,9 @@ function get_jfm_pos(@!kcode:KANJI_code;@!f:internal_font_number):eight_bits; var @!jc:KANJI_code; {temporary register for KANJI} @!sp,@!mp,@!ep:pointer; begin@/ +if f=null_font then + begin get_jfm_pos:=kchar_type(null_font)(0); return; + end; jc:=toDVI(kcode); sp:=1; { start position } ep:=font_num_ext[f]-1; { end position } @@ -6677,11 +6681,13 @@ main_i:=orig_char_info(main_f)(qi(0)); goto main_loop_j+3; @# main_loop_j+1: space_factor:=1000; - 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); - link(tail):=main_p; tail:=main_p; - cx:=cur_chr; @; + if main_f<>null_font then + begin 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); + link(tail):=main_p; tail:=main_p; + cx:=cur_chr; @; + end; ins_kp:=false; again_2: get_next; @@ -6717,7 +6723,10 @@ again_2: @# main_loop_j+3: if ins_kp=true then @; - @; + if main_f<>null_font then + begin @; + end + else inhibit_glue_flag:=false; if ins_kp=false then begin { Kanji -> Kanji } goto main_loop_j+1; end else if ins_kp=true then begin { Kanji -> Ascii } diff --git a/Build/source/texk/web2c/ptexdir/ptex.defines b/Build/source/texk/web2c/ptexdir/ptex.defines index e4b30cbb72d..a591012d1c2 100644 --- a/Build/source/texk/web2c/ptexdir/ptex.defines +++ b/Build/source/texk/web2c/ptexdir/ptex.defines @@ -27,3 +27,7 @@ @define function ismultiprn (); @define function calcpos (); @define function kcatcodekey (); + +@define procedure initdefaultkanji; + +@define var sjisterminal; diff --git a/Build/source/texk/web2c/ptexdir/ptftopl.ch b/Build/source/texk/web2c/ptexdir/ptftopl.ch index 6b384b8602b..4583d08a736 100644 --- a/Build/source/texk/web2c/ptexdir/ptftopl.ch +++ b/Build/source/texk/web2c/ptexdir/ptftopl.ch @@ -29,6 +29,13 @@ var @!k:integer; {all-purpose initiallization index} tfm_file_array := cast_to_byte_pointer (xmalloc (1003+4)); @z +@x + parse_arguments; +@y + init_default_kanji; + parse_arguments; +@z + @x [7] l.149 - pTeX: print_ln (version_string); @y @@ -343,7 +350,7 @@ else @x const n_options = 4; {Pascal won't count array lengths for us.} @y -const n_options = 5; {Pascal won't count array lengths for us.} +const n_options = 6; {Pascal won't count array lengths for us.} @z @x var @!long_options: array[0..n_options] of getopt_struct; @@ -390,7 +397,18 @@ begin @x @ An element with all zeros always ends the list. @y -@ kanji option +@ Shift-JIS terminal (the flag is ignored except for WIN32). +@.-sjis-terminal@> + +@ = +long_options[current_option].name := 'sjis-terminal'; +long_options[current_option].has_arg := 0; +long_options[current_option].flag := address_of (sjis_terminal); +long_options[current_option].val := 1; +incr (current_option); + +@ Kanji option. +@.-kanji@> @ = long_options[current_option].name := 'kanji'; diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch index 861d89818a6..665e751bf51 100644 --- a/Build/source/texk/web2c/tex.ch +++ b/Build/source/texk/web2c/tex.ch @@ -4585,11 +4585,11 @@ else begin end; -@* \[54/web2c-string] The string recycling routines. \TeX{} uses 2 -upto 4 {\it new\/} strings when scanning a filename in an \.{\\input}, -\.{\\openin}, or \.{\\openout} operation. These strings are normally -lost because the reference to them are not saved after finishing the -operation. |search_string| searches through the string pool for the +@* \[54/web2c-string] The string recycling routines. +\TeX{} uses 2 upto 4 {\it new\/} strings when scanning a filename in an +\.{\\input}, \.{\\openin}, or \.{\\openout} operation. These strings are +normally lost because the reference to them are not saved after finishing +the operation. |search_string| searches through the string pool for the given string and returns either 0 or the found string number. @= diff --git a/Build/source/texk/web2c/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h index 4afbe8b9b87..59d18e14a7d 100644 --- a/Build/source/texk/web2c/texmfmp-help.h +++ b/Build/source/texk/web2c/texmfmp-help.h @@ -75,6 +75,7 @@ const_string ALEPHHELP[] = { #endif /* Aleph */ #ifdef epTeX +const_string based_prog_name = "e-TeX"; const_string EPTEXHELP[] = { "Usage: eptex [OPTION]... [TEXNAME[.tex]] [COMMANDS]", " or: eptex [OPTION]... \\FIRST-LINE", @@ -96,7 +97,7 @@ const_string EPTEXHELP[] = { "", "-etex enable e-TeX extensions", "-fmt=NAME use NAME instead of program name or %&format.", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "[-no]-guess-input-enc disable/enable to guess input file encoding", #endif "-halt-on-error stop processing at the first error", @@ -122,7 +123,7 @@ const_string EPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "-sjis-terminal always output to stdout and stderr by CP932", #endif "-src-specials insert source specials into the DVI file", @@ -201,6 +202,7 @@ const_string ETEXHELP[] = { #endif /* eTeX */ #ifdef eupTeX +const_string based_prog_name = "e-TeX"; const_string EUPTEXHELP[] = { "Usage: euptex [OPTION]... [TEXNAME[.tex]] [COMMANDS]", " or: euptex [OPTION]... \\FIRST-LINE", @@ -222,7 +224,7 @@ const_string EUPTEXHELP[] = { "", "-etex enable e-TeX extensions", "-fmt=NAME use NAME instead of program name or %&format.", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "[-no]-guess-input-enc disable/enable to guess input file encoding", #endif "-halt-on-error stop processing at the first error", @@ -249,7 +251,7 @@ const_string EUPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "-sjis-terminal always output to stdout and stderr by CP932", #endif "-src-specials insert source specials into the DVI file", @@ -376,6 +378,7 @@ const_string PDFTEXHELP[] = { #endif /* pdfTeX */ #ifdef pTeX +const_string based_prog_name = "TeX"; const_string PTEXHELP[] = { "Usage: ptex [OPTION]... [TEXNAME[.tex]] [COMMANDS]", " or: ptex [OPTION]... \\FIRST-LINE", @@ -396,7 +399,7 @@ const_string PTEXHELP[] = { " If no arguments or options are specified, prompt for input.", "", "-fmt=NAME use NAME instead of program name or %&format.", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "[-no]-guess-input-enc disable/enable to guess input file encoding", #endif "-halt-on-error stop processing at the first error", @@ -422,7 +425,7 @@ const_string PTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "-sjis-terminal always output to stdout and stderr by CP932", #endif "-src-specials insert source specials into the DVI file", @@ -500,6 +503,7 @@ const_string TEXHELP[] = { #endif /* onlyTeX */ #ifdef upTeX +const_string based_prog_name = "TeX"; const_string UPTEXHELP[] = { "Usage: uptex [OPTION]... [TEXNAME[.tex]] [COMMANDS]", " or: uptex [OPTION]... \\FIRST-LINE", @@ -520,7 +524,7 @@ const_string UPTEXHELP[] = { " If no arguments or options are specified, prompt for input.", "", "-fmt=NAME use NAME instead of program name or %&format.", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "[-no]-guess-input-enc disable/enable to guess input file encoding", #endif "-halt-on-error stop processing at the first error", @@ -547,7 +551,7 @@ const_string UPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) && !defined(__MINGW32__) +#if defined(WIN32) "-sjis-terminal always output to stdout and stderr by CP932", #endif "-src-specials insert source specials into the DVI file", diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am index b231964f896..58c2f479b05 100644 --- a/Build/source/texk/web2c/uptexdir/am/uptex.am +++ b/Build/source/texk/web2c/uptexdir/am/uptex.am @@ -4,6 +4,10 @@ ## You may freely use, modify and/or distribute this file. uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) +uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) +up_tangle = WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE) + +upweb_programs = updvitype ## libukanji.a for upTeX and e-upTeX ## @@ -16,12 +20,15 @@ libukanji_a_CPPFLAGS = $(uptex_cppflags) if UPTEX bin_PROGRAMS += uptex endif UPTEX -EXTRA_PROGRAMS += uptex +if UPWEB +bin_PROGRAMS += $(upweb_programs) +endif UPWEB +EXTRA_PROGRAMS += uptex $(upweb_programs) 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_LDADD = $(uptex_ldadd) $(ipc_socketlibs) # upTeX C sources uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h @@ -79,8 +86,19 @@ 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 +## upDVItype +## +nodist_updvitype_SOURCES = updvitype.c updvitype.h +updvitype_SOURCES = uptexdir/kanji.h +updvitype_CPPFLAGS = $(uptex_cppflags) -DDHEX_CHAR_CODE +updvitype_LDADD = $(uptex_ldadd) +updvitype.c updvitype.h: updvitype-web2c + $(web2c) updvitype +updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines + $(web2c) updvitype +updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch + $(up_tangle) updvitype updvitype +updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch + $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch +EXTRA_DIST += ptexdir/pdvitype.ch uptexdir/updvitype.ch diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index 5e46647ef06..b6dd47edd55 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.c +++ b/Build/source/texk/web2c/uptexdir/kanji.c @@ -11,6 +11,10 @@ #define KCAT_KANJI 16 #define KCAT_HANGUL 19 +#if !defined(WIN32) +int sjisterminal; +#endif + /* m: for debug */ integer check_kanji (integer c,integer m) { @@ -362,3 +366,8 @@ integer multilenbuffchar(integer c) 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 */ + +void initdefaultkanji (void) +{ + enable_UPTEX (true); /* enable */ +} diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h index a1b5328041c..630fb5ccdde 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.h +++ b/Build/source/texk/web2c/uptexdir/kanji.h @@ -13,6 +13,10 @@ #define KANJI +#if !defined(WIN32) +extern int sjisterminal; +#endif + /* functions */ #define XXHi(x) BYTE1(x) #define XHi(x) BYTE2(x) @@ -32,6 +36,8 @@ extern integer calc_pos (integer c); #define calcpos calc_pos extern integer kcatcodekey (integer c); extern integer multilenbuffchar (integer c); +extern void initdefaultkanji (void); + #define setptexencuptex() set_enc_string("utf8", "uptex"); /* number of rest of multi-char for kcode_pos */ diff --git a/Build/source/texk/web2c/uptexdir/updvitype.ch b/Build/source/texk/web2c/uptexdir/updvitype.ch new file mode 100644 index 00000000000..84f56f1d2d9 --- /dev/null +++ b/Build/source/texk/web2c/uptexdir/updvitype.ch @@ -0,0 +1,40 @@ +@x +@d banner=='This is PDVItype, Version 3.6-p0.4' +@y +@d banner=='This is upDVItype, Version 3.6-p0.4-u0.28' +@z + +@x procedure out_kanji + if text_ptr>=line_length-3 then flush_text; + c:=toBUFF(fromDVI(c)); + incr(text_ptr); text_buf[text_ptr]:= Hi(c); + incr(text_ptr); text_buf[text_ptr]:= Lo(c); +@y + if text_ptr>=line_length-5 then flush_text; + c:=toBUFF(fromDVI(c)); + if BYTE1(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE1(c); end; + if BYTE2(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE2(c); end; + if BYTE3(c)<>0 then begin incr(text_ptr); text_buf[text_ptr]:=BYTE3(c); end; + incr(text_ptr); text_buf[text_ptr]:=BYTE4(c); +@z + +@x + usage ('pdvitype'); +@y + usage ('updvitype'); +@z + +@x + usage_help (PDVITYPE_HELP, nil); +@y + usage_help (UPDVITYPE_HELP, nil); +@z + +@x + write_ln (stderr, 'pdvitype: Need exactly one file argument.'); + usage ('pdvitype'); +@y + write_ln (stderr, 'updvitype: Need exactly one file argument.'); + usage ('updvitype'); +@z + diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch index b9f1b76911b..677385b5247 100644 --- a/Build/source/texk/web2c/uptexdir/uptex-m.ch +++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch @@ -955,7 +955,7 @@ 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}} +@d kchar_def_code=char_sub_def_code+1 {|shorthand_def| for \.{\\kchardef}} @= primitive("chardef",shorthand_def,char_def_code);@/ @@ -1121,13 +1121,13 @@ begin if is_char_node(link(p)) then @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); + begin 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; + begin 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 diff --git a/Build/source/texk/web2c/uptexdir/uptex.defines b/Build/source/texk/web2c/uptexdir/uptex.defines index e477f082092..d32c67bca64 100644 --- a/Build/source/texk/web2c/uptexdir/uptex.defines +++ b/Build/source/texk/web2c/uptexdir/uptex.defines @@ -5,8 +5,6 @@ @define function BYTE4 (); @define function Hi (); @define function Lo (); -@define procedure initdefaultkanji; -@define procedure forcesjisterm (); @define function getencstring; @define function setencstring (); @@ -43,6 +41,6 @@ @define function multilenbuffchar (); @define function nrestmultichr (); -@define const PTEXTFTOPLHELP; -@define const PTEXPLTOTFHELP; -@define const UPDVITYPEHELP; +@define procedure initdefaultkanji; + +@define var sjisterminal; diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index d0cd756b8f8..2d531b4d011 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -1,3 +1,9 @@ +2011-08-17 Peter Breitenlohner + + * common.defines: Remove ETEXHELP, LUATEXHELP, PDFTEXHELP. + Add UPBIBTEXHELP, UPDVITYPEHELP, UPPLTOTFHELP, and UPTFTOPLHELP. + * convert: Add upBibTeX, upDVItype, upPLtoTF, and upTFtoPL. + 2011-08-12 Peter Breitenlohner * convert, splitup.c: Add upTeX and e-upTeX. diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines index 453d6cce7aa..8462b9f3242 100644 --- a/Build/source/texk/web2c/web2c/common.defines +++ b/Build/source/texk/web2c/web2c/common.defines @@ -65,11 +65,9 @@ @define const DVICOPYHELP; @define const DVITOMPHELP; @define const DVITYPEHELP; -@define const ETEXHELP; @define const GFTODVIHELP; @define const GFTOPKHELP; @define const GFTYPEHELP; -@define const LUATEXHELP; @define const MFTHELP; @define const ODVICOPYHELP; @define const ODVITYPEHELP; @@ -81,7 +79,6 @@ @define const PATGENHELP; @define const PBIBTEXHELP; @define const PDVITYPEHELP; -@define const PDFTEXHELP; @define const PKTOGFHELP; @define const PKTYPEHELP; @define const PLTOTFHELP; @@ -90,6 +87,10 @@ @define const PTFTOPLHELP; @define const TANGLEHELP; @define const TFTOPLHELP; +@define const UPBIBTEXHELP; +@define const UPDVITYPEHELP; +@define const UPPLTOTFHELP; +@define const UPTFTOPLHELP; @define const VFTOVPHELP; @define const VPTOVFHELP; @define const WEAVEHELP; diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert index 61adae5d8a1..4e3c2cdfd68 100755 --- a/Build/source/texk/web2c/web2c/convert +++ b/Build/source/texk/web2c/web2c/convert @@ -53,10 +53,14 @@ case $basefile in more_defines="$srcdir/ptexdir/ptex.defines" hfile=ptexdir/kanji.h ;; + upbibtex|updvitype|uppltotf|uptftopl) + more_defines="$srcdir/uptexdir/uptex.defines" + hfile=uptexdir/kanji.h + ;; esac case $basefile in - bibtex|pbibtex) + bibtex|pbibtex|upbibtex) midcmd="| sed -f $srcdir/web2c/cvtbib.sed" ;; @@ -113,7 +117,7 @@ if test ! -s $cfile || grep @error@ $output_files >/dev/null; then fi case $basefile in - bibtex|pbibtex) + bibtex|pbibtex|upbibtex) sed -e 's/(buftype)//g' -e 's/(pdstype)//g' <$basefile.h >x$basefile.h mv x$basefile.h $basefile.h ;; diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h index ed7a2c78d5b..ce1ca7867a5 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXFontInst.h @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp index b2e3687fc8c..05891879e44 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXFontMgr_FC.cpp @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.cpp b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.cpp index 97ebe19804e..3194bda18ce 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.cpp +++ b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.cpp @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h index 725c5b6d9d1..f7ac66c5f8a 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h +++ b/Build/source/texk/web2c/xetexdir/XeTeXOTLayoutEngine.h @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c index 7631b2ded9f..cf7a6f672fd 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.c +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.c @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h index c4b9d4c7a4d..fd8f066a94f 100644 --- a/Build/source/texk/web2c/xetexdir/XeTeX_ext.h +++ b/Build/source/texk/web2c/xetexdir/XeTeX_ext.h @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/pdfimage.cpp b/Build/source/texk/web2c/xetexdir/pdfimage.cpp index 126d62ae2ca..911e2d31434 100644 --- a/Build/source/texk/web2c/xetexdir/pdfimage.cpp +++ b/Build/source/texk/web2c/xetexdir/pdfimage.cpp @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew diff --git a/Build/source/texk/web2c/xetexdir/xetex-latex3.ch b/Build/source/texk/web2c/xetexdir/xetex-latex3.ch index 9f123985dba..44ee0d2d3b1 100644 --- a/Build/source/texk/web2c/xetexdir/xetex-latex3.ch +++ b/Build/source/texk/web2c/xetexdir/xetex-latex3.ch @@ -1,7 +1,7 @@ /****************************************************************************\ Part of the XeTeX typesetting system copyright (c) 1994-2008 by SIL International - copyright (c) 2009 by Jonathan Kew + copyright (c) 2009, 2011 by Jonathan Kew Written by Jonathan Kew -- cgit v1.2.3