diff options
Diffstat (limited to 'Build/source')
22 files changed, 57 insertions, 148 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog index 1c53a4431ef..42b3f1f0e47 100644 --- a/Build/source/texk/mendexk/ChangeLog +++ b/Build/source/texk/mendexk/ChangeLog @@ -1,3 +1,7 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * main.c: remove sjisterminal (w32 only). + 2018-05-15 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * README, main.c, configure.ac, configure: diff --git a/Build/source/texk/mendexk/main.c b/Build/source/texk/mendexk/main.c index 520f541e7f5..0e207840712 100644 --- a/Build/source/texk/mendexk/main.c +++ b/Build/source/texk/mendexk/main.c @@ -31,7 +31,6 @@ int main(int argc, char **argv) #ifdef WIN32 _setmaxstdio(2048); - sjisterminal = 0; #endif set_enc_string(NULL, "uptex"); kpse_set_program_name(argv[0], "mendex"); @@ -167,12 +166,6 @@ int main(int argc, char **argv) set_enc_string("SJIS", NULL); break; -#ifdef WIN32 - case 'T': - sjisterminal = 1; - break; -#endif - case 'U': set_enc_string("UTF8", NULL); break; diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog index cefcc2db516..6d6b10f3c71 100644 --- a/Build/source/texk/ptexenc/ChangeLog +++ b/Build/source/texk/ptexenc/ChangeLog @@ -1,3 +1,7 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * ptexenc.c, ptexenc/ptexenc.h: remove sjisterminal (w32 only). + 2018-06-09 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * ptexenc.c, ptexenc/ptexenc.h: Add new functions diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c index aa5b9bbc867..43696693227 100644 --- a/Build/source/texk/ptexenc/ptexenc.c +++ b/Build/source/texk/ptexenc/ptexenc.c @@ -39,7 +39,6 @@ static boolean prior_file_enc = false; const char *ptexenc_version_string = PTEXENCVERSION; #if defined(WIN32) -int sjisterminal; FILE *Poptr; int infile_enc_auto; #else @@ -419,44 +418,38 @@ static long toENC(long kcode, int enc) static int put_multibyte(long c, FILE *fp) { #ifdef WIN32 - if (sjisterminal) { - const int fd = fileno(fp); + const int fd = fileno(fp); + + if ((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)) { + HANDLE hStdout; + DWORD ret, wclen; + UINT cp; + wchar_t buff[2]; + char str[4]; + int mblen; + + if (fd == fileno(stdout)) + hStdout = GetStdHandle(STD_OUTPUT_HANDLE); + else + hStdout = GetStdHandle(STD_ERROR_HANDLE); + + mblen=0; + if (BYTE1(c) != 0) str[mblen++]=BYTE1(c); + if (BYTE2(c) != 0) str[mblen++]=BYTE2(c); + if (BYTE3(c) != 0) str[mblen++]=BYTE3(c); + /* always */ str[mblen++]=BYTE4(c); - if ((fd == fileno(stdout) || fd == fileno(stderr)) && _isatty(fd)) { - HANDLE hStdout; - DWORD ret, wclen; - UINT cp; - wchar_t buff[2]; - char str[4]; - int mblen; - - if (fd == fileno(stdout)) - hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - else - hStdout = GetStdHandle(STD_ERROR_HANDLE); - - mblen=0; - if (BYTE1(c) != 0) str[mblen++]=BYTE1(c); - if (BYTE2(c) != 0) str[mblen++]=BYTE2(c); - if (BYTE3(c) != 0) str[mblen++]=BYTE3(c); - /* always */ str[mblen++]=BYTE4(c); - -#define CP_932 932 #define CP_UTF8 65001 - if (is_internalUPTEX()) - cp = CP_UTF8; - else - cp = CP_932; - if (MultiByteToWideChar(cp, 0, str, mblen, buff, 2) == 0) - return EOF; + cp = CP_UTF8; + if (MultiByteToWideChar(cp, 0, str, mblen, buff, 2) == 0) + return EOF; - wclen = mblen > 3 ? 2 : 1; - if (WriteConsoleW(hStdout, buff, wclen, &ret, NULL) == 0) - return EOF; + wclen = mblen > 3 ? 2 : 1; + if (WriteConsoleW(hStdout, buff, wclen, &ret, NULL) == 0) + return EOF; - return BYTE4(c); - } + return BYTE4(c); } #endif @@ -491,20 +484,15 @@ int putc2(int c, FILE *fp) #ifdef WIN32 if ((fp == stdout || fp == stderr) && (_isatty(fd) || !prior_file_enc)) { - if (sjisterminal) { - if (is_internalUPTEX()) - output_enc = ENC_UTF8; - else - output_enc = ENC_SJIS; - } else + output_enc = ENC_UTF8; + } else + output_enc = get_file_enc(); #else if ((fp == stdout || fp == stderr) && !prior_file_enc) { -#endif - output_enc = get_terminal_enc(); } else output_enc = get_file_enc(); - +#endif if (num[fd] > 0) { /* multi-byte char */ if (is_internalUPTEX() && iskanji1(c)) { /* error */ ret = flush(store[fd], num[fd], fp); diff --git a/Build/source/texk/ptexenc/ptexenc/ptexenc.h b/Build/source/texk/ptexenc/ptexenc/ptexenc.h index 175fdd4297b..2417c5e6150 100644 --- a/Build/source/texk/ptexenc/ptexenc/ptexenc.h +++ b/Build/source/texk/ptexenc/ptexenc/ptexenc.h @@ -23,7 +23,6 @@ extern PTENCDLL const char *ptexenc_version_string; #if defined(WIN32) -extern PTENCDLL int sjisterminal; extern PTENCDLL FILE *Poptr; extern PTENCDLL int infile_enc_auto; #endif diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 7257598d089..ffe820cae22 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * help.h, texmfmp-help.h: remove sjisterminal (w32 only). + 2018-06-08 Karl Berry <karl@freefriends.org> * bibtex.ch (142): also try opening subsidiary .aux files diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h index 3c0d670b2fa..ffde71c0b49 100644 --- a/Build/source/texk/web2c/help.h +++ b/Build/source/texk/web2c/help.h @@ -333,9 +333,6 @@ const_string PBIBTEXHELP[] = { "", "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)", "-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", @@ -357,9 +354,6 @@ const_string PDVITYPEHELP[] = { "-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 @@ -423,9 +417,6 @@ const_string PPLTOTFHELP[] = { " Default TFMFILE is basename of PLFILE extended with `.tfm'.", "", "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)", -#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.", @@ -444,9 +435,6 @@ const_string PTFTOPLHELP[] = { " either `octal' or `ascii'; default is ascii for", " letters and digits, octal for all else", "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)", -#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", @@ -504,9 +492,6 @@ const_string UPBIBTEXHELP[] = { "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)", "-kanji-internal=STRING set Japanese internal encoding (STRING=euc|uptex)", "-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", @@ -528,9 +513,6 @@ const_string UPDVITYPEHELP[] = { "-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 @@ -545,9 +527,6 @@ const_string UPPLTOTFHELP[] = { " Default TFMFILE is basename of PLFILE extended with `.tfm'.", "", "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)", -#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.", @@ -566,9 +545,6 @@ const_string UPTFTOPLHELP[] = { " either `octal' or `ascii'; default is ascii for", " letters and digits, octal for all else", "-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)", -#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", diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index e0949c96cf7..4a88e860839 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,7 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * texmfmp.c: remove sjisterminal (w32 only). + 2018-06-10 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * texmfmp.c: Allow non-ascii file names for pdfTeX diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 4f0da681dc4..f6c98b5bb27 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -1663,7 +1663,6 @@ static struct option long_options[] #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 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index a754ccc6f24..177ff13bbe5 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * pbibtex.ch, pdvitype.ch, ppltotf.ch, ptftopl.ch, + kanji.h, kanji.c, ptex.defines: remove sjisterminal (w32 only). + 2018-05-06 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp> * kanji.c: More strict check kanji token. diff --git a/Build/source/texk/web2c/ptexdir/kanji.c b/Build/source/texk/web2c/ptexdir/kanji.c index 5cd9ebabe02..4fd39d2f293 100644 --- a/Build/source/texk/web2c/ptexdir/kanji.c +++ b/Build/source/texk/web2c/ptexdir/kanji.c @@ -6,10 +6,6 @@ #include "kanji.h" #define CS_TOKEN_FLAG 0xFFFF -#if !defined(WIN32) -int sjisterminal; -#endif - /* TOKEN */ boolean check_kanji(integer c) { diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h index 75482fe4cca..8b156130d9e 100644 --- a/Build/source/texk/web2c/ptexdir/kanji.h +++ b/Build/source/texk/web2c/ptexdir/kanji.h @@ -24,10 +24,6 @@ #endif #define notkanjicharseq not_kanji_char_seq -#if !defined(WIN32) -extern int sjisterminal; -#endif - /* functions */ #define Hi(x) (((x) >> 8) & 0xff) #define Lo(x) ((x) & 0xff) diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch index 4eb053c19b6..7911b7f0064 100644 --- a/Build/source/texk/web2c/ptexdir/pbibtex.ch +++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch @@ -550,16 +550,6 @@ 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@> - -@<Define the option...@> = -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 8ce48c12d6b..45ca5a9acd0 100644 --- a/Build/source/texk/web2c/ptexdir/pdvitype.ch +++ b/Build/source/texk/web2c/ptexdir/pdvitype.ch @@ -511,16 +511,6 @@ const n_options = 10; {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@> - -@<Define the option...@> = -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 edb61d7efa2..f02f46b66b0 100644 --- a/Build/source/texk/web2c/ptexdir/ppltotf.ch +++ b/Build/source/texk/web2c/ptexdir/ppltotf.ch @@ -345,16 +345,6 @@ const n_options = 5; {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@> - -@<Define the option...@> = -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/ptex.defines b/Build/source/texk/web2c/ptexdir/ptex.defines index 5cffc9cbe0e..12caba8bfcd 100644 --- a/Build/source/texk/web2c/ptexdir/ptex.defines +++ b/Build/source/texk/web2c/ptexdir/ptex.defines @@ -29,5 +29,3 @@ @define function kcatcodekey (); @define procedure initkanji; - -@define var sjisterminal; diff --git a/Build/source/texk/web2c/ptexdir/ptftopl.ch b/Build/source/texk/web2c/ptexdir/ptftopl.ch index 0aeb371f5a5..d8d1a9789d5 100644 --- a/Build/source/texk/web2c/ptexdir/ptftopl.ch +++ b/Build/source/texk/web2c/ptexdir/ptftopl.ch @@ -379,16 +379,6 @@ const n_options = 6; {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@> - -@<Define the option...@> = -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/texmfmp-help.h b/Build/source/texk/web2c/texmfmp-help.h index 2127aaabba8..f8358656c19 100644 --- a/Build/source/texk/web2c/texmfmp-help.h +++ b/Build/source/texk/web2c/texmfmp-help.h @@ -124,9 +124,6 @@ const_string EPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) - "-sjis-terminal always output to stdout and stderr by CP932", -#endif "-src-specials insert source specials into the DVI file", "-src-specials=WHERE insert source specials in certain places of", " the DVI file. WHERE is a comma-separated value", @@ -254,9 +251,6 @@ const_string EUPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) - "-sjis-terminal always output to stdout and stderr by CP932", -#endif "-src-specials insert source specials into the DVI file", "-src-specials=WHERE insert source specials in certain places of", " the DVI file. WHERE is a comma-separated value", @@ -523,9 +517,6 @@ const_string PTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) - "-sjis-terminal always output to stdout and stderr by CP932", -#endif "-src-specials insert source specials into the DVI file", "-src-specials=WHERE insert source specials in certain places of", " the DVI file. WHERE is a comma-separated value", @@ -651,9 +642,6 @@ const_string UPTEXHELP[] = { "-recorder enable filename recorder", "[-no]-shell-escape disable/enable \\write18{SHELL COMMAND}", "-shell-restricted enable restricted \\write18", -#if defined(WIN32) - "-sjis-terminal always output to stdout and stderr by CP932", -#endif "-src-specials insert source specials into the DVI file", "-src-specials=WHERE insert source specials in certain places of", " the DVI file. WHERE is a comma-separated value", diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 707d3ab6c83..339264961d2 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2018-06-14 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * ksnji.h, kanji.c, uptex.defines: + remove sjisterminal (w32 only). + 2018-02-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp> * uptex-m.ch, kanji.c: diff --git a/Build/source/texk/web2c/uptexdir/kanji.c b/Build/source/texk/web2c/uptexdir/kanji.c index dcb202089c7..a96f7b9bbae 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.c +++ b/Build/source/texk/web2c/uptexdir/kanji.c @@ -11,10 +11,6 @@ #define KCAT_KANJI 16 #define KCAT_HANGUL 19 -#if !defined(WIN32) -int sjisterminal; -#endif - /* TOKEN */ boolean check_kanji (integer c) { diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h index a00f41d9eff..2de3bd16682 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.h +++ b/Build/source/texk/web2c/uptexdir/kanji.h @@ -19,10 +19,6 @@ #define not_kanji_char_seq(a,b) (1) #define notkanjicharseq not_kanji_char_seq -#if !defined(WIN32) -extern int sjisterminal; -#endif - /* functions */ #define XXHi(x) BYTE1(x) #define XHi(x) BYTE2(x) diff --git a/Build/source/texk/web2c/uptexdir/uptex.defines b/Build/source/texk/web2c/uptexdir/uptex.defines index 11d8db3afdf..9223042f5a5 100644 --- a/Build/source/texk/web2c/uptexdir/uptex.defines +++ b/Build/source/texk/web2c/uptexdir/uptex.defines @@ -45,5 +45,3 @@ @define procedure dumpkanji (); @define procedure initkanji; @define procedure undumpkanji (); - -@define var sjisterminal; |