texlive[72593] Build/source/texk: dvipdfm-x: update tests
commits+takuji at tug.org
commits+takuji at tug.org
Sat Oct 19 16:25:00 CEST 2024
Revision: 72593
https://tug.org/svn/texlive?view=revision&revision=72593
Author: takuji
Date: 2024-10-19 16:25:00 +0200 (Sat, 19 Oct 2024)
Log Message:
-----------
dvipdfm-x: update tests
Modified Paths:
--------------
trunk/Build/source/texk/dvipdfm-x/ChangeLog
trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test
trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test
trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf3.test
trunk/Build/source/texk/dvipdfm-x/tests/Makefile_upjf
trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map
trunk/Build/source/texk/dvipdfm-x/tests/upjf-ipa.map
trunk/Build/source/texk/dvipdfm-x/tests/upjf-noto.map
trunk/Build/source/texk/dvipdfm-x/tests/upjf.map
trunk/Build/source/texk/dvipdfm-x/tests/upjf.tex
trunk/Build/source/texk/dvipsk/Makefile.am
trunk/Build/source/texk/dvipsk/uptex-upjf2.test
trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test
trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test
trunk/Build/source/texk/web2c/xetexdir/xetex-ctrlsym.test
Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog 2024-10-19 14:25:00 UTC (rev 72593)
@@ -1,3 +1,10 @@
+2024-10-19 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * dvipdfmx-upjf{,2,3}.test, tests/upjf.tex,
+ tests/upjf{,-{hara,ipa,noto}}.map, tests/Makefike_upjf:
+ Update tests. Search system texmf for tfm/otf fonts
+ if kpathsearch is installed in the system.
+
2024-09-22 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* tfm.c: More strict check to interpret OFM FONTDIR
Modified: trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -85,7 +85,9 @@
cmp ./upjf1_full.pdf ./upjf1_omit2.pdf || failed="$failed dvipdfmx-upjf1-cmp2"
+rm -f upjf-r.ofm upjv-r.ofm
+
test -z "$failed" && exit 0
echo
echo "failed tests:$failed"
Modified: trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf2.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -9,6 +9,11 @@
_kpsewhich=$KpsDir/kpsewhich$ExeExt
_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt
+if type kpsewhich > /dev/null 2>&1; then
+ otfpath=".//;"`kpsewhich -show-path='opentype fonts'`
+ otfpath=`echo $otfpath | sed -e 's,!!,,g'`
+fi
+
TEXMFCNF=$srcdir/../kpathsea
TFMFONTS=".;$srcdir/tests;$srcdir/data"
T1FONTS="$srcdir/tests;$srcdir/data"
@@ -15,24 +20,34 @@
TEXFONTMAPS="$srcdir/tests;$srcdir/data"
DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
TEXPICTS=$srcdir/tests
-TEXFONTS=".;$srcdir/tests"
+TEXFONTS="./tmp001;$srcdir/tests"
SOURCE_DATE_EPOCH=1588474800
export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS SOURCE_DATE_EPOCH
+if type kpsewhich > /dev/null 2>&1; then
+ echo $otfpath
+else
+ otfpath=".//;"`$_kpsewhich -show-path='opentype fonts'`
+ echo $otfpath
+fi
+OPENTYPEFONTS=`$_kpsewhich "--cnf-line=OPENTYPEFONTS=$otfpath" -show-path='opentype fonts'`
+export OPENTYPEFONTS
+echo "OPENTYPEFONTS::" $OPENTYPEFONTS
+
failed=
+test -d tmp001 || mkdir -p tmp001
+
##### following tests require HaranoAji fonts #####
-$_kpsewhich HaranoAjiMincho-Regular.otf
-otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77
-OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'`
-export OPENTYPEFONTS
+$_kpsewhich HaranoAjiMincho-Regular.otf || exit 77
+$_kpsewhich HaranoAjiGothic-Normal.otf || exit 77
-rm -f upjf.vf upjv.vf upjf-r.ofm upjv-r.ofm
+rm -f ./tmp001/upjf.vf ./tmp001/upjv.vf
echo "*** dvipdfmx: test for upjf2_full-hara.pdf" && echo \
- && cp $srcdir/tests/upjf2_full.vf ./upjf.vf \
- && cp $srcdir/tests/upjv2_full.vf ./upjv.vf \
+ && cp $srcdir/tests/upjf2_full.vf ./tmp001/upjf.vf \
+ && cp $srcdir/tests/upjv2_full.vf ./tmp001/upjv.vf \
&& $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-hara.map -o upjf2.pdf $srcdir/tests/upjf2.dvi \
&& mv ./upjf2.pdf ./upjf2_full-hara.pdf \
&& echo && echo "dvipdfmx-upjf2-vf_full-hara tests OK" && echo \
Modified: trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf3.test
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf3.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/dvipdfmx-upjf3.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -9,6 +9,11 @@
_kpsewhich=$KpsDir/kpsewhich$ExeExt
_xdvipdfmx=$BinDir/xdvipdfmx$ExeExt
+if type kpsewhich > /dev/null 2>&1; then
+ otfpath=".//;"`kpsewhich -show-path='opentype fonts'`
+ otfpath=`echo $otfpath | sed -e 's,!!,,g'`
+fi
+
TEXMFCNF=$srcdir/../kpathsea
TFMFONTS=".;$srcdir/tests;$srcdir/data"
T1FONTS="$srcdir/tests;$srcdir/data"
@@ -15,29 +20,43 @@
TEXFONTMAPS="$srcdir/tests;$srcdir/data"
DVIPDFMXINPUTS="$srcdir/tests;$srcdir/data"
TEXPICTS=$srcdir/tests
-TEXFONTS=".;$srcdir/tests"
+TEXFONTS="./tmp002;$srcdir/tests"
SOURCE_DATE_EPOCH=1588474800
export TEXMFCNF TFMFONTS T1FONTS TEXFONTMAPS DVIPDFMXINPUTS TEXPICTS TEXFONTS SOURCE_DATE_EPOCH
+if type kpsewhich > /dev/null 2>&1; then
+ echo $otfpath
+else
+ otfpath=".//;"`$_kpsewhich -show-path='opentype fonts'`
+ echo $otfpath
+fi
+OPENTYPEFONTS=`$_kpsewhich "--cnf-line=OPENTYPEFONTS=$otfpath" -show-path='opentype fonts'`
+export OPENTYPEFONTS
+echo "OPENTYPEFONTS::" $OPENTYPEFONTS
+
+TTFONTS=".//"
+echo $TTFONTS
+export TTFONTS
+
failed=
+test -d tmp002 || mkdir -p tmp002
+
##### following tests require HaranoAji fonts and Noto Hentaigana font #####
-$_kpsewhich HaranoAjiMincho-Regular.otf
-otfpath=`$_kpsewhich HaranoAjiMincho-Regular.otf` || exit 77
-OPENTYPEFONTS=`echo $otfpath | sed -e 's,HaranoAjiMincho-Regular\.otf,,' -e 's,/fonts/opentype/.*$,/fonts/opentype//,'`
-export OPENTYPEFONTS
+$_kpsewhich HaranoAjiMincho-Regular.otf || exit 77
+$_kpsewhich HaranoAjiGothic-Normal.otf || exit 77
-$_kpsewhich NotoSerifHentaigana-Regular.ttf
-ttfpath=`$_kpsewhich NotoSerifHentaigana-Regular.ttf` || exit 77
-TTFONTS=`echo $ttfpath | sed -e 's,NotoSerifHentaigana-Regular\.ttf,,' -e 's,/fonts/truetype/.*$,/fonts/truetype//,'`
-export TTFONTS
+#$_kpsewhich NotoSerifHentaigana-Regular.ttf
+#ttfpath=`$_kpsewhich NotoSerifHentaigana-Regular.ttf` || exit 77
+#TTFONTS=`echo $ttfpath | sed -e 's,NotoSerifHentaigana-Regular\.ttf,,' -e 's,/fonts/truetype/.*$,/fonts/truetype//,'`
+#export TTFONTS
-rm -f upjf.vf upjv.vf upjf-r.ofm upjv-r.ofm upjf-g.ofm upjv-g.ofm
+rm -f ./tmp002/upjf.vf ./tmp002/upjv.vf
echo "*** dvipdfmx: test for upjf3_full-noto.pdf" && echo \
- && cp $srcdir/tests/upjf3_full.vf ./upjf.vf \
- && cp $srcdir/tests/upjv3_full.vf ./upjv.vf \
+ && cp $srcdir/tests/upjf3_full.vf ./tmp002/upjf.vf \
+ && cp $srcdir/tests/upjv3_full.vf ./tmp002/upjv.vf \
&& $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-noto.map -o upjf3.pdf $srcdir/tests/upjf3.dvi \
&& mv ./upjf3.pdf ./upjf3_full-noto.pdf \
&& echo && echo "dvipdfmx-upjf3-vf_full-noto tests OK" && echo \
@@ -48,8 +67,8 @@
$_kpsewhich ipamjm.ttf || exit 77
echo "*** dvipdfmx: test for upjf3_full-ipa.pdf" && echo \
- && cp $srcdir/tests/upjf4_full.vf ./upjf.vf \
- && cp $srcdir/tests/upjv4_full.vf ./upjv.vf \
+ && cp $srcdir/tests/upjf4_full.vf ./tmp002/upjf.vf \
+ && cp $srcdir/tests/upjv4_full.vf ./tmp002/upjv.vf \
&& $_xdvipdfmx --dvipdfmx -vv --pdfm-str-utf8 -f upjf-ipa.map -o upjf3.pdf $srcdir/tests/upjf3.dvi \
&& mv ./upjf3.pdf ./upjf3_full-ipa.pdf \
&& echo && echo "dvipdfmx-upjf3-vf_full-ipa tests OK" && echo \
Modified: trunk/Build/source/texk/dvipdfm-x/tests/Makefile_upjf
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/Makefile_upjf 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/Makefile_upjf 2024-10-19 14:25:00 UTC (rev 72593)
@@ -55,6 +55,7 @@
upjv2_full.vf: upjv2_full.zvp0
jfmutil zvp02vf upjv2_full.zvp0
+# test for hentaigana with noto font
upjf3_full.vf: upjf3_full.zvp0
jfmutil zvp02vf upjf3_full.zvp0
@@ -61,6 +62,7 @@
upjv3_full.vf: upjv3_full.zvp0
jfmutil zvp02vf upjv3_full.zvp0
+# test for hentaigana with IPA MJ Mincho
upjf4_full.vf: upjf4_full.zvp0
jfmutil zvp02vf upjf4_full.zvp0
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf-hara.map 2024-10-19 14:25:00 UTC (rev 72593)
@@ -1,8 +1,8 @@
upjf-r UPJF-UTF16-H HaranoAjiMincho-Regular.otf
-upjf-g UPJF-UTF16-H HaranoAjiGothic-Regular.otf
+upjf-g UPJF-UTF16-H HaranoAjiGothic-Normal.otf
upjf-c Identity-H HaranoAjiMincho-Regular.otf
upjv-r UPJF-UTF16-V HaranoAjiMincho-Regular.otf
-upjv-g UPJF-UTF16-V HaranoAjiGothic-Regular.otf
+upjv-g UPJF-UTF16-V HaranoAjiGothic-Normal.otf
upjv-c Identity-V HaranoAjiMincho-Regular.otf
%upjf-r UniJIS-UTF16-H !Ryumin-Light
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf-ipa.map
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf-ipa.map 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf-ipa.map 2024-10-19 14:25:00 UTC (rev 72593)
@@ -1,10 +1,10 @@
upjf-r unicode ipamjm.ttf
-upjf-g unicode HaranoAjiGothic-Regular.otf
+upjf-g unicode HaranoAjiGothic-Normal.otf
upjf-c Identity-H HaranoAjiMincho-Regular.otf
upjf-hu unicode ipamjm.ttf
upjf-hi Identity-H ipamjm.ttf
upjv-r unicode ipamjm.ttf -w 1
-upjv-g unicode HaranoAjiGothic-Regular.otf -w 1
+upjv-g unicode HaranoAjiGothic-Normal.otf -w 1
upjv-c Identity-V HaranoAjiMincho-Regular.otf
upjv-hu unicode ipamjm.ttf -w 1
upjv-hi Identity-V ipamjm.ttf
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf-noto.map
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf-noto.map 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf-noto.map 2024-10-19 14:25:00 UTC (rev 72593)
@@ -1,10 +1,10 @@
upjf-r unicode HaranoAjiMincho-Regular.otf
-upjf-g unicode HaranoAjiGothic-Regular.otf
+upjf-g unicode HaranoAjiGothic-Normal.otf
upjf-c Identity-H HaranoAjiMincho-Regular.otf
upjf-hu unicode NotoSerifHentaigana-Regular.ttf
upjf-hi Identity-H NotoSerifHentaigana-Regular.ttf
upjv-r unicode HaranoAjiMincho-Regular.otf -w 1
-upjv-g unicode HaranoAjiGothic-Regular.otf -w 1
+upjv-g unicode HaranoAjiGothic-Normal.otf -w 1
upjv-c Identity-V HaranoAjiMincho-Regular.otf
upjv-hu unicode NotoSerifHentaigana-Regular.ttf -w 1
upjv-hi Identity-V NotoSerifHentaigana-Regular.ttf
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf.map
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf.map 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf.map 2024-10-19 14:25:00 UTC (rev 72593)
@@ -1,8 +1,8 @@
%upjf-r UniJIS-UTF16-H HaranoAjiMincho-Regular.otf
-%upjf-g UniJIS-UTF16-H HaranoAjiGothic-Regular.otf
+%upjf-g UniJIS-UTF16-H HaranoAjiGothic-Normal.otf
%upjf-c Identity-H HaranoAjiMincho-Regular.otf
%upjv-r UniJIS-UTF16-V HaranoAjiMincho-Regular.otf
-%upjv-g UniJIS-UTF16-V HaranoAjiGothic-Regular.otf
+%upjv-g UniJIS-UTF16-V HaranoAjiGothic-Normal.otf
%upjv-c Identity-V HaranoAjiMincho-Regular.otf
%upjf-r UniJIS-UTF16-H !Ryumin-Light
Modified: trunk/Build/source/texk/dvipdfm-x/tests/upjf.tex
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tests/upjf.tex 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipdfm-x/tests/upjf.tex 2024-10-19 14:25:00 UTC (rev 72593)
@@ -7,9 +7,9 @@
% for dvipdfmx
%\AtBeginDvi{\special{pdf:mapline upjf-r UniJIS-UTF16-H HaranoAjiMincho-Regular.otf}}
-%\AtBeginDvi{\special{pdf:mapline upjf-g UniJIS-UTF16-H HaranoAjiGothic-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjf-g UniJIS-UTF16-H HaranoAjiGothic-Normal.otf}}
%\AtBeginDvi{\special{pdf:mapline upjv-r UniJIS-UTF16-V HaranoAjiMincho-Regular.otf}}
-%\AtBeginDvi{\special{pdf:mapline upjv-g UniJIS-UTF16-V HaranoAjiGothic-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjv-g UniJIS-UTF16-V HaranoAjiGothic-Normal.otf}}
%\AtBeginDvi{\special{pdf:mapline upjf-r UniJIS-UTF16-H !Ryumin-Light}}
%\AtBeginDvi{\special{pdf:mapline upjf-g UniJIS-UTF16-H !GothicBBB-Medium}}
%\AtBeginDvi{\special{pdf:mapline upjv-r UniJIS-UTF16-V !Ryumin-Light}}
Modified: trunk/Build/source/texk/dvipsk/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvipsk/Makefile.am 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipsk/Makefile.am 2024-10-19 14:25:00 UTC (rev 72593)
@@ -171,7 +171,7 @@
EXTRA_DIST += testdata/pfbincl.eps testdata/pfbincl.tex testdata/pfbincl.xdv testdata/pfbincl.xps
DISTCLEANFILES += pfbincl.ps
## quotecmd-test.pl
-EXTRA_DIST += testdata/quotecmd.dvi testdata/quotecmd.tex
+EXTRA_DIST += testdata/quotecmd.dvi testdata/quotecmd.tex
DISTCLEANFILES += *badnews*
## same-name.test
DISTCLEANFILES += same-name.out
Modified: trunk/Build/source/texk/dvipsk/uptex-upjf2.test
===================================================================
--- trunk/Build/source/texk/dvipsk/uptex-upjf2.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/dvipsk/uptex-upjf2.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -11,8 +11,6 @@
SOURCE_DATE_EPOCH=1588474800
export TEXFONTS SOURCE_DATE_EPOCH
-rm -f upjf-g.ofm upjv-g.ofm upjf-r.ofm upjv-r.ofm
-
rc=0
test -d tmp001 || mkdir -p tmp001
Modified: trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test
===================================================================
--- trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/web2c/euptexdir/euptex-prim.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -17,8 +17,10 @@
rm -f eup-prim.*
$LN_S $srcdir/euptexdir/tests/eup-prim.tex ./eup-prim.tex
+if test ! -f ./eup-basic.tex; then
+ cp $srcdir/tests/dump-basic.tex ./eup-basic.tex
+fi
if test ! -f ./eup-basic.fmt; then
- cp $srcdir/tests/dump-basic.tex ./eup-basic.tex
$_euptex -ini -etex eup-basic || exit 1
fi
Modified: trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/web2c/uptexdir/uptex-prim.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -17,8 +17,10 @@
rm -f up-prim.*
$LN_S $srcdir/uptexdir/tests/up-prim.tex ./up-prim.tex
+if test ! -f ./up-basic.tex; then
+ cp $srcdir/tests/dump-basic.tex ./up-basic.tex
+fi
if test ! -f ./up-basic.fmt; then
- cp $srcdir/tests/dump-basic.tex ./up-basic.tex
$_uptex -ini up-basic || exit 1
fi
Modified: trunk/Build/source/texk/web2c/xetexdir/xetex-ctrlsym.test
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/xetex-ctrlsym.test 2024-10-19 14:24:54 UTC (rev 72592)
+++ trunk/Build/source/texk/web2c/xetexdir/xetex-ctrlsym.test 2024-10-19 14:25:00 UTC (rev 72593)
@@ -16,12 +16,15 @@
rm -f xe-ctrlsym.tex
$LN_S $srcdir/xetexdir/tests/ctrlsym.tex ./xe-ctrlsym.tex
-#exit 77
+if test ! -f ./xe-basic.tex; then
+ cp $srcdir/tests/dump-basic.tex ./xe-basic.tex
+fi
+if test ! -f ./xe-basic.fmt; then
+ $_xetex -ini -etex xe-basic || exit 1
+fi
-$_xetex -ini -etex xe-ctrlsym || exit 1
+$_xetex -etex -fmt=xe-basic xe-ctrlsym || exit 2
-$_xetex -etex -fmt=xe-ctrlsym xe-ctrlsym || exit 2
-
sed 1d xe-ctrlsym.log >xe-ctrlsym.out
diff $srcdir/xetexdir/tests/ctrlsym.log xe-ctrlsym.out || exit 3
More information about the tex-live-commits
mailing list.