From b9533c7ad8a2f437eb086e52286ce9fd4b257d50 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Mon, 17 Sep 2018 02:58:07 +0000 Subject: First search for an input file with a suffix .xdv or .dvi in (x)dvipdfmx in branch2018. git-svn-id: svn://tug.org/texlive/branches/branch2018@48683 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 19 ++++++++++++++++++- Build/source/texk/dvipdfm-x/dvi.c | 29 ++++++++++++++++------------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index ed5a32f9a29..94519ddff63 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,20 @@ +2018-05-23 Akira Kakuto + + * dvi.c: First search for an input file with a suffix .xdv + or .dvi. Report from Andreas Scherer: + http://tug.org/pipermail/tex-k/2018-May/002882.html. + +2018-05-16 Akira Kakuto + + * pdfparse.c: Revert. The changes on 2018-05-14 must be + problematic. Again, kanji characters including 0x5c can't be + used as names of image files in (e)-pTeX. + +2018-05-14 Akira Kakuto + + * pdfparse.c: Allow image file names including 0x5c for + (e)-pTeX in CP932-like system (Windows only). + 2018-05-06 Akira Kakuto * tt_cmap.c: Revert a part of changes in 2017-12-09, @@ -5,7 +22,7 @@ http://tug.org/pipermail/tex-live/2018-May/041608.html. * configure.ac: Version 20180506. - 2018-04-28 Stefan Br\"uns +2018-04-28 Stefan Br\"uns * pngimage.c: Fix a bug which causes a segfault with 1/2/4-bit transparent indexed PNGs. diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c index 3d7d94f42ed..c5607bce672 100644 --- a/Build/source/texk/dvipdfm-x/dvi.c +++ b/Build/source/texk/dvipdfm-x/dvi.c @@ -1,6 +1,6 @@ /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks. - Copyright (C) 2002-2017 by Jin-Hwan Cho and Shunsaku Hirata, + Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata, the dvipdfmx project team. Copyright (C) 2012-2015 by Khaled Hosny @@ -1999,21 +1999,24 @@ dvi_init (char *dvi_filename, double mag) else ungetc(ch, dvi_file); } else { - dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE); - if (!dvi_file) { - char *p; - p = strrchr(dvi_filename, '.'); - if (p == NULL || (!FILESTRCASEEQ(p, ".dvi") && - !FILESTRCASEEQ(p, ".xdv"))) { - strcat(dvi_filename, ".xdv"); + char *p, *saved_orig_name; + dvi_file = NULL; + saved_orig_name = xstrdup(dvi_filename); + p = strrchr(dvi_filename, '.'); + if (p == NULL || (!FILESTRCASEEQ(p, ".dvi") && + !FILESTRCASEEQ(p, ".xdv"))) { + strcat(dvi_filename, ".xdv"); + dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE); + if (!dvi_file) { + dvi_filename[strlen(dvi_filename) - 4] = '\0'; + strcat(dvi_filename, ".dvi"); dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE); - if (!dvi_file) { - dvi_filename[strlen(dvi_filename) - 4] = '\0'; - strcat(dvi_filename, ".dvi"); - dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE); - } } } + if (!dvi_file) + dvi_file = MFOPEN(saved_orig_name, FOPEN_RBIN_MODE); + free(saved_orig_name); + if (!dvi_file) { ERROR("Could not open specified DVI (or XDV) file: %s", dvi_filename); -- cgit v1.2.3