Merge branch 'master' into build/work000 r72593

texjporg · Oct 20, 2024 · f010445 · f010445
2 parents c485c2f + 5d2f950
commit f010445
Show file tree

Hide file tree

Showing 41 changed files with 411 additions and 113 deletions.
diff --git a/source/texk/dvipdfm-x/ChangeLog b/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-19  TANAKA Takuji  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* tfm.c: More strict check to interpret OFM FONTDIR

diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf.test b/source/texk/dvipdfm-x/dvipdfmx-upjf.test
@@ -85,6 +85,8 @@ echo "*** dvipdfmx: test for upjf1_omit2.pdf" && echo \
 
 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

diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf2.test b/source/texk/dvipdfm-x/dvipdfmx-upjf2.test
@@ -9,30 +9,45 @@ ExeExt=${ExeExt:-}
 _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"
 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 \

diff --git a/source/texk/dvipdfm-x/dvipdfmx-upjf3.test b/source/texk/dvipdfm-x/dvipdfmx-upjf3.test
@@ -9,35 +9,54 @@ ExeExt=${ExeExt:-}
 _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"
 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 @@ echo "*** dvipdfmx: test for upjf3_full-noto.pdf" && echo \
 $_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 \

diff --git a/source/texk/dvipdfm-x/tests/Makefile_upjf b/source/texk/dvipdfm-x/tests/Makefile_upjf
@@ -55,12 +55,14 @@ upjf2_full.vf: upjf2_full.zvp0
 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
 
 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
 

diff --git a/source/texk/dvipdfm-x/tests/upjf-hara.map b/source/texk/dvipdfm-x/tests/upjf-hara.map
@@ -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

diff --git a/source/texk/dvipdfm-x/tests/upjf-ipa.map b/source/texk/dvipdfm-x/tests/upjf-ipa.map
@@ -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

diff --git a/source/texk/dvipdfm-x/tests/upjf-noto.map b/source/texk/dvipdfm-x/tests/upjf-noto.map
@@ -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

diff --git a/source/texk/dvipdfm-x/tests/upjf.map b/source/texk/dvipdfm-x/tests/upjf.map
@@ -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

diff --git a/source/texk/dvipdfm-x/tests/upjf.tex b/source/texk/dvipdfm-x/tests/upjf.tex
@@ -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}}

diff --git a/source/texk/dvipsk/Makefile.am b/source/texk/dvipsk/Makefile.am
@@ -171,7 +171,7 @@ DISTCLEANFILES += eepic-nan.ps
 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

diff --git a/source/texk/dvipsk/uptex-upjf2.test b/source/texk/dvipsk/uptex-upjf2.test
@@ -11,8 +11,6 @@ TEXFONTS="./tmp001;$srcdir/testdata"
 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

diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
@@ -333,6 +333,8 @@ texmf_other_scripts = \
 	bib2gls/convertgls2bib.sh \
 	bibcop/bibcop.pl \
 	bibtexperllibs/ltx2unitxt \
+	bookshelf/bookshelf-listallfonts \
+	bookshelf/bookshelf-mkfontsel \
 	bundledoc/arlatex \
 	bundledoc/bundledoc \
 	cachepic/cachepic.tlu \