From e8c5e48f98b3d80faa21f5bf0f1c60c220b3d9cf Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sat, 9 Jun 2018 11:10:16 +0000 Subject: pTeX: Support UTF-8 file names on UTF-8 locale (Unix-like platform only) git-svn-id: svn://tug.org/texlive/trunk@47967 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ptexenc/ChangeLog | 8 ++ Build/source/texk/ptexenc/ptexenc.c | 134 ++++++++++++++++++++++++++++ Build/source/texk/ptexenc/ptexenc/ptexenc.h | 3 + Build/source/texk/web2c/lib/ChangeLog | 5 ++ Build/source/texk/web2c/lib/openclose.c | 66 +++++++++++--- Build/source/texk/web2c/lib/texmfmp.c | 5 +- 6 files changed, 210 insertions(+), 11 deletions(-) diff --git a/Build/source/texk/ptexenc/ChangeLog b/Build/source/texk/ptexenc/ChangeLog index 26bb9d1fe52..cefcc2db516 100644 --- a/Build/source/texk/ptexenc/ChangeLog +++ b/Build/source/texk/ptexenc/ChangeLog @@ -1,3 +1,11 @@ +2018-06-09 TANAKA Takuji + + * ptexenc.c, ptexenc/ptexenc.h: Add new functions + ptenc_from_utf8_string_to_internal_enc(), + ptenc_from_internal_enc_string_to_utf8() and + ptenc_get_command_line_args() to support UTF-8 file names + on UTF-8 locale in pTeX (Unix-like platform only). + 2018-03-26 Akira Kakuto * ptexenc.c: Change default_kanji_enc from ENC_SJIS to ENC_UTF8 diff --git a/Build/source/texk/ptexenc/ptexenc.c b/Build/source/texk/ptexenc/ptexenc.c index 602b7f86698..aa5b9bbc867 100644 --- a/Build/source/texk/ptexenc/ptexenc.c +++ b/Build/source/texk/ptexenc/ptexenc.c @@ -935,4 +935,138 @@ int nkf_close(FILE *fp) { } return fclose(fp); } + + +unsigned char *ptenc_from_utf8_string_to_internal_enc(const unsigned char *is) +{ + int i; + long u = 0, j, len; + int i1 = EOF, i2 = EOF, i3 = EOF, i4 = EOF; + unsigned char *buf, *buf_bak; + long first_bak, last_bak; + + if (terminal_enc != ENC_UTF8 || is_internalUPTEX()) return NULL; + buf_bak = buffer; + first_bak = first; + last_bak = last; + + len = strlen(is)+1; + buffer = buf = xmalloc(len); + first = last = 0; + + for (i=0; i=len) buffer = xrealloc(buffer, len=last+64); + write_hex(i1); + if (i2 != '\0') write_hex(i2); + if (i3 != '\0') write_hex(i3); + if (i4 != '\0') write_hex(i4); + } else { + write_multibyte(j); + } + i2 = i3 = i4 = '\0'; + } + buffer[last] = '\0'; + end: + buffer = buf_bak; + first = first_bak; + last = last_bak; + return buf; +} + +unsigned char *ptenc_from_internal_enc_string_to_utf8(const unsigned char *is) +{ + int i; + long u = 0, len; + int i1 = EOF, i2 = EOF; + unsigned char *buf, *buf_bak; + long first_bak, last_bak; + + if (terminal_enc != ENC_UTF8 || is_internalUPTEX()) return NULL; + buf_bak = buffer; + first_bak = first; + last_bak = last; + + len = strlen(is)+1; + buffer = buf = xmalloc(len*1.5); + first = last = 0; + + for (i=0; i + + * texmfmp.c, openclose.c: Support UTF-8 file names + on UTF-8 locale in pTeX (Unix-like platform only). + 2018-05-29 Akira Kakuto * texmfmp.c: Discard the changes for pdfTeX on 2018-05-11, diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index 57c4db9aae7..f39c3758d2c 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -150,6 +150,9 @@ boolean open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) { string fname = NULL; +#if defined(PTEX) && !defined(WIN32) + string fname0; +#endif #ifdef FUNNY_CORE_DUMP /* This only applies if a preloaded TeX/Metafont is being made; it allows automatic creation of the core dump (typing ^\ loses @@ -170,6 +173,17 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) absolute. This is because .aux and other such files will get written to the output directory, and we have to be able to read them from there. We only look for the name as-is. */ + +#if defined(PTEX) && !defined(WIN32) + fname0 = ptenc_from_internal_enc_string_to_utf8(nameoffile + 1); + if (fname0) { + free (nameoffile); + namelength = strlen (fname0); + nameoffile = xmalloc (namelength + 2); + strcpy (nameoffile + 1, fname0); + free (fname0); + } +#endif if (output_directory && !kpse_absolute_p (nameoffile+1, false)) { fname = concat3 (output_directory, DIR_SEP_STRING, nameoffile + 1); *f_ptr = fopen (fname, fopen_mode); @@ -183,6 +197,13 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) } #endif if (*f_ptr) { +#if defined(PTEX) && !defined(WIN32) + fname0 = ptenc_from_utf8_string_to_internal_enc(fname); + if (fname0) { + free (fname); + fname = fname0; + } +#endif free (nameoffile); namelength = strlen (fname); nameoffile = xmalloc (namelength + 2); @@ -205,7 +226,8 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) which we set `tex_input_type' to 0 in the change file. */ /* According to the pdfTeX people, pounding the disk for .vf files is overkill as well. A more general solution would be nice. */ - boolean must_exist = (filefmt != kpse_tex_format || texinputtype) + boolean must_exist; + must_exist = (filefmt != kpse_tex_format || texinputtype) && (filefmt != kpse_vf_format); fname = kpse_find_file (nameoffile + 1, (kpse_file_format_type)filefmt, @@ -229,21 +251,28 @@ open_input (FILE **f_ptr, int filefmt, const_string fopen_mode) fname[i] = 0; } - /* kpse_find_file always returns a new string. */ - free (nameoffile); - namelength = strlen (fname); - nameoffile = xmalloc (namelength + 2); - strcpy (nameoffile + 1, fname); - free (fname); - /* This fopen is not allowed to fail. */ #if defined(PTEX) && !defined(WIN32) if (filefmt == kpse_tex_format || filefmt == kpse_bib_format) { - *f_ptr = nkf_open (nameoffile + 1, fopen_mode); + *f_ptr = nkf_open (fname, fopen_mode); } else #endif - *f_ptr = xfopen (nameoffile + 1, fopen_mode); + *f_ptr = xfopen (fname, fopen_mode); + + /* kpse_find_file always returns a new string. */ +#if defined(PTEX) && !defined(WIN32) + fname0 = ptenc_from_utf8_string_to_internal_enc(fname); + if (fname0) { + free (fname); + fname = fname0; + } +#endif + free (nameoffile); + namelength = strlen (fname); + nameoffile = xmalloc (namelength + 2); + strcpy (nameoffile + 1, fname); + free (fname); } } } @@ -281,6 +310,9 @@ boolean open_output (FILE **f_ptr, const_string fopen_mode) { string fname; +#if defined(PTEX) && !defined(WIN32) + string fname0; +#endif boolean absolute = kpse_absolute_p(nameoffile+1, false); /* If we have an explicit output directory, use it. */ @@ -289,6 +321,13 @@ open_output (FILE **f_ptr, const_string fopen_mode) } else { fname = nameoffile + 1; } +#if defined(PTEX) && !defined(WIN32) + fname0 = ptenc_from_internal_enc_string_to_utf8(fname); + if (fname0) { + free(fname); + fname = fname0; + } +#endif /* Is the filename openable as given? */ *f_ptr = fopen (fname, fopen_mode); @@ -307,6 +346,13 @@ open_output (FILE **f_ptr, const_string fopen_mode) /* If this succeeded, change nameoffile accordingly. */ if (*f_ptr) { if (fname != nameoffile + 1) { +#if defined(PTEX) && !defined(WIN32) + fname0 = ptenc_from_utf8_string_to_internal_enc(fname); + if (fname0) { + free(fname); + fname = fname0; + } +#endif free (nameoffile); namelength = strlen (fname); nameoffile = xmalloc (namelength + 2); diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 319c2f664f3..3b5b81a3593 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -710,11 +710,14 @@ maininit (int ac, string *av) enc = kpse_var_value("command_line_encoding"); get_command_line_args_utf8(enc, &argc, &argv); #endif +#if IS_pTeX && !IS_upTeX && !defined(WIN32) + ptenc_get_command_line_args(&argc, &argv); +#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.). */ -#if (IS_upTeX || defined(XeTeX)) && defined(WIN32) +#if ((IS_upTeX || defined(XeTeX)) && defined(WIN32)) || (IS_pTeX && !IS_upTeX && !defined(WIN32)) parse_options (argc, argv); #else parse_options (ac, av); -- cgit v1.2.3