diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in index b437e2795..6adb132b6 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 ptexdir/pfname.test +ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/wcfname.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 uptexdir/pfname.test +uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.test # uppPLtoTF/upTFtoPL upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \ uptexdir/uppltotf.test uptexdir/uptftopl.test \ diff --git a/source/texk/web2c/ptexdir/ChangeLog b/source/texk/web2c/ptexdir/ChangeLog index 74e3464d8..0162b9492 100644 --- a/source/texk/web2c/ptexdir/ChangeLog +++ b/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,10 @@ +2022-12-22 TANAKA Takuji + + * wcfname.test, am/ptex.am: + Add tests for file names with JIS X 0208 characters + in `ptex --kanji-internal={euc,sjis}`. + https://github.com/texjporg/tex-jp-build/issues/136 + 2022-12-22 Hironori Kitagawa * ptex-base.ch, ptex.defines, kanji.h, am/ptex.am: diff --git a/source/texk/web2c/ptexdir/am/ptex.am b/source/texk/web2c/ptexdir/am/ptex.am index 93bc39996..27ddcbd89 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 ptexdir/pfname.test +ptex_tests = ptexdir/ptriptest.test ptexdir/pver.test ptexdir/wcfname.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/wcfname.test similarity index 88% rename from source/texk/web2c/ptexdir/pfname.test rename to source/texk/web2c/ptexdir/wcfname.test index 01a7b912a..5c0ac0346 100755 --- a/source/texk/web2c/ptexdir/pfname.test +++ b/source/texk/web2c/ptexdir/wcfname.test @@ -9,7 +9,7 @@ rm -f ptests/fn*.log ptests/fn*.txt ptests/fn*.tex rc=0 TEXMFCNF=$srcdir/../kpathsea -TEXINPUTS=$srcdir/ptexdir/tests:. +TEXINPUTS=$srcdir/tests:. export TEXMFCNF TEXINPUTS # pTeX internal encoding @@ -20,7 +20,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$ienc-term.log || $rc=1 mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex ptests/ - diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-utf8.txt || $rc=2 + diff ptests/$doc-$ienc.txt $srcdir/tests/fn-utf8.txt || $rc=2 done done @@ -42,7 +42,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$fenc-term.log || $rc=3 mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex ptests/ - diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4 + diff ptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || $rc=4 done done diff --git a/source/texk/web2c/ptexdir/tests/fn-euc.txt b/source/texk/web2c/tests/fn-euc.txt similarity index 100% rename from source/texk/web2c/ptexdir/tests/fn-euc.txt rename to source/texk/web2c/tests/fn-euc.txt diff --git a/source/texk/web2c/ptexdir/tests/fn-sjis.txt b/source/texk/web2c/tests/fn-sjis.txt similarity index 100% rename from source/texk/web2c/ptexdir/tests/fn-sjis.txt rename to source/texk/web2c/tests/fn-sjis.txt diff --git a/source/texk/web2c/ptexdir/tests/fn-utf8.txt b/source/texk/web2c/tests/fn-utf8.txt similarity index 100% rename from source/texk/web2c/ptexdir/tests/fn-utf8.txt rename to source/texk/web2c/tests/fn-utf8.txt diff --git "a/source/texk/web2c/ptexdir/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" "b/source/texk/web2c/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" similarity index 100% rename from "source/texk/web2c/ptexdir/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" rename to "source/texk/web2c/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" "b/source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" similarity index 100% rename from "source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" rename to "source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" "b/source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" similarity index 100% rename from "source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" rename to "source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" "b/source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" similarity index 100% rename from "source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" rename to "source/texk/web2c/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" diff --git a/source/texk/web2c/uptexdir/ChangeLog b/source/texk/web2c/uptexdir/ChangeLog index b25f9d6de..3f5f78984 100644 --- a/source/texk/web2c/uptexdir/ChangeLog +++ b/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,10 @@ +2022-12-22 TANAKA Takuji + + * wcfname.test, am/ptex.am: + Add tests for file names with JIS X 0208 characters + in `uptex --kanji-internal={euc,sjis}`. + https://github.com/texjporg/tex-jp-build/issues/136 + 2022-12-22 Hironori Kitagawa * uptex.defines, kanji.h, am/uptex.am: diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am index 1900848cf..89d8695ed 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 uptexdir/pfname.test +uptex_tests = uptexdir/uptriptest.test uptexdir/upver.test uptexdir/upkcat.test uptexdir/wcfname.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/wcfname.test similarity index 90% rename from source/texk/web2c/uptexdir/pfname.test rename to source/texk/web2c/uptexdir/wcfname.test index b140d9199..9813b8a32 100755 --- a/source/texk/web2c/uptexdir/pfname.test +++ b/source/texk/web2c/uptexdir/wcfname.test @@ -9,7 +9,7 @@ rm -f uptests/fn*.log uptests/fn*.txt uptests/fn*.tex rc=0 TEXMFCNF=$srcdir/../kpathsea -TEXINPUTS=$srcdir/ptexdir/tests:. +TEXINPUTS=$srcdir/tests:. export TEXMFCNF TEXINPUTS # upTeX internal encoding @@ -31,7 +31,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$ienc-term.log || $rc=1 mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex uptests/ - diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-utf8.txt || $rc=2 + diff uptests/$doc-$ienc.txt $srcdir/tests/fn-utf8.txt || $rc=2 done done @@ -60,7 +60,7 @@ for doc in fnさざ波-$fenc; do echo '>>> Document:'$doc ' File Encoding:'$fenc ' Internal Encoding:'$ienc ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$fenc-term.log || $rc=3 mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex uptests/ - diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4 + diff uptests/$doc-$ienc.txt $srcdir/tests/fn-$fenc.txt || $rc=4 done done