From 2fc1dd710458fb21fbb1178acb79c92198e77a15 Mon Sep 17 00:00:00 2001 From: TANAKA Takuji Date: Sat, 17 Dec 2022 14:37:13 +0900 Subject: [PATCH] (u)ptex-{euc,sjis}: test for Japanese filename (#136) --- source/texk/web2c/Makefile.in | 4 ++-- source/texk/web2c/ptexdir/am/ptex.am | 2 +- source/texk/web2c/ptexdir/pfname.test | 22 +++++++++++++++++++ source/texk/web2c/ptexdir/tests/fn.tex | 14 ++++++++++++ source/texk/web2c/ptexdir/tests/fn.txt | 1 + ...n\343\201\225\343\201\226\346\263\242.tex" | 13 +++++++++++ source/texk/web2c/uptexdir/am/uptex.am | 2 +- source/texk/web2c/uptexdir/pfname.test | 22 +++++++++++++++++++ 8 files changed, 76 insertions(+), 4 deletions(-) create mode 100755 source/texk/web2c/ptexdir/pfname.test create mode 100644 source/texk/web2c/ptexdir/tests/fn.tex create mode 100644 source/texk/web2c/ptexdir/tests/fn.txt create mode 100644 "source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" create mode 100755 source/texk/web2c/uptexdir/pfname.test diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index 8bae51c86..b437e2795 100644 --- a/source/texk/web2c/Makefile.in +++ b/source/texk/web2c/Makefile.in @@ -4499,7 +4499,7 @@ ptex_ch_srcs = \ # pTeX Tests # -ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test +ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/pfname.test eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \ $(ZLIB_INCLUDES) $(am__append_144) @@ -4602,7 +4602,7 @@ uptftopl_LDADD = $(uptex_ldadd) uptftopl_DEPENDENCIES = $(uptex_dependencies) # upTeX Tests -uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test +uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/pfname.test # uppPLtoTF/upTFtoPL upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ uptexdir/uppltotf.test uptexdir/uptftopl.test \ diff --git a/source/texk/web2c/ptexdir/am/ptex.am b/source/texk/web2c/ptexdir/am/ptex.am index 9f030a00f..93bc39996 100644 --- a/source/texk/web2c/ptexdir/am/ptex.am +++ b/source/texk/web2c/ptexdir/am/ptex.am @@ -171,7 +171,7 @@ EXTRA_DIST += \ # pTeX Tests # -ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test +ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/pfname.test ptexdir/ptriptest.log: ptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) ptexdir/pver.log: ptex$(EXEEXT) #pweb_tests = \ diff --git a/source/texk/web2c/ptexdir/pfname.test b/source/texk/web2c/ptexdir/pfname.test new file mode 100755 index 000000000..a9998d597 --- /dev/null +++ b/source/texk/web2c/ptexdir/pfname.test @@ -0,0 +1,22 @@ +#! /bin/sh -vx +# +# Copyright 2022 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +test -d ptests || mkdir -p ptests +rm -f fn*.* + +rc=0 + +TEXMFCNF=$srcdir/../kpathsea +TEXINPUTS=$srcdir/ptexdir/tests:. +export TEXMFCNF TEXINPUTS + +for enc in euc sjis; do +for doc in fn fnさざ波; do + ./ptex -ini -interaction nonstopmode -kanji=utf8 --kanji-internal=$enc $doc.tex >ptests/$doc-$enc-term.log || $rc=1 + diff $doc.txt $srcdir/ptexdir/tests/fn.txt || $rc=2 +done +done + +exit $rc diff --git a/source/texk/web2c/ptexdir/tests/fn.tex b/source/texk/web2c/ptexdir/tests/fn.tex new file mode 100644 index 000000000..13db96f5c --- /dev/null +++ b/source/texk/web2c/ptexdir/tests/fn.tex @@ -0,0 +1,14 @@ +% fn.tex +% UTF-8 encoding +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fn.tex} + +\immediate\openout0=\jobname.txt +\immediate\write0{abc αβγ абв あア※￥ 天地人} +\immediate\closeout0 + +\input fnさざ波.tex + +\relax\end diff --git a/source/texk/web2c/ptexdir/tests/fn.txt b/source/texk/web2c/ptexdir/tests/fn.txt new file mode 100644 index 000000000..12357a2e6 --- /dev/null +++ b/source/texk/web2c/ptexdir/tests/fn.txt @@ -0,0 +1 @@ +abc αβγ абв あア※￥ 天地人 diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" new file mode 100644 index 000000000..c6bda6aa9 --- /dev/null +++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" @@ -0,0 +1,13 @@ +% fnさざ波.tex +% UTF-8 encoding +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fnさざ波.tex} + +\immediate\openout0=\jobname.txt +\immediate\write0{abc αβγ абв あア※￥ 天地人} +\immediate\closeout0 + +\relax\end + diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am index b3f1f8f38..1900848cf 100644 --- a/source/texk/web2c/uptexdir/am/uptex.am +++ b/source/texk/web2c/uptexdir/am/uptex.am @@ -165,7 +165,7 @@ EXTRA_DIST += \ uptexdir/ChangeLog # upTeX Tests -uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test +uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/pfname.test uptexdir/uptriptest.log: uptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT) uptexdir/upver.log uptexdir/upkcat.log: uptex$(EXEEXT) upweb_tests = \ diff --git a/source/texk/web2c/uptexdir/pfname.test b/source/texk/web2c/uptexdir/pfname.test new file mode 100755 index 000000000..69552ae24 --- /dev/null +++ b/source/texk/web2c/uptexdir/pfname.test @@ -0,0 +1,22 @@ +#! /bin/sh -vx +# +# Copyright 2022 Japanese TeX Development Community +# You may freely use, modify and/or distribute this file. + +test -d uptests || mkdir -p uptests +rm -f fn*.* + +rc=0 + +TEXMFCNF=$srcdir/../kpathsea +TEXINPUTS=$srcdir/ptexdir/tests:. +export TEXMFCNF TEXINPUTS + +for enc in euc sjis uptex; do +for doc in fn fnさざ波; do + ./uptex -ini -interaction nonstopmode -kanji=utf8 --kanji-internal=$enc $doc.tex >uptests/$doc-$enc-term.log || $rc=1 + diff $doc.txt $srcdir/ptexdir/tests/fn.txt || $rc=2 +done +done + +exit $rc