summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-02-07 13:25:35 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-02-07 13:25:35 +0000
commit069919cbedf158ce36849e9847fb1a0a220b6975 (patch)
tree27ed84626b70db4cd02231a6e4bc206000e086fb
parent1ba6a9ba7ed37f67faa64952fc21c317f6c5f27e (diff)
dviout-util: new tests
git-svn-id: svn://tug.org/texlive/trunk@49969 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dviout-util/ChangeLog1
-rw-r--r--Build/source/texk/dviout-util/Makefile.am12
-rw-r--r--Build/source/texk/dviout-util/Makefile.in9
-rwxr-xr-xBuild/source/texk/dviout-util/chkdvifont.test13
-rw-r--r--Build/source/texk/dviout-util/tests/skipjfmp.cfn9
-rw-r--r--Build/source/texk/dviout-util/tests/skipjfmp.tfmbin0 -> 632 bytes
-rw-r--r--Build/source/texk/dviout-util/tests/uparse.cfn9
-rw-r--r--Build/source/texk/dviout-util/tests/uparse.tfmbin0 -> 272 bytes
-rw-r--r--Build/source/texk/dviout-util/tests/upphirakakuw3-h.cfn9
-rw-r--r--Build/source/texk/dviout-util/tests/upphirakakuw3-h.tfmbin0 -> 4104 bytes
-rw-r--r--Build/source/texk/dviout-util/tests/upphirakakuw6-h.cfn7
-rw-r--r--Build/source/texk/dviout-util/tests/upphirakakuw6-h.tfmbin0 -> 3880 bytes
12 files changed, 63 insertions, 6 deletions
diff --git a/Build/source/texk/dviout-util/ChangeLog b/Build/source/texk/dviout-util/ChangeLog
index 2393455bb28..6a655abf6ac 100644
--- a/Build/source/texk/dviout-util/ChangeLog
+++ b/Build/source/texk/dviout-util/ChangeLog
@@ -3,6 +3,7 @@
* chkdvifont.c: Detect new JFM spec.
* chkdvifont.man, dvispc.man: Add fallback TeX and LaTeX logos.
* configure.ac: Version 20190206.
+ * Makefile.am: Adjusted for new tests.
2018-11-25 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
diff --git a/Build/source/texk/dviout-util/Makefile.am b/Build/source/texk/dviout-util/Makefile.am
index 8aab6bd3cc0..b40d7b9ee35 100644
--- a/Build/source/texk/dviout-util/Makefile.am
+++ b/Build/source/texk/dviout-util/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/dviout-util/
##
-## Copyright (C) 2018 Japanese TeX Development Community <issue@texjp.org>
+## Copyright (C) 2018-2019 Japanese TeX Development Community <issue@texjp.org>
## You may freely use, modify and/or distribute this file.
##
AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC
@@ -64,8 +64,14 @@ EXTRA_DIST += tests/oldindep.cfn \
tests/jis.tfm tests/jis.cfn \
tests/eufm10.tfm tests/eufm10.cfn \
tests/cmr10.pk tests/cmr10.cfn \
- tests/upjisr-h.vf tests/upsjir-h.cfn
+ tests/upjisr-h.vf tests/upsjir-h.cfn \
+ tests/uparse.tfm tests/uparse.cfn \
+ tests/skipjfmp.tfm tests/skipjfmp.cfn \
+ tests/upphirakakuw3-h.tfm tests/upphirakakuw3-h.cfn \
+ tests/upphirakakuw6-h.tfm tests/upphirakakuw6-h.cfn
DISTCLEANFILES += oldindep.dvi xoldindep.cfn \
xjis.cfn xeufm10.cfn xeufm10.ed.cfn \
- xcmr10.cfn xupjisr-h.cfn
+ xcmr10.cfn xupjisr-h.cfn \
+ xuparse.cfn xskipjfmp.cfn \
+ xupp3-h.cfn xupp6-h.cfn
diff --git a/Build/source/texk/dviout-util/Makefile.in b/Build/source/texk/dviout-util/Makefile.in
index 4b7bfc74a78..fa6ced8930e 100644
--- a/Build/source/texk/dviout-util/Makefile.in
+++ b/Build/source/texk/dviout-util/Makefile.in
@@ -572,13 +572,18 @@ EXTRA_DIST = $(TESTS) tests/oldindep.spc tests/oldindep.tex \
tests/longspec.dvi tests/flatnest.tex tests/flatnest.dvi \
tests/oldindep.cfn tests/jis.tfm tests/jis.cfn \
tests/eufm10.tfm tests/eufm10.cfn tests/cmr10.pk \
- tests/cmr10.cfn tests/upjisr-h.vf tests/upsjir-h.cfn
+ tests/cmr10.cfn tests/upjisr-h.vf tests/upsjir-h.cfn \
+ tests/uparse.tfm tests/uparse.cfn tests/skipjfmp.tfm \
+ tests/skipjfmp.cfn tests/upphirakakuw3-h.tfm \
+ tests/upphirakakuw3-h.cfn tests/upphirakakuw6-h.tfm \
+ tests/upphirakakuw6-h.cfn
DISTCLEANFILES = x*oldindep.spc x*oldindepa.txt x*oldindepax.dvi \
x*oldindep.dry x*oldindepout.dvi x*underout.dvi x*tpicpn.dry \
x*tpicpnout.dvi x*tpicsh.dry x*reverse.dry x*reverseout.dvi \
x*first.dry x*firstout.dvi x*firstpn.dry x*write.dvi \
x*writeout.dvi oldindep.dvi xoldindep.cfn xjis.cfn xeufm10.cfn \
- xeufm10.ed.cfn xcmr10.cfn xupjisr-h.cfn
+ xeufm10.ed.cfn xcmr10.cfn xupjisr-h.cfn xuparse.cfn \
+ xskipjfmp.cfn xupp3-h.cfn xupp6-h.cfn
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/dviout-util/chkdvifont.test b/Build/source/texk/dviout-util/chkdvifont.test
index 0aca12ee579..4d8faf2548b 100755
--- a/Build/source/texk/dviout-util/chkdvifont.test
+++ b/Build/source/texk/dviout-util/chkdvifont.test
@@ -40,13 +40,24 @@ cp $testdir/oldindep.dvi . && \
echo M | ./chkdvifont && echo || exit 0
-# VF format is not supported by old version written by SHIMA.
+# the following tests will not pass for old version written by SHIMA.
# that version can be distinguished from the new version by
# exit code 250 for usage with stdin M. (the above line did it!)
+# check VF format
./chkdvifont -c $testdir/upjisr-h.vf > xupjisr-h.cfn && \
diff $diffoptCRLF $testdir/upjisr-h.cfn xupjisr-h.cfn && echo || exit 5
+# detect new JFM format
+./chkdvifont -c $testdir/uparse.tfm > xuparse.cfn && \
+ diff $diffoptCRLF $testdir/uparse.cfn xuparse.cfn && echo || exit 6
+./chkdvifont -c $testdir/skipjfmp.tfm > xskipjfmp.cfn && \
+ diff $diffoptCRLF $testdir/skipjfmp.cfn xskipjfmp.cfn && echo || exit 7
+./chkdvifont -c $testdir/upphirakakuw3-h.tfm > xupp3-h.cfn && \
+ diff $diffoptCRLF $testdir/upphirakakuw3-h.cfn xupp3-h.cfn && echo || exit 8
+./chkdvifont -c $testdir/upphirakakuw6-h.tfm > xupp6-h.cfn && \
+ diff $diffoptCRLF $testdir/upphirakakuw6-h.cfn xupp6-h.cfn && echo || exit 9
+
exit 0
diff --git a/Build/source/texk/dviout-util/tests/skipjfmp.cfn b/Build/source/texk/dviout-util/tests/skipjfmp.cfn
new file mode 100644
index 00000000000..7751a84b802
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/skipjfmp.cfn
@@ -0,0 +1,9 @@
+ "skipjfmp" is a jfm file : 0 -> 6
+ New features in pTeX p3.8.0 / JFM 2.0:
+ + SKIP command in glue_kern
+ checksum = 00000000
+ design size = 10485760 2^{-20} points = 10 points
+
+
+EXIT Code (errorlevel) = 0
+No AMS Font
diff --git a/Build/source/texk/dviout-util/tests/skipjfmp.tfm b/Build/source/texk/dviout-util/tests/skipjfmp.tfm
new file mode 100644
index 00000000000..1b6c4f18d07
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/skipjfmp.tfm
Binary files differ
diff --git a/Build/source/texk/dviout-util/tests/uparse.cfn b/Build/source/texk/dviout-util/tests/uparse.cfn
new file mode 100644
index 00000000000..36f287e6076
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/uparse.cfn
@@ -0,0 +1,9 @@
+ "uparse" is a jfm file : 0 -> 6
+ New features in pTeX p3.8.0 / JFM 2.0:
+ + 3-byte kanji code
+ checksum = 00000000
+ design size = 10485760 2^{-20} points = 10 points
+
+
+EXIT Code (errorlevel) = 0
+No AMS Font
diff --git a/Build/source/texk/dviout-util/tests/uparse.tfm b/Build/source/texk/dviout-util/tests/uparse.tfm
new file mode 100644
index 00000000000..88d1ec39291
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/uparse.tfm
Binary files differ
diff --git a/Build/source/texk/dviout-util/tests/upphirakakuw3-h.cfn b/Build/source/texk/dviout-util/tests/upphirakakuw3-h.cfn
new file mode 100644
index 00000000000..0f9f25f9815
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/upphirakakuw3-h.cfn
@@ -0,0 +1,9 @@
+ "upphirakakuw3-h" is a jfm file : 0 -> 130
+ New features in pTeX p3.8.0 / JFM 2.0:
+ + rearrangement in glue_kern
+ checksum = 00000000
+ design size = 10485760 2^{-20} points = 10 points
+
+
+EXIT Code (errorlevel) = 0
+No AMS Font
diff --git a/Build/source/texk/dviout-util/tests/upphirakakuw3-h.tfm b/Build/source/texk/dviout-util/tests/upphirakakuw3-h.tfm
new file mode 100644
index 00000000000..68f85022443
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/upphirakakuw3-h.tfm
Binary files differ
diff --git a/Build/source/texk/dviout-util/tests/upphirakakuw6-h.cfn b/Build/source/texk/dviout-util/tests/upphirakakuw6-h.cfn
new file mode 100644
index 00000000000..041e789cc04
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/upphirakakuw6-h.cfn
@@ -0,0 +1,7 @@
+ "upphirakakuw6-h" is a jfm file : 0 -> 119
+ checksum = 00000000
+ design size = 10485760 2^{-20} points = 10 points
+
+
+EXIT Code (errorlevel) = 0
+No AMS Font
diff --git a/Build/source/texk/dviout-util/tests/upphirakakuw6-h.tfm b/Build/source/texk/dviout-util/tests/upphirakakuw6-h.tfm
new file mode 100644
index 00000000000..dadf10e3a33
--- /dev/null
+++ b/Build/source/texk/dviout-util/tests/upphirakakuw6-h.tfm
Binary files differ