dvipdfm-x: add a test for upTeX vertical writing

git-svn-id: svn://tug.org/texlive/trunk@62161 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 131 insertions, 7 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 1610c0c4884..a8306cead9d 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,11 @@
+2022-02-24  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* dvipdfmx-upjf.test, Makefile.{am,in},
+	tests/Makefile_upjf, tests/upjv{,-r,-g}.tfm,
+	tests/upjf.{tex,dvi,map}, tests/upjv_{full,omit}.vf,
+	tests/UPJF-UTF16-V:
+	Add a new test for upTeX vertical writing.
+
 2021-11-17  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
 
 	* spc_dvips.c: Realize PSTricks on XeTeX without -dNOSAFER,
@@ -23,7 +31,7 @@
 	a CFF based OpenType font which does not contain a private
 	dictionary.
 	* configure.ac: version 20211029.
- 
+
 2021-10-16  Akira Kakuto  <kakuto@jcom.zaq.ne.jp>
 
 	* dvipdfmx.c: Fix a bug that the -r option was not effective,
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 6d9f2b85632..00bc0585f93 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -294,8 +294,11 @@ EXTRA_DIST += tests/ttc.dvi tests/ttc.tex tests/test.ttc
 DISTCLEANFILES += ttc*.pdf
 ## dvipdfmx-upjf.test
 EXTRA_DIST += tests/upjf.dvi tests/upjf.tex tests/upjf.map tests/Makefile_upjf
-EXTRA_DIST += tests/upjf_full.cnf tests/upjf_omit.cnf tests/upjf_full.vf tests/upjf_omit.vf
+EXTRA_DIST += tests/upjf_full.cnf tests/upjf_omit.cnf
+EXTRA_DIST += tests/upjf_full.vf tests/upjf_omit.vf
 EXTRA_DIST += tests/upjf-r.tfm tests/upjf-g.tfm tests/upjf.tfm tests/UPJF-UTF16-H
-DISTCLEANFILES += upjf.vf upjf*.pdf
+EXTRA_DIST += tests/upjv_full.vf tests/upjv_omit.vf
+EXTRA_DIST += tests/upjv-r.tfm tests/upjv-g.tfm tests/upjv.tfm tests/UPJF-UTF16-V
+DISTCLEANFILES += upjf.vf upjv.vf upjf*.pdf
 ##
 EXTRA_DIST += tests/fullmap.dvi tests/fullmap.tex
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index e9dfb9d532c..a069086aaa1 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -819,7 +819,7 @@ cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx
 dist_cmapdata_DATA = data/EUC-UCS2
 DISTCLEANFILES = config.force image*.pdf xbmc*.pdf annot*.pdf pic*.* \
 	bookm*.pdf paper*.pdf ptex*.pdf resrc*.pdf reverse.pdf \
-	ttc*.pdf upjf.vf upjf*.pdf
+	ttc*.pdf upjf.vf upjv.vf upjf*.pdf
 TESTS = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bad.test \
 	xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test \
 	xdvipdfm-ptx.test xdvipdfm-res.test xdvipdfm-rev.test \
@@ -843,6 +843,8 @@ EXTRA_DIST = $(TESTS) tests/dvipdfmx.cfg tests/psfonts.map \
 	tests/Makefile_upjf tests/upjf_full.cnf tests/upjf_omit.cnf \
 	tests/upjf_full.vf tests/upjf_omit.vf tests/upjf-r.tfm \
 	tests/upjf-g.tfm tests/upjf.tfm tests/UPJF-UTF16-H \
+	tests/upjv_full.vf tests/upjv_omit.vf tests/upjv-r.tfm \
+	tests/upjv-g.tfm tests/upjv.tfm tests/UPJF-UTF16-V \
 	tests/fullmap.dvi tests/fullmap.tex
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test b/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test
index 8fe96839710..c1b8f462ea0 100755
--- a/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx-upjf.test
@@ -1,6 +1,6 @@
 #! /bin/sh -vx
 # $Id$
-# Copyright 2020 Japanese TeX Development Community <issue@texjp.org>
+# Copyright 2020-2022 Japanese TeX Development Community <issue@texjp.org>
 # You may freely use, modify and/or distribute this file.
 
 TEXMFCNF=$srcdir/../kpathsea
@@ -17,6 +17,7 @@ failed=
 
 echo "*** dvipdfmx: test for upjf_full.pdf" && echo \
 	&& cp $srcdir/tests/upjf_full.vf ./upjf.vf \
+	&& cp $srcdir/tests/upjv_full.vf ./upjv.vf \
 	&& ./xdvipdfmx --dvipdfmx -vv -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \
 	&& mv ./upjf.pdf ./upjf_full.pdf \
 	&& echo && echo "dvipdfmx-upjf-vf_full tests OK" && echo \
@@ -24,6 +25,7 @@ echo "*** dvipdfmx: test for upjf_full.pdf" && echo \
 
 echo "*** dvipdfmx: test for upjf_omit.pdf" && echo \
 	&& cp $srcdir/tests/upjf_omit.vf ./upjf.vf \
+	&& cp $srcdir/tests/upjv_omit.vf ./upjv.vf \
 	&& ./xdvipdfmx --dvipdfmx -vv -f upjf.map -o upjf.pdf $srcdir/tests/upjf.dvi \
 	&& mv ./upjf.pdf ./upjf_omit.pdf \
 	&& echo && echo "dvipdfmx-upjf-vf_omit tests OK" && echo \
diff --git a/Build/source/texk/dvipdfm-x/tests/Makefile_upjf b/Build/source/texk/dvipdfm-x/tests/Makefile_upjf
index d22dda7005c..413ec221240 100644
--- a/Build/source/texk/dvipdfm-x/tests/Makefile_upjf
+++ b/Build/source/texk/dvipdfm-x/tests/Makefile_upjf
@@ -15,6 +15,21 @@ upjf_omit.vf: upjf.tfm upjf_omit.cnf
 	makejvf -i -u custom -e -t upjf_omit.cnf -H upjf.tfm -K upjf-g upjf-r
 	mv upjf.vf upjf_omit.vf
 
+upjv.tfm:
+	cp -p `kpsewhich upjisr-v.tfm` upjv.tfm
+
+upjv_full.vf: upjv.tfm upjf_full.cnf
+	makejvf -i -u custom -e -t upjf_full.cnf upjv.tfm -K upjv-g upjv-r
+	mv upjv.vf upjv_full.vf
+
+upjv_omit.vf: upjv.tfm upjf_omit.cnf
+	makejvf -i -u custom -e -t upjf_omit.cnf upjv.tfm -K upjv-g upjv-r
+	mv upjv.vf upjv_omit.vf
+
 upjf.dvi: upjf.tex
 	uplatex upjf.tex
+	dvispc -a upjf.dvi upjf.dvitxt
+	sed -i '/xxx/d' upjf.dvitxt
+	dvispc -x upjf.dvitxt upjf.dvi
+	rm upjf.dvitxt
 
diff --git a/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V b/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V
new file mode 100644
index 00000000000..1365d9d5fe4
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/UPJF-UTF16-V
@@ -0,0 +1,71 @@
+%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (UPJF-UTF16-V)
+%%Title: (UPJF-UTF16-V test sample)
+%%Version: 1.000
+%%Copyright: -----------------------------------------------------------
+%%Copyright: Copyright 2017-2022 Japanese TeX Development Community
+%%Copyright:
+%%Copyright: You may freely use, modify and/or distribute this file.
+%%Copyright: -----------------------------------------------------------
+%%EndComments
+
+/CIDInit /ProcSet findresource begin
+
+12 dict begin
+
+begincmap
+
+/CIDSystemInfo 3 dict dup begin
+  /Registry (Adobe) def
+  /Ordering (Japan1) def
+  /Supplement 7 def
+end def
+
+/CMapName /UPJF-UTF16-V def
+/CMapVersion 1.000 def
+/CMapType 1 def
+
+/WMode 1 def
+
+3 begincodespacerange
+  <0000>     <D7FF>
+  <D800DC00> <DBFFDFFF>
+  <E000>     <FFFF>
+endcodespacerange
+
+1 beginnotdefrange
+<0000> <001f> 1
+endnotdefrange
+
+3 begincidchar
+<6674> 2646
+<96ea> 2695
+<d842df9f> 13803
+endcidchar
+
+14 begincidrange
+<2600> <2603> 8215
+<3001> <3002> 7887
+<3005> <3007> 657
+<3008> <3011> 682
+<3014> <3015> 676
+<3016> <3017> 16197
+<3018> <3019> 12129
+<3033> <3035> 12108
+<3041> <3093> 842
+<3094> <3096> 7958
+<3099> <309a> 16326
+<309b> <309c> 643
+<309d> <309e> 653
+<ff61> <ff9f> 327
+endcidrange
+
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+
+%%EndResource
+%%EOF
diff --git a/Build/source/texk/dvipdfm-x/tests/upjf.dvi b/Build/source/texk/dvipdfm-x/tests/upjf.dvi
index 1e5473dc81b..e75a6ef20d4 100644
--- a/Build/source/texk/dvipdfm-x/tests/upjf.dvi
+++ b/Build/source/texk/dvipdfm-x/tests/upjf.dvi
diff --git a/Build/source/texk/dvipdfm-x/tests/upjf.map b/Build/source/texk/dvipdfm-x/tests/upjf.map
index 8203ec49a68..a4e14fab4a9 100644
--- a/Build/source/texk/dvipdfm-x/tests/upjf.map
+++ b/Build/source/texk/dvipdfm-x/tests/upjf.map
@@ -1,9 +1,16 @@
 %upjf-r   UniJIS-UTF16-H  HaranoAjiMincho-Regular.otf
 %upjf-g   UniJIS-UTF16-H  HaranoAjiGothic-Regular.otf
+%upjv-r   UniJIS-UTF16-V  HaranoAjiMincho-Regular.otf
+%upjv-g   UniJIS-UTF16-V  HaranoAjiGothic-Regular.otf
 
 %upjf-r   UniJIS-UTF16-H  !Ryumin-Light
 %upjf-g   UniJIS-UTF16-H  !GothicBBB-Medium
+%upjv-r   UniJIS-UTF16-V  !Ryumin-Light
+%upjv-g   UniJIS-UTF16-V  !GothicBBB-Medium
 
 upjf-r   UPJF-UTF16-H  !Ryumin-Light
 upjf-g   UPJF-UTF16-H  !GothicBBB-Medium
+upjv-r   UPJF-UTF16-V  !Ryumin-Light
+upjv-g   UPJF-UTF16-V  !GothicBBB-Medium
 
+ptmr8r 8r Times-Roman
diff --git a/Build/source/texk/dvipdfm-x/tests/upjf.tex b/Build/source/texk/dvipdfm-x/tests/upjf.tex
index de471281b2f..493e4b23d8c 100644
--- a/Build/source/texk/dvipdfm-x/tests/upjf.tex
+++ b/Build/source/texk/dvipdfm-x/tests/upjf.tex
@@ -1,19 +1,35 @@
-% Copyright (C) 2020 Japanese TeX Development Community
+% Copyright (C) 2020-2022 Japanese TeX Development Community
 % You may freely use, modify and/or distribute this file.
 
 \documentclass{ujarticle}
+%\usepackage[T1]{fontenc}
+%\usepackage{mathptmx}
 
 % 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 upjv-r UniJIS-UTF16-V HaranoAjiMincho-Regular.otf}}
+%\AtBeginDvi{\special{pdf:mapline upjv-g UniJIS-UTF16-V HaranoAjiGothic-Regular.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}}
+%\AtBeginDvi{\special{pdf:mapline upjv-g UniJIS-UTF16-V !GothicBBB-Medium}}
 %\AtBeginDvi{\special{pdf:mapline upjf-r UPJF-UTF16-H !Ryumin-Light}}
 %\AtBeginDvi{\special{pdf:mapline upjf-g UPJF-UTF16-H !GothicBBB-Medium}}
+%\AtBeginDvi{\special{pdf:mapline upjv-r UPJF-UTF16-V !Ryumin-Light}}
+%\AtBeginDvi{\special{pdf:mapline upjv-g UPJF-UTF16-V !GothicBBB-Medium}}
 
 \begin{document}
 \pagestyle{empty}
 \font\upjf=upjf at 10pt
-\upjf あいうえおｱｲｳｴｵ、☃~雪晴☀𠮟。
+\fbox{\hbox{\yoko
+\upjf あいうえおｱｲｳｴｵ、☃~雪晴☀𠮟。ABC xyz.
+}}
+
+\tbaselineshift0.3zh
+\font\upjv=upjv at 10pt
+\fbox{\hbox{\tate
+\upjv あいうえお、☃~雪晴☀𠮟。ABC xyz.
+}}
 \end{document}
 
diff --git a/Build/source/texk/dvipdfm-x/tests/upjv-g.tfm b/Build/source/texk/dvipdfm-x/tests/upjv-g.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/upjv-g.tfm
diff --git a/Build/source/texk/dvipdfm-x/tests/upjv-r.tfm b/Build/source/texk/dvipdfm-x/tests/upjv-r.tfm
new file mode 100644
index 00000000000..dddd9776408
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/upjv-r.tfm
diff --git a/Build/source/texk/dvipdfm-x/tests/upjv.tfm b/Build/source/texk/dvipdfm-x/tests/upjv.tfm
new file mode 100644
index 00000000000..cb658bf11d5
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/upjv.tfm
diff --git a/Build/source/texk/dvipdfm-x/tests/upjv_full.vf b/Build/source/texk/dvipdfm-x/tests/upjv_full.vf
new file mode 100644
index 00000000000..927e8053a53
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/upjv_full.vf
diff --git a/Build/source/texk/dvipdfm-x/tests/upjv_omit.vf b/Build/source/texk/dvipdfm-x/tests/upjv_omit.vf
new file mode 100644
index 00000000000..716b7fafb9c
--- /dev/null
+++ b/Build/source/texk/dvipdfm-x/tests/upjv_omit.vf