diff options
author | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2022-02-24 14:41:53 +0000 |
---|---|---|
committer | Takuji Tanaka <ttk@t-lab.opal.ne.jp> | 2022-02-24 14:41:53 +0000 |
commit | 02d6fae6db4fdbe4a3c6309fc2d953f28a7217c1 (patch) | |
tree | bde1fa1110d4a52086eb87b4ea568c98be565ead /Build | |
parent | c06543c44b3f77cf6be5647b6d37a377ff17c0cb (diff) |
dvipsk: add a test for upTeX vertical writing
git-svn-id: svn://tug.org/texlive/trunk@62162 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/dvipsk/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/Makefile.am | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/Makefile.in | 3 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/Makefile_upjf | 15 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjf.dvi | bin | 260 -> 588 bytes | |||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjf.map | 4 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjf.tex | 20 | ||||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjv-g.tfm | bin | 0 -> 108 bytes | |||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjv-r.tfm | bin | 0 -> 108 bytes | |||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjv.tfm | bin | 0 -> 536 bytes | |||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjv_full.vf | bin | 0 -> 7008 bytes | |||
-rw-r--r-- | Build/source/texk/dvipsk/testdata/upjv_omit.vf | bin | 0 -> 6972 bytes | |||
-rwxr-xr-x | Build/source/texk/dvipsk/uptex-vf.test | 2 |
13 files changed, 52 insertions, 3 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 044fcd4217b..564f1cb9103 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,3 +1,10 @@ +2022-02-24 TANAKA Takuji <ttk@t-lab.opal.ne.jp> + + * Makefile.{am,in}, uptex-vf.test, + testdata/Makefile_upjf, testdata/upjv{,-r,-g}.tfm, + testdata/upjf.{tex,dvi,map}, testdata/upjv_{full,omit}.vf: + Add a new test for upTeX vertical writing. + 2022-01-22 Tomas Rokicki <rokicki@gmail.com> * dvips.c (landscaperotate): define new global for new option. diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index cc27e1e01bd..8d5b677f007 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -189,8 +189,10 @@ DISTCLEANFILES += overflow-color-push.ps overflow-epsfile.ps overflow-psbox.ps EXTRA_DIST += testdata/Makefile_upjf testdata/upjf.tex testdata/upjf.dvi testdata/upjf.map \ testdata/upjf.tfm testdata/upjf-g.tfm testdata/upjf-r.tfm \ testdata/upjf_full.vf testdata/upjf_omit.vf \ + testdata/upjv.tfm testdata/upjv-g.tfm testdata/upjv-r.tfm \ + testdata/upjv_full.vf testdata/upjv_omit.vf \ testdata/upjf_full.cnf testdata/upjf_omit.cnf -DISTCLEANFILES += upjf.vf upjf_full.ps upjf_omit.ps +DISTCLEANFILES += upjf.vf upjv.vf upjf_full.ps upjf_omit.ps EXTRA_DIST += \ NEWS \ diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index 109d9b7c84a..c518d11e55f 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -761,6 +761,9 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \ testdata/upjf.dvi testdata/upjf.map testdata/upjf.tfm \ testdata/upjf-g.tfm testdata/upjf-r.tfm testdata/upjf_full.vf \ testdata/upjf_omit.vf testdata/upjf_full.cnf \ + testdata/upjf_omit.cnf testdata/upjv.tfm testdata/upjv-g.tfm \ + testdata/upjv-r.tfm testdata/upjv_full.vf \ + testdata/upjv_omit.vf testdata/upjf_full.cnf \ testdata/upjf_omit.cnf NEWS TODO testdata/intoverflow.dvi \ testdata/vfnameoverflow.dvi atari cmfonts.map config.ps \ contrib/afm-extra contrib/colorsep.lpro contrib/configs \ diff --git a/Build/source/texk/dvipsk/testdata/Makefile_upjf b/Build/source/texk/dvipsk/testdata/Makefile_upjf index d22dda7005c..413ec221240 100644 --- a/Build/source/texk/dvipsk/testdata/Makefile_upjf +++ b/Build/source/texk/dvipsk/testdata/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/dvipsk/testdata/upjf.dvi b/Build/source/texk/dvipsk/testdata/upjf.dvi Binary files differindex 1e5473dc81b..e75a6ef20d4 100644 --- a/Build/source/texk/dvipsk/testdata/upjf.dvi +++ b/Build/source/texk/dvipsk/testdata/upjf.dvi diff --git a/Build/source/texk/dvipsk/testdata/upjf.map b/Build/source/texk/dvipsk/testdata/upjf.map index df1f10908a1..78add04a954 100644 --- a/Build/source/texk/dvipsk/testdata/upjf.map +++ b/Build/source/texk/dvipsk/testdata/upjf.map @@ -1,2 +1,6 @@ upjf-r Ryumin-Light-UniJIS-UTF16-H upjf-g GothicBBB-Medium-UniJIS-UTF16-H +upjv-r Ryumin-Light-UniJIS-UTF16-V +upjv-g GothicBBB-Medium-UniJIS-UTF16-V + +cmr10 <cmr10.pfb diff --git a/Build/source/texk/dvipsk/testdata/upjf.tex b/Build/source/texk/dvipsk/testdata/upjf.tex index de471281b2f..493e4b23d8c 100644 --- a/Build/source/texk/dvipsk/testdata/upjf.tex +++ b/Build/source/texk/dvipsk/testdata/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/dvipsk/testdata/upjv-g.tfm b/Build/source/texk/dvipsk/testdata/upjv-g.tfm Binary files differnew file mode 100644 index 00000000000..dddd9776408 --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjv-g.tfm diff --git a/Build/source/texk/dvipsk/testdata/upjv-r.tfm b/Build/source/texk/dvipsk/testdata/upjv-r.tfm Binary files differnew file mode 100644 index 00000000000..dddd9776408 --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjv-r.tfm diff --git a/Build/source/texk/dvipsk/testdata/upjv.tfm b/Build/source/texk/dvipsk/testdata/upjv.tfm Binary files differnew file mode 100644 index 00000000000..cb658bf11d5 --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjv.tfm diff --git a/Build/source/texk/dvipsk/testdata/upjv_full.vf b/Build/source/texk/dvipsk/testdata/upjv_full.vf Binary files differnew file mode 100644 index 00000000000..927e8053a53 --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjv_full.vf diff --git a/Build/source/texk/dvipsk/testdata/upjv_omit.vf b/Build/source/texk/dvipsk/testdata/upjv_omit.vf Binary files differnew file mode 100644 index 00000000000..716b7fafb9c --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjv_omit.vf diff --git a/Build/source/texk/dvipsk/uptex-vf.test b/Build/source/texk/dvipsk/uptex-vf.test index a8e3f83d918..27ac6e29c89 100755 --- a/Build/source/texk/dvipsk/uptex-vf.test +++ b/Build/source/texk/dvipsk/uptex-vf.test @@ -8,10 +8,12 @@ SOURCE_DATE_EPOCH=1588474800 export TEXFONTS SOURCE_DATE_EPOCH cp $srcdir/testdata/upjf_full.vf ./upjf.vf && \ +cp $srcdir/testdata/upjv_full.vf ./upjv.vf && \ ./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \ mv upjf.ps upjf_full.ps || exit 1 cp $srcdir/testdata/upjf_omit.vf ./upjf.vf && \ +cp $srcdir/testdata/upjv_omit.vf ./upjv.vf && \ ./dvips -d 4 $srcdir/testdata/upjf.dvi -o upjf.ps -u $srcdir/testdata/upjf.map && \ mv upjf.ps upjf_omit.ps || exit 2 |