From ef44d36055aaf6fa5d634c0d7e5bff2cb5eafe29 Mon Sep 17 00:00:00 2001 From: TANAKA Takuji Date: Tue, 20 Dec 2022 22:20:10 +0900 Subject: [PATCH] (u)ptex-*: add test for UTF8 (#136) --- source/texk/web2c/ptexdir/pfname.test | 4 ++-- source/texk/web2c/ptexdir/tests/fn.tex | 5 ++++- ...\303\206\303\230\303\237\302\247-utf8.tex" | 19 ++++++++++++++++++ ...\303\227\303\267\302\247\302\266-utf8.tex" | 8 ++++++++ ...\205\246\351\226\222\357\275\261-utf8.tex" | 19 ++++++++++++++++++ ...\226\222\357\275\261\357\275\236-utf8.tex" | 19 ++++++++++++++++++ ...3\201\225\343\201\226\346\263\242-euc.tex" | 4 ++++ ...3\201\225\343\201\226\346\263\242-jis.tex" | 4 ++++ ...\201\225\343\201\226\346\263\242-sjis.tex" | 4 ++++ ...\201\225\343\201\226\346\263\242-utf8.tex" | 4 ++++ ...n\343\201\225\343\201\226\346\263\242.tex" | 20 ------------------- source/texk/web2c/uptexdir/pfname.test | 4 ++-- 12 files changed, 89 insertions(+), 25 deletions(-) create mode 100644 "source/texk/web2c/ptexdir/tests/fn\302\243\302\245\303\206\303\230\303\237\302\247-utf8.tex" create mode 100644 "source/texk/web2c/ptexdir/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" create mode 100644 "source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-utf8.tex" create mode 100644 "source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-utf8.tex" delete mode 100644 "source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" diff --git a/source/texk/web2c/ptexdir/pfname.test b/source/texk/web2c/ptexdir/pfname.test index 1c8ae8fff..16b0335e7 100755 --- a/source/texk/web2c/ptexdir/pfname.test +++ b/source/texk/web2c/ptexdir/pfname.test @@ -15,7 +15,7 @@ export TEXMFCNF TEXINPUTS # pTeX internal encoding fenc="utf8" for ienc in euc sjis; do -for doc in fn fnさざ波; do +for doc in fn fnさざ波-$fenc fn①㎝Ⅶ閒ｱ～-$fenc fn①㎝Ⅶ閒ｱ-$fenc 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 @@ -26,7 +26,7 @@ done done # pTeX, regacy encoding -for fenc in sjis euc jis utf8; do +for fenc in sjis euc jis; do for doc in fnさざ波-$fenc; do ienc=$fenc diff --git a/source/texk/web2c/ptexdir/tests/fn.tex b/source/texk/web2c/ptexdir/tests/fn.tex index c51c8b7b0..5fb8fbe6f 100644 --- a/source/texk/web2c/ptexdir/tests/fn.tex +++ b/source/texk/web2c/ptexdir/tests/fn.tex @@ -13,8 +13,11 @@ \immediate\write1{\relax} \immediate\closeout1 +% current directory \input "|cat fn-tmp.tex" \input fn-tmp.tex -\input fnさざ波.tex + +% vir kpathsearch +\input fn±×÷§¶-utf8.tex \relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\302\243\302\245\303\206\303\230\303\237\302\247-utf8.tex" "b/source/texk/web2c/ptexdir/tests/fn\302\243\302\245\303\206\303\230\303\237\302\247-utf8.tex" new file mode 100644 index 000000000..6919b0e27 --- /dev/null +++ "b/source/texk/web2c/ptexdir/tests/fn\302\243\302\245\303\206\303\230\303\237\302\247-utf8.tex" @@ -0,0 +1,19 @@ +% fn£¥ÆØߧ-utf8.tex +% UTF-8 encoding, including Latin-1 characters +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fn£¥ÆØߧ-utf8.tex} + +\immediate\openout0=\jobname.txt +\immediate\write0{abc αβγ абв あア※￥ 天地人} +\immediate\closeout0 + +\immediate\openout1=fn£¥ÆØߧ-utf8-tmp.tex +\immediate\write1{\relax} +\immediate\closeout1 + +\input "|cat fn£¥ÆØߧ-utf8-tmp.tex" +\input fn£¥ÆØߧ-utf8-tmp.tex + +\relax\end 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/ptexdir/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" new file mode 100644 index 000000000..6c616246a --- /dev/null +++ "b/source/texk/web2c/ptexdir/tests/fn\302\261\303\227\303\267\302\247\302\266-utf8.tex" @@ -0,0 +1,8 @@ +% fn±×÷§¶-utf8.tex +% UTF-8 encoding, including Latin-1 & JIS X 0208 characters +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fn±×÷§¶-utf8.tex} + +\relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-utf8.tex" "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-utf8.tex" new file mode 100644 index 000000000..56b185601 --- /dev/null +++ "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-utf8.tex" @@ -0,0 +1,19 @@ +% fn£¥ÆØß-utf8.tex +% UTF-8 encoding, including Latin-1 characters +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fn①㎝Ⅶ閒ｱ-utf8.tex} + +\immediate\openout0=\jobname.txt +\immediate\write0{abc αβγ абв あア※￥ 天地人} +\immediate\closeout0 + +\immediate\openout1=fn①㎝Ⅶ閒ｱ-utf8-tmp.tex +\immediate\write1{\relax} +\immediate\closeout1 + +\input "|cat fn①㎝Ⅶ閒ｱ-utf8-tmp.tex" +\input fn①㎝Ⅶ閒ｱ-utf8-tmp.tex + +\relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-utf8.tex" "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-utf8.tex" new file mode 100644 index 000000000..0aeb1d2ca --- /dev/null +++ "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-utf8.tex" @@ -0,0 +1,19 @@ +% fn①㎝Ⅶ閒ｱ～-utf8.tex +% Shift_JIS encoding, including CP932 platform-dependent characters +\catcode`\{=1 +\catcode`\}=2 + +\immediate\write16{JOB[\jobname] :: We are in fn①㎝Ⅶ閒ｱ～-utf8.tex} + +\immediate\openout0=\jobname.txt +\immediate\write0{abc αβγ абв あア※￥ 天地人} +\immediate\closeout0 + +\immediate\openout1=fn①㎝Ⅶ閒ｱ～-utf8-tmp.tex +\immediate\write1{\relax} +\immediate\closeout1 + +\input "|cat fn①㎝Ⅶ閒ｱ～-utf8-tmp.tex" +\input fn①㎝Ⅶ閒ｱ～-utf8-tmp.tex + +\relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" index da49ed501..e43eb57e1 100644 --- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" +++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" @@ -13,7 +13,11 @@ \immediate\write1{\relax} \immediate\closeout1 +% current directory \input "|cat fn-euc-tmp.tex" \input fn-euc-tmp.tex +% vir kpathsearch +\input fnޡߡ-utf8.tex + \relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex" index 335fbb0fc..8010acf61 100644 --- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex" +++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex" @@ -13,7 +13,11 @@ \immediate\write1{\relax} \immediate\closeout1 +% current directory \input "|cat fn$B$5$6GH(B-jis-tmp.tex" \input fn$B$5$6GH(B-jis-tmp.tex +% vir kpathsearch +\input fn$B!^!_!`!x"y(B-utf8.tex + \relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" index 5235c756f..47318ed4d 100644 --- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" +++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" @@ -13,7 +13,11 @@ \immediate\write1{\relax} \immediate\closeout1 +% current directory \input "|cat fng-sjis-tmp.tex" \input fng-sjis-tmp.tex +% vir kpathsearch +\input fn}~-utf8.tex + \relax\end diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" index c1916cdbd..70d1e53ba 100644 --- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" +++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" @@ -13,7 +13,11 @@ \immediate\write1{\relax} \immediate\closeout1 +% current directory \input "|cat fnさざ波-utf8-tmp.tex" \input fnさざ波-utf8-tmp.tex +% vir kpathsearch +\input fn±×÷§¶-utf8.tex + \relax\end 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" deleted file mode 100644 index 9bb332ed3..000000000 --- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" +++ /dev/null @@ -1,20 +0,0 @@ -% 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 - -\immediate\openout1=fnさざ波-tmp.tex -\immediate\write1{\relax} -\immediate\closeout1 - -\input "|cat fnさざ波-tmp.tex" -\input fnさざ波-tmp.tex -\input fnさざ波-utf8.tex - -\relax\end diff --git a/source/texk/web2c/uptexdir/pfname.test b/source/texk/web2c/uptexdir/pfname.test index 4113436c1..ce91635e6 100755 --- a/source/texk/web2c/uptexdir/pfname.test +++ b/source/texk/web2c/uptexdir/pfname.test @@ -15,7 +15,7 @@ export TEXMFCNF TEXINPUTS # upTeX internal encoding fenc="utf8" for ienc in euc sjis uptex; do -for doc in fn fnさざ波; do +for doc in fn fnさざ波-$fenc fn①㎝Ⅶ閒ｱ～-$fenc fn①㎝Ⅶ閒ｱ-$fenc fn£¥ÆØߧ-$fenc; do if [ "$COMSPEC" != "" ]; then echo "*** We guess OS is Windows." @@ -37,7 +37,7 @@ done done # pTeX compatible mode, regacy encoding -for fenc in sjis euc jis utf8; do +for fenc in sjis euc jis; do for doc in fnさざ波-$fenc; do ienc=$fenc