From 76a605a66cfd96f0d1c566e2ba67c3ca6c5edcad Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 18 Sep 2012 17:40:18 +0000 Subject: upTeX: Adapt to W32TeX (from Akira) git-svn-id: svn://tug.org/texlive/trunk@27704 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/uptexdir/ChangeLog | 6 ++++++ Build/source/texk/web2c/uptexdir/kanji.c | 4 ++-- Build/source/texk/web2c/uptexdir/kanji.h | 6 ++---- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 74e4bdead61..b45d968dcad 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,9 @@ +2012-08-22 Peter Breitenlohner + + * kanji.c (init_default_kanji): Set defaults before testing + PTEX_KANJI_ENC from the environment. + * kanji.c: All programs use init_default_kanji("utf8","uptex"). + 2012-08-13 TANAKA Takuji * uptex-m.ch, upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch, diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index bf1e358a1a6..86d80226832 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.c +++ b/Build/source/texk/web2c/uptexdir/kanji.c @@ -388,6 +388,8 @@ void init_default_kanji (const_string file_str, const_string internal_str) enable_UPTEX (true); /* enable */ + init_kanji (file_str, internal_str); + p = getenv ("PTEX_KANJI_ENC"); if (p) { if (!set_enc_string (p, NULL)) @@ -402,6 +404,4 @@ void init_default_kanji (const_string file_str, const_string internal_str) free(p); } #endif - - init_kanji (file_str, internal_str); } diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h index fd9f3c20d1e..a27b22f3c4b 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.h +++ b/Build/source/texk/web2c/uptexdir/kanji.h @@ -35,11 +35,8 @@ extern integer calc_pos (integer c); extern integer kcatcodekey (integer c); extern integer multilenbuffchar (integer c); -extern void init_kanji (const_string file_str, const_string internal_str); extern void init_default_kanji (const_string file_str, const_string internal_str); -/* for upTeX and e-upTeX */ -#define initdefaultkanji() init_default_kanji("utf8", "uptex") -/* for upBibTeX, upDVItype, upPLtoTF, and upTFtoPL */ +/* for upTeX, e-upTeX, upBibTeX, upDVItype, upPLtoTF, and upTFtoPL */ #define initkanji() init_default_kanji("utf8", "uptex") /* for upDVItype */ #define setpriorfileenc() set_prior_file_enc() @@ -58,6 +55,7 @@ extern void init_default_kanji (const_string file_str, const_string internal_str #define inputline2(fp,buff,pos,size) input_line2(fp,buff,pos,size,NULL) #endif +extern void init_kanji (const_string file_str, const_string internal_str); extern void dump_kanji (FILE *fp); extern void undump_kanji (FILE *fp); #define dumpkanji dump_kanji -- cgit v1.2.3