From 2fa3ace8e2fef6e8c7c4336917808b63a1ccca21 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Thu, 5 Jan 2012 06:47:30 +0000 Subject: enable -kanji option in pdvitype and updvitype: patch from TANAKA Takuji-san. git-svn-id: svn://tug.org/texlive/trunk@25028 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/ptexdir/kanji.h | 2 ++ Build/source/texk/web2c/ptexdir/pdvitype.ch | 8 ++++++++ Build/source/texk/web2c/uptexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/uptexdir/kanji.h | 3 ++- 5 files changed, 22 insertions(+), 1 deletion(-) (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 3eb1be48e42..8357f03a578 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-01-05 Akira Kakuto + + * kanji.h, pdvitype.ch: enable -kanji option in pdvitype. + (patch from TANAKA Takuji-san). + 2011-12-19 Hironori Kitagawa * ptex-base.ch, ptex.defines, kanji.[ch]: Avoid Segmentation diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h index 1be8729cf3c..c46b712d240 100644 --- a/Build/source/texk/web2c/ptexdir/kanji.h +++ b/Build/source/texk/web2c/ptexdir/kanji.h @@ -37,6 +37,8 @@ extern void init_default_kanji (const_string file_str, const_string internal_str #define initdefaultkanji() init_default_kanji(NULL, "euc") /* for pBibTeX, pDVItype, pPLtoTF, and pTFtoPL */ #define initkanji() init_default_kanji(NULL, "euc") +/* for pDVItype */ +#define setpriorfileenc() set_prior_file_enc() #ifndef PRESERVE_PUTC #undef putc diff --git a/Build/source/texk/web2c/ptexdir/pdvitype.ch b/Build/source/texk/web2c/ptexdir/pdvitype.ch index 7a30e85d560..4eadb69caf9 100644 --- a/Build/source/texk/web2c/ptexdir/pdvitype.ch +++ b/Build/source/texk/web2c/ptexdir/pdvitype.ch @@ -143,6 +143,13 @@ for k:=1 to nt do end; @z +@x + print_ln(']'); +@y + print(']'); + print_ln(''); +@z + @x @p procedure out_text(c:ASCII_code); begin if text_ptr=line_length-2 then flush_text; @@ -504,6 +511,7 @@ const n_options = 10; {Pascal won't count array lengths for us.} end; {Else it was a flag; |getopt| has already done the assignment.} @y end else if argument_is ('kanji') then begin + set_prior_file_enc; if (not set_enc_string(optarg,optarg)) then begin write_ln('Bad kanji encoding "', stringcast(optarg), '".'); end; diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index b8cbfe38918..68ccfe6e72c 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-01-05 Akira Kakuto + + * kanji.h: enable -kanji option in updvitype. + (patch from TANAKA Takuji-san). + 2011-12-19 Peter Breitenlohner * uptex-m.ch, kanji.[ch]: Drop unused param2 of check_kanji(). diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h index a6e92c40760..0109f772e9d 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.h +++ b/Build/source/texk/web2c/uptexdir/kanji.h @@ -35,12 +35,13 @@ 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 */ #define initkanji() init_default_kanji("utf8", "uptex") +/* for upDVItype */ +#define setpriorfileenc() set_prior_file_enc() /* number of rest of multi-char for kcode_pos */ #define nrestmultichr(x) ( (x)!=0 ? ((x) / 8) + 2 - ((x) % 8) : -1 ) -- cgit v1.2.3