summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-08-20 06:42:15 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-08-20 06:42:15 +0000
commit5cf1c9c9f9281b98e7307afa93bb2839f91e109f (patch)
treedb94d910d8a27d0e253efcc61008f610a239f77b
parentcf5da7c470e3fd0585f1e1bc28dc5329d8240e01 (diff)
texk/web2c/omegaware: Add a new test case
git-svn-id: svn://tug.org/texlive/trunk@34987 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/Makefile.in122
-rw-r--r--Build/source/texk/web2c/omegaware/ChangeLog6
-rw-r--r--Build/source/texk/web2c/omegaware/am/omegaware.am18
-rwxr-xr-xBuild/source/texk/web2c/omegaware/check.test28
-rw-r--r--Build/source/texk/web2c/omegaware/tests/check.ofmbin0 -> 328 bytes
-rw-r--r--Build/source/texk/web2c/omegaware/tests/check.opl66
-rw-r--r--Build/source/texk/web2c/omegaware/tests/checked.opl61
7 files changed, 234 insertions, 67 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 96046ebe9ea..cb31296d0f3 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -2203,45 +2203,46 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
omegaware/ovp2ovf.web omegaware/ovp2ovf.up \
omegaware/ovp2ovf.ch $(OTANGLE_tests) $(OMFONTS_tests) \
omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl \
- omegaware/tests/level1.opl omegaware/tests/ligall.opl \
- omegaware/tests/ligbch.opl omegaware/tests/ligbdy.opl \
- omegaware/tests/ligblb.opl omegaware/tests/ligblv.opl \
- omegaware/tests/ligblv.ovp omegaware/tests/ligloop1.ofm \
- omegaware/tests/ligloop1.opl omegaware/tests/ligloop2.opl \
- omegaware/tests/liguse.opl omegaware/tests/liguse1.opl \
- omegaware/tests/liguse2.opl omegaware/tests/ofontd1.dvi \
- omegaware/tests/ofontd1.typ omegaware/tests/ofontd2.dvi \
- omegaware/tests/ofontd2.typ omegaware/tests/ofontd3.dvi \
- omegaware/tests/ofontd3.typ omegaware/tests/ofontr1.vf \
- omegaware/tests/ofontr2.ovf omegaware/tests/ofontr3.ovf \
- omegaware/tests/ofontv4.vf omegaware/tests/ofontv5.ovf \
- omegaware/tests/ofontv6.ovf omegaware/tests/ofontd0.dtl \
- omegaware/tests/ofontd0.dvi omegaware/tests/ofontd0.typ \
- omegaware/tests/ofontr0.tfm omegaware/tests/ofontr1.tfm \
- omegaware/tests/ofontr2.ofm omegaware/tests/ofontr3.ofm \
- omegaware/tests/ofontv4.tfm omegaware/tests/ofontv5.ofm \
- omegaware/tests/ofontv6.ofm omegaware/tests/ofontr0.pl \
- omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \
- omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \
- omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \
- omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \
- omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \
- omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp \
- omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \
- omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \
- omegaware/tests/overbmp.ovp omegaware/tests/realnum.opl \
- omegaware/tests/realnum.out omegaware/tests/repeat.opl \
- omegaware/tests/repeated.opl omegaware/tests/sample.out \
- omegaware/tests/sample.ovp omegaware/tests/sample0-h.opl \
- omegaware/tests/shorten.opl omegaware/tests/specialhex.ovp \
- omegaware/tests/vrepeat0.ofm omegaware/tests/vrepeat0.opl \
- omegaware/tests/vrepeat1.ofm omegaware/tests/vrepeat1.opl \
- omegaware/tests/vrepeat1.ovf omegaware/tests/vrepeat1.ovp \
- omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp \
- $(aleph_web_srcs) $(aleph_ch_srcs) alephdir/ChangeLog \
- alephdir/aleph.defines alephdir/aleph.version $(aleph_tests) \
- synctexdir/ChangeLog synctexdir/README.txt \
- synctexdir/synctex_parser_readme.txt \
+ omegaware/tests/check.ofm omegaware/tests/check.opl \
+ omegaware/tests/checked.opl omegaware/tests/level1.opl \
+ omegaware/tests/ligall.opl omegaware/tests/ligbch.opl \
+ omegaware/tests/ligbdy.opl omegaware/tests/ligblb.opl \
+ omegaware/tests/ligblv.opl omegaware/tests/ligblv.ovp \
+ omegaware/tests/ligloop1.ofm omegaware/tests/ligloop1.opl \
+ omegaware/tests/ligloop2.opl omegaware/tests/liguse.opl \
+ omegaware/tests/liguse1.opl omegaware/tests/liguse2.opl \
+ omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
+ omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
+ omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \
+ omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \
+ omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \
+ omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf \
+ omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
+ omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
+ omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
+ omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \
+ omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm \
+ omegaware/tests/ofontr0.pl omegaware/tests/ofontr1.pl \
+ omegaware/tests/ofontr1.vpl omegaware/tests/ofontr2.opl \
+ omegaware/tests/ofontr2.ovp omegaware/tests/ofontr3.opl \
+ omegaware/tests/ofontr3.ovp omegaware/tests/ofontv4.pl \
+ omegaware/tests/ofontv4.vpl omegaware/tests/ofontv5.opl \
+ omegaware/tests/ofontv5.ovp omegaware/tests/ofontv6.opl \
+ omegaware/tests/ofontv6.ovp omegaware/tests/Cherokee.pl \
+ omegaware/tests/OCherokee.ovp omegaware/tests/inbmp.opl \
+ omegaware/tests/overbmp.opl omegaware/tests/overbmp.ovp \
+ omegaware/tests/realnum.opl omegaware/tests/realnum.out \
+ omegaware/tests/repeat.opl omegaware/tests/repeated.opl \
+ omegaware/tests/sample.out omegaware/tests/sample.ovp \
+ omegaware/tests/sample0-h.opl omegaware/tests/shorten.opl \
+ omegaware/tests/specialhex.ovp omegaware/tests/vrepeat0.ofm \
+ omegaware/tests/vrepeat0.opl omegaware/tests/vrepeat1.ofm \
+ omegaware/tests/vrepeat1.opl omegaware/tests/vrepeat1.ovf \
+ omegaware/tests/vrepeat1.ovp omegaware/tests/arabicr.pl \
+ omegaware/tests/arabic.ovp $(aleph_web_srcs) $(aleph_ch_srcs) \
+ alephdir/ChangeLog alephdir/aleph.defines \
+ alephdir/aleph.version $(aleph_tests) synctexdir/ChangeLog \
+ synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
synctexdir/synctex_parser_version.txt synctexdir/tests \
synctexdir/synctex-common.h synctexdir/synctex.c \
synctexdir/synctex.defines synctexdir/synctex.h \
@@ -2309,20 +2310,21 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
ovf2ovp.web ovp2ovf.web omegaware/tests/charwdr.* \
- omegaware/tests/charwdv.* omegaware/tests/xlevel1.* \
- omegaware/tests/xlig*.* ofont*vf omegaware/tests/xofont* \
- omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
- omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
- omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
- omegaware/tests/xinbmp* omegaware/tests/xoverbmp* ocftest.* \
- omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
- omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
- omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
- omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
- omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
- omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
- omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
- aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+ omegaware/tests/charwdv.* omegaware/tests/xcheck* \
+ omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
+ omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
+ omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
+ omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
+ omegaware/tests/xOCherokee.* omegaware/tests/xinbmp* \
+ omegaware/tests/xoverbmp* ocftest.* omegaware/tests/xrealnum.* \
+ omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
+ omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
+ omegaware/tests/xsample*.out omegaware/tests/shortend.* \
+ omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+ omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+ omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
+ $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+ aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
$(am__append_31) $(am__append_37) $(am__append_43) \
@@ -3315,13 +3317,13 @@ nodist_wovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
omegaware/otangle.test
-OMFONTS_tests = omegaware/charwd.test omegaware/level1.test \
- omegaware/ligkern.test omegaware/ofonts.test \
- omegaware/omfonts.test omegaware/overbmp.test \
- omegaware/realnum.test omegaware/repeat.test \
- omegaware/selectfont.test omegaware/shorten.test \
- omegaware/specialhex.test omegaware/vrepeat.test \
- omegaware/yannis.test
+OMFONTS_tests = omegaware/charwd.test omegaware/check.test \
+ omegaware/level1.test omegaware/ligkern.test \
+ omegaware/ofonts.test omegaware/omfonts.test \
+ omegaware/overbmp.test omegaware/realnum.test \
+ omegaware/repeat.test omegaware/selectfont.test \
+ omegaware/shorten.test omegaware/specialhex.test \
+ omegaware/vrepeat.test omegaware/yannis.test
al_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 3fdbb09902f..973c73b8c51 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * check.test, check.{ofm,opl}, checked.opl:
+ Shell script and data for a new test.
+ * am/omegaware.am: Add the new test.
+
2014-08-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* ofonts.test: Fix parallel tests.
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 2d6b5765d26..6080c46c9ba 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -99,13 +99,13 @@ DISTCLEANFILES += ovp2ovf.web
##
OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
omegaware/otangle.test
-OMFONTS_tests = omegaware/charwd.test omegaware/level1.test \
- omegaware/ligkern.test omegaware/ofonts.test \
- omegaware/omfonts.test omegaware/overbmp.test \
- omegaware/realnum.test omegaware/repeat.test \
- omegaware/selectfont.test omegaware/shorten.test \
- omegaware/specialhex.test omegaware/vrepeat.test \
- omegaware/yannis.test
+OMFONTS_tests = omegaware/charwd.test omegaware/check.test \
+ omegaware/level1.test omegaware/ligkern.test \
+ omegaware/ofonts.test omegaware/omfonts.test \
+ omegaware/overbmp.test omegaware/realnum.test \
+ omegaware/repeat.test omegaware/selectfont.test \
+ omegaware/shorten.test omegaware/specialhex.test \
+ omegaware/vrepeat.test omegaware/yannis.test
EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
if OTANGLE
@@ -115,6 +115,10 @@ endif OTANGLE
## omegaware/charwd.test
EXTRA_DIST += omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl
DISTCLEANFILES += omegaware/tests/charwdr.* omegaware/tests/charwdv.*
+## omegaware/check.test
+EXTRA_DIST += \
+ omegaware/tests/check.ofm omegaware/tests/check.opl omegaware/tests/checked.opl
+DISTCLEANFILES += omegaware/tests/xcheck*
## omegaware/level1.test
EXTRA_DIST += omegaware/tests/level1.opl
DISTCLEANFILES += omegaware/tests/xlevel1.*
diff --git a/Build/source/texk/web2c/omegaware/check.test b/Build/source/texk/web2c/omegaware/check.test
new file mode 100755
index 00000000000..461a4a25046
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/check.test
@@ -0,0 +1,28 @@
+#! /bin/sh
+
+# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+tests=omegaware/tests
+
+test -d $tests || mkdir -p $tests
+
+TEXMFCNF=$srcdir/../kpathsea
+OFMFONTS=".;./$tests"
+export TEXMFCNF OFMFONTS
+
+echo && echo "*** ofm2opl check xcheck"
+./wofm2opl $srcdir/$tests/check $tests/xcheck || exit 1
+
+echo && echo "*** diff check.opl xcheck.opl"
+diff $srcdir/$tests/check.opl $tests/xcheck.opl || exit 1
+
+echo && echo "*** opl2ofm xcheck xchecked"
+./wopl2ofm $tests/xcheck $tests/xchecked || exit 1
+
+echo && echo "*** ofm2opl xchecked xchecked"
+./wofm2opl $tests/xchecked $tests/xchecked || exit 1
+
+echo && echo "*** diff checked.opl xchecked.opl"
+diff $srcdir/$tests/checked.opl $tests/xchecked.opl || exit 1
+
diff --git a/Build/source/texk/web2c/omegaware/tests/check.ofm b/Build/source/texk/web2c/omegaware/tests/check.ofm
new file mode 100644
index 00000000000..9ae88c5aa40
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/check.ofm
Binary files differ
diff --git a/Build/source/texk/web2c/omegaware/tests/check.opl b/Build/source/texk/web2c/omegaware/tests/check.opl
new file mode 100644
index 00000000000..0dd75590250
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/check.opl
@@ -0,0 +1,66 @@
+(OFMLEVEL H 0)
+(FONTDIR TL)
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME CHECKING TEST: NOT A REAL FONT)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 1A78D100)
+(SEVENBITSAFEFLAG FALSE)
+(LIGTABLE
+ (LABEL H 41)
+ (LIG H 41 H 44)
+ (LIG/ H 42 H 44)
+ (/LIG H 43 H 44)
+ (STOP)
+ (LABEL H 42)
+ (/LIG/ H 41 H 44)
+ (LIG/> H 42 H 44)
+ (/LIG> H 43 H 44)
+ (STOP)
+ (LABEL H 43)
+ (/LIG/> H 41 H 44)
+ (/LIG/>> H 42 H 44)
+ (KRN H 43 R 0.125)
+ (STOP)
+ (COMMENT THIS PART OF THE PROGRAM IS NEVER USED!
+ (KRN H 41 R 0.25)
+ (KRN H 42 R 0.0)
+ (KRN H 43 R 0.5)
+ )
+ )
+(CHARACTER H 41
+ (COMMENT
+ (LIG H 41 H 44)
+ (LIG/ H 42 H 44)
+ (/LIG H 43 H 44)
+ )
+ )
+(CHARACTER H 42
+ (CHARWD R 0.125)
+ (COMMENT
+ (/LIG/ H 41 H 44)
+ (LIG/> H 42 H 44)
+ (/LIG> H 43 H 44)
+ )
+ )
+(CHARACTER H 43
+ (CHARWD R 0.25)
+ (COMMENT
+ (/LIG/> H 41 H 44)
+ (/LIG/>> H 42 H 44)
+ (KRN H 43 R 0.125)
+ )
+ )
+(CHARACTER H 44
+ (CHARWD R 0.5)
+ )
+(CHARACTER H 45
+ (CHARWD R 0.5)
+ (NEXTLARGER H 46)
+ )
+(CHARACTER H 46
+ (CHARWD R 0.5)
+ )
+(COMMENT THE OFM FILE WAS BAD, SO THE DATA HAS BEEN CHANGED!)
diff --git a/Build/source/texk/web2c/omegaware/tests/checked.opl b/Build/source/texk/web2c/omegaware/tests/checked.opl
new file mode 100644
index 00000000000..cbb1c698f85
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/checked.opl
@@ -0,0 +1,61 @@
+(OFMLEVEL H 0)
+(FONTDIR TL)
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME CHECKING TEST: NOT A REAL FONT)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 1A78D100)
+(SEVENBITSAFEFLAG FALSE)
+(LIGTABLE
+ (LABEL H 41)
+ (LIG H 41 H 44)
+ (LIG/ H 42 H 44)
+ (/LIG H 43 H 44)
+ (STOP)
+ (LABEL H 42)
+ (/LIG/ H 41 H 44)
+ (LIG/> H 42 H 44)
+ (/LIG> H 43 H 44)
+ (STOP)
+ (LABEL H 43)
+ (/LIG/> H 41 H 44)
+ (/LIG/>> H 42 H 44)
+ (KRN H 43 R 0.125)
+ (STOP)
+ )
+(CHARACTER H 41
+ (CHARWD R 0.0)
+ (COMMENT
+ (LIG H 41 H 44)
+ (LIG/ H 42 H 44)
+ (/LIG H 43 H 44)
+ )
+ )
+(CHARACTER H 42
+ (CHARWD R 0.125)
+ (COMMENT
+ (/LIG/ H 41 H 44)
+ (LIG/> H 42 H 44)
+ (/LIG> H 43 H 44)
+ )
+ )
+(CHARACTER H 43
+ (CHARWD R 0.25)
+ (COMMENT
+ (/LIG/> H 41 H 44)
+ (/LIG/>> H 42 H 44)
+ (KRN H 43 R 0.125)
+ )
+ )
+(CHARACTER H 44
+ (CHARWD R 0.5)
+ )
+(CHARACTER H 45
+ (CHARWD R 0.5)
+ (NEXTLARGER H 46)
+ )
+(CHARACTER H 46
+ (CHARWD R 0.5)
+ )