From b414c3c3916bea04ae94558344de085c1aa2a567 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 30 Sep 2024 11:39:43 +0000 Subject: dvips: Add a test for upTeX new encoding git-svn-id: svn://tug.org/texlive/trunk@72409 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/tests/Makefile_upjf | 2 + Build/source/texk/dvipsk/ChangeLog | 14 +- Build/source/texk/dvipsk/Makefile.am | 18 +- Build/source/texk/dvipsk/Makefile.in | 12 +- Build/source/texk/dvipsk/testdata/Makefile_upjf | 25 +- Build/source/texk/dvipsk/testdata/upjf-c.pl | 24 + Build/source/texk/dvipsk/testdata/upjf-c.tfm | Bin 0 -> 172 bytes Build/source/texk/dvipsk/testdata/upjf.map | 2 + Build/source/texk/dvipsk/testdata/upjf2.dvi | Bin 0 -> 664 bytes Build/source/texk/dvipsk/testdata/upjf2.tex | 22 + Build/source/texk/dvipsk/testdata/upjf2_full.vf | Bin 0 -> 7268 bytes Build/source/texk/dvipsk/testdata/upjf2_full.zvp0 | 2979 +++++++++++++++++++++ Build/source/texk/dvipsk/testdata/upjv-c.pl | 25 + Build/source/texk/dvipsk/testdata/upjv-c.tfm | Bin 0 -> 172 bytes Build/source/texk/dvipsk/testdata/upjv2_full.vf | Bin 0 -> 7268 bytes Build/source/texk/dvipsk/testdata/upjv2_full.zvp0 | 2979 +++++++++++++++++++++ Build/source/texk/dvipsk/uptex-upjf2.test | 26 + 17 files changed, 6118 insertions(+), 10 deletions(-) create mode 100644 Build/source/texk/dvipsk/testdata/upjf-c.pl create mode 100644 Build/source/texk/dvipsk/testdata/upjf-c.tfm create mode 100644 Build/source/texk/dvipsk/testdata/upjf2.dvi create mode 100644 Build/source/texk/dvipsk/testdata/upjf2.tex create mode 100644 Build/source/texk/dvipsk/testdata/upjf2_full.vf create mode 100644 Build/source/texk/dvipsk/testdata/upjf2_full.zvp0 create mode 100644 Build/source/texk/dvipsk/testdata/upjv-c.pl create mode 100644 Build/source/texk/dvipsk/testdata/upjv-c.tfm create mode 100644 Build/source/texk/dvipsk/testdata/upjv2_full.vf create mode 100644 Build/source/texk/dvipsk/testdata/upjv2_full.zvp0 create mode 100755 Build/source/texk/dvipsk/uptex-upjf2.test diff --git a/Build/source/texk/dvipdfm-x/tests/Makefile_upjf b/Build/source/texk/dvipdfm-x/tests/Makefile_upjf index b3a6b9664dd..63067169cfc 100644 --- a/Build/source/texk/dvipdfm-x/tests/Makefile_upjf +++ b/Build/source/texk/dvipdfm-x/tests/Makefile_upjf @@ -41,12 +41,14 @@ upjv-r00.ofm: upjf1-r.tfm: uppltotf upjf1-r.pl +# test for different mapping upjf1_full.vf: upjf1_full.zvp0 jfmutil zvp02vf upjf1_full.zvp0 upjf1_omit.vf: upjf1_omit.zvp0 jfmutil zvp02vf upjf1_omit.zvp0 +# test for variation selector, compound character upjf2_full.vf: upjf2_full.zvp0 jfmutil zvp02vf upjf2_full.zvp0 diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog index 18a5e3873af..86b089043bc 100644 --- a/Build/source/texk/dvipsk/ChangeLog +++ b/Build/source/texk/dvipsk/ChangeLog @@ -1,6 +1,18 @@ +2024-09-30 TANAKA Takuji + + * uptex-upjf2.test, testdata/upjf2.{tex,dvi}, + testdata/upj{f,v}-c.{pl,tfm}, + testdata/upj{f,v}2_full.{vf,zvp0}, testdata/upjf.map, + testdata/Makefile_upjf, Makefile.am: + Add a test for upTeX new encoding. + https://github.com/texjporg/tex-jp-build/issues/46 + 2024-09-22 TANAKA Takuji - * {virtualfont,dopage,tfmload}.c, dvips.h: + * virtualfont.c, dvips.h: Support upTeX new encoding + for combining characters via virtual fonts. + https://github.com/texjporg/tex-jp-build/issues/46 + * {virtualfont,dopage,tfmload}.c: More strict check to interpret OFM FONTDIR as pTeX vertical writing. https://github.com/texjporg/tex-jp-build/issues/170#issuecomment-2295037307 diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am index 5b54e405977..c85f820d9aa 100644 --- a/Build/source/texk/dvipsk/Makefile.am +++ b/Build/source/texk/dvipsk/Makefile.am @@ -117,10 +117,13 @@ TESTS = test-afm2tfm.test test-afm2tfm-test.log: afm2tfm$(EXEEXT) TESTS += beginfontk1.test eepic-nan.test pfbincl.test \ quotecmd-test.pl same-name.test test-dvips.test \ - test-missing-image.test test-overflow-buffers.test uptex-vf.test + test-missing-image.test test-overflow-buffers.test \ + uptex-vf.test uptex-upjf2.test beginfontk1.log eepic-nan.log pfbincl.log \ quotecmd-test.log same-name.log test-dvips.log \ - test-overflow-buffers.log: dvips$(EXEEXT) + test-missing-image.log test-overflow-buffers.log \ + uptex-vf.log uptex-upjf2.log \ + : dvips$(EXEEXT) AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export TEXMFCNF; AM_TESTS_ENVIRONMENT += TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; @@ -165,7 +168,7 @@ DISTCLEANFILES += beginfontk1.ps EXTRA_DIST += testdata/eepic-nan.dvi testdata/eepic-nan.tex DISTCLEANFILES += eepic-nan.ps ## pfbincl.test -EXTRA_DIST += testdata/pfbincl.eps testdata/pfbincl.tex testdata/pfbincl.xdv testdata/pfbincl.xps +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 @@ -199,7 +202,14 @@ EXTRA_DIST += testdata/Makefile_upjf testdata/upjf.tex testdata/upjf.dvi testdat testdata/upjf1_full.zvp0 testdata/upjf1_full.vf \ testdata/upjf1_omit.zvp0 testdata/upjf1_omit.vf \ testdata/upjf_full.cnf testdata/upjf_omit.cnf -DISTCLEANFILES += upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm upjf*_full.ps upjf*_omit*.ps +DISTCLEANFILES += upjf.vf upjv.vf upjf-*.ofm upjv-*.ofm upjf-*.tfm \ + upjf*_full.ps upjf*_omit*.ps +## uptex-upjf2.test +EXTRA_DIST += testdata/upjf2.tex testdata/upjf2.dvi \ + testdata/upjf-c.pl testdata/upjf-c.tfm \ + testdata/upjv-c.pl testdata/upjv-c.tfm \ + testdata/upjf2_full.zvp0 testdata/upjf2_full.vf \ + testdata/upjv2_full.zvp0 testdata/upjv2_full.vf EXTRA_DIST += \ NEWS \ diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in index 61be1a42cda..f94d3db6d32 100644 --- a/Build/source/texk/dvipsk/Makefile.in +++ b/Build/source/texk/dvipsk/Makefile.in @@ -782,7 +782,11 @@ EXTRA_DIST = $(dist_prologues) texc.script $(TESTS) testdata/8r.enc \ testdata/upjv-r00.ofm testdata/upjf1-r.pl testdata/upjf1-r.tfm \ testdata/upjf1_full.zvp0 testdata/upjf1_full.vf \ testdata/upjf1_omit.zvp0 testdata/upjf1_omit.vf \ - testdata/upjf_full.cnf testdata/upjf_omit.cnf NEWS TODO \ + testdata/upjf_full.cnf testdata/upjf_omit.cnf \ + testdata/upjf2.tex testdata/upjf2.dvi testdata/upjf-c.pl \ + testdata/upjf-c.tfm testdata/upjv-c.pl testdata/upjv-c.tfm \ + testdata/upjf2_full.zvp0 testdata/upjf2_full.vf \ + testdata/upjv2_full.zvp0 testdata/upjv2_full.vf NEWS TODO \ testdata/intoverflow.dvi testdata/vfnameoverflow.dvi atari \ cmfonts.map config.ps contrib/afm-extra contrib/colorsep.lpro \ contrib/configs contrib/crop.lpr contrib/latex209 \ @@ -795,7 +799,7 @@ TEST_EXTENSIONS = .pl .test TESTS = test-afm2tfm.test beginfontk1.test eepic-nan.test pfbincl.test \ quotecmd-test.pl same-name.test test-dvips.test \ test-missing-image.test test-overflow-buffers.test \ - uptex-vf.test + uptex-vf.test uptex-upjf2.test AM_TESTS_ENVIRONMENT = TEXMFCNF=$(srcdir)/../kpathsea; export \ TEXMFCNF; TEXCONFIG=$(srcdir)/testdata; export TEXCONFIG; \ TEXFONTS=$(srcdir)/testdata; export TEXFONTS; \ @@ -2046,7 +2050,9 @@ squeeze/stamp-squeeze: test-afm2tfm-test.log: afm2tfm$(EXEEXT) beginfontk1.log eepic-nan.log pfbincl.log \ quotecmd-test.log same-name.log test-dvips.log \ - test-overflow-buffers.log: dvips$(EXEEXT) + test-missing-image.log test-overflow-buffers.log \ + uptex-vf.log uptex-upjf2.log \ + : dvips$(EXEEXT) dist-hook: cd "$(distdir)" && rm -rf $(NEVER_DIST) diff --git a/Build/source/texk/dvipsk/testdata/Makefile_upjf b/Build/source/texk/dvipsk/testdata/Makefile_upjf index a457b565a2d..a64b1e269d5 100644 --- a/Build/source/texk/dvipsk/testdata/Makefile_upjf +++ b/Build/source/texk/dvipsk/testdata/Makefile_upjf @@ -41,12 +41,26 @@ upjv-r00.ofm: upjf1-r.tfm: uppltotf upjf1-r.pl -upjf1_full.vf: +# test for different mapping +upjf1_full.vf: upjf1_full.zvp0 jfmutil zvp02vf upjf1_full.zvp0 -upjf1_omit.vf: +upjf1_omit.vf: upjf1_omit.zvp0 jfmutil zvp02vf upjf1_omit.zvp0 +# test for variation selector, compound character +upjf2_full.vf: upjf2_full.zvp0 + jfmutil zvp02vf upjf2_full.zvp0 + +upjv2_full.vf: upjv2_full.zvp0 + jfmutil zvp02vf upjv2_full.zvp0 + +upjf-c.tfm: + uppltotf upjf-c.pl + +upjv-c.tfm: + uppltotf upjv-c.pl + upjf.dvi: upjf.tex uplatex upjf.tex dvispc -a upjf.dvi upjf.dvitxt @@ -54,3 +68,10 @@ upjf.dvi: upjf.tex dvispc -x upjf.dvitxt upjf.dvi rm upjf.dvitxt +upjf2.dvi: upjf2.tex + uplatex upjf2.tex + dvispc -a upjf2.dvi upjf2.dvitxt + sed -i '/xxx/d' upjf2.dvitxt + dvispc -x upjf2.dvitxt upjf2.dvi + rm upjf2.dvitxt + diff --git a/Build/source/texk/dvipsk/testdata/upjf-c.pl b/Build/source/texk/dvipsk/testdata/upjf-c.pl new file mode 100644 index 00000000000..e76699f7a07 --- /dev/null +++ b/Build/source/texk/dvipsk/testdata/upjf-c.pl @@ -0,0 +1,24 @@ +(COMMENT THIS IS A KANJI FORMAT FILE) +(FAMILY UPJIS KANJI) +(FACE F MRR) +(CODINGSCHEME TEX KANJI TEXT) +(DESIGNSIZE R 10.0) +(COMMENT DESIGNSIZE IS IN POINTS) +(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE) +(CHECKSUM O 0) +(FONTDIMEN + (SLANT R 0.0) + (SPACE R 0.0) + (STRETCH R 0.1) + (SHRINK R 0.0) + (XHEIGHT R 1.0) + (QUAD R 1.0) + (EXTRASPACE R 0.25) + (EXTRASTRETCH R 0.2) + (EXTRASHRINK R 0.125) + ) +(TYPE O 0 + (CHARWD R 1.0) + (CHARHT R 0.88) + (CHARDP R 0.12) + ) diff --git a/Build/source/texk/dvipsk/testdata/upjf-c.tfm b/Build/source/texk/dvipsk/testdata/upjf-c.tfm new file mode 100644 index 00000000000..9a525bb5a8a Binary files /dev/null and b/Build/source/texk/dvipsk/testdata/upjf-c.tfm differ diff --git a/Build/source/texk/dvipsk/testdata/upjf.map b/Build/source/texk/dvipsk/testdata/upjf.map index 78add04a954..0261e7a9706 100644 --- a/Build/source/texk/dvipsk/testdata/upjf.map +++ b/Build/source/texk/dvipsk/testdata/upjf.map @@ -1,6 +1,8 @@ upjf-r Ryumin-Light-UniJIS-UTF16-H upjf-g GothicBBB-Medium-UniJIS-UTF16-H +upjf-c Ryumin-Light-Identity-H upjv-r Ryumin-Light-UniJIS-UTF16-V upjv-g GothicBBB-Medium-UniJIS-UTF16-V +upjv-c Ryumin-Light-Identity-V cmr10