ovp2ovf & Co: Bug fix and new test case

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

6 files changed, 123 insertions, 2 deletions

diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 324ffe226e3..42838ba68f3 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* selectfont.test, tests/sample.out, tests/sample.ovp,
+	tests/sample0-h.opl (new): Shell script and data for a new test.
+	* am/omegaware.am: Add the new test.
+
 2011-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Avoid 'differ in signedness' warnings.
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index f7bb2e19897..b01ee06f7d3 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -1,6 +1,6 @@
 ## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
 ##
-## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
 omegaware_tools = odvicopy odvitype otangle
@@ -97,7 +97,7 @@ OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
 	omegaware/otangle.test
 OMFONTS_tests = omegaware/level1.test omegaware/ofonts.test \
 	omegaware/omfonts.test omegaware/repeat.test \
-	omegaware/specialhex.test
+	omegaware/selectfont.test omegaware/specialhex.test
 EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
 
 if OTANGLE
@@ -144,6 +144,11 @@ DISTCLEANFILES += cftest.p
 ## omegaware/repeat.test
 EXTRA_DIST += omegaware/tests/repeat.opl omegaware/tests/repeated.opl
 DISTCLEANFILES += omegaware/tests/xrepeated.*
+## omegaware/selectfont.test
+EXTRA_DIST += omegaware/tests/sample.out omegaware/tests/sample.ovp \
+	omegaware/tests/sample0-h.opl
+DISTCLEANFILES += omegaware/tests/sample*.ofm omegaware/tests/sample.ovf \
+	omegaware/tests/sample1-h.opl omegaware/tests/xsample.out
 ## omegaware/specialhex.test
 EXTRA_DIST += omegaware/tests/specialhex.ovp
 DISTCLEANFILES += omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
diff --git a/Build/source/texk/web2c/omegaware/selectfont.test b/Build/source/texk/web2c/omegaware/selectfont.test
new file mode 100755
index 00000000000..15f2193ace8
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/selectfont.test
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# Copyright (C) 2011 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
+
+./opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || exit 1
+
+./opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || exit 1
+
+./ofm2opl -verbose sample1-h $tests/sample1-h || exit 1
+
+diff $srcdir/$tests/sample0-h.opl $tests/sample1-h.opl || exit 1
+
+./ovp2ovf -verbose $srcdir/$tests/sample $tests/sample $tests/sample || exit 1
+
+./ovf2ovp -verbose $tests/sample sample $tests/xsample.out  || exit 1
+
+diff $srcdir/$tests/sample.out $tests/xsample.out || exit 1
+
diff --git a/Build/source/texk/web2c/omegaware/tests/sample.out b/Build/source/texk/web2c/omegaware/tests/sample.out
new file mode 100644
index 00000000000..239d6143da4
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/sample.out
@@ -0,0 +1,36 @@
+(VTITLE JVF for SAMPLE)
+(OFMLEVEL H 0)
+(FONTDIR TL)
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 16497D66)
+(SEVENBITSAFEFLAG FALSE)
+(MAPFONT D 0
+   (FONTNAME sample0-h)
+   (FONTCHECKSUM H 11AB1731)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(MAPFONT D 1
+   (FONTNAME sample1-h)
+   (FONTCHECKSUM H 11AB1731)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(CHARACTER H 2121
+   (CHARWD R 1.0)
+   (MAP
+      (SETCHAR H 0)
+      )
+   )
+(CHARACTER H 2122
+   (CHARWD R 1.0)
+   (MAP
+      (SELECTFONT D 1)
+      (SETCHAR H 0)
+      )
+   )
diff --git a/Build/source/texk/web2c/omegaware/tests/sample.ovp b/Build/source/texk/web2c/omegaware/tests/sample.ovp
new file mode 100644
index 00000000000..0293ac4ca88
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/sample.ovp
@@ -0,0 +1,36 @@
+(VTITLE JVF for SAMPLE)
+(OFMLEVEL H 0)
+(FONTDIR TL)
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 16497D66)
+(SEVENBITSAFEFLAG FALSE)
+(MAPFONT D 0
+   (FONTNAME sample0-h)
+   (FONTCHECKSUM H 11AB1731)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(MAPFONT D 2
+   (FONTNAME sample1-h)
+   (FONTCHECKSUM H 11AB1731)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(CHARACTER H 2121
+   (CHARWD R 1.0)
+   (MAP
+      (SETCHAR H 0)
+      )
+   )
+(CHARACTER H 2122
+   (CHARWD R 1.0)
+   (MAP
+      (SELECTFONT D 2)
+      (SETCHAR H 0)
+      )
+   )
diff --git a/Build/source/texk/web2c/omegaware/tests/sample0-h.opl b/Build/source/texk/web2c/omegaware/tests/sample0-h.opl
new file mode 100644
index 00000000000..cdaaecd760f
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/sample0-h.opl
@@ -0,0 +1,11 @@
+(FAMILY UNSPECIFIED)
+(FACE F MRR)
+(CODINGSCHEME UNSPECIFIED)
+(DESIGNSIZE R 10.0)
+(COMMENT DESIGNSIZE IS IN POINTS)
+(COMMENT OTHER SIZES ARE MULTIPLES OF DESIGNSIZE)
+(CHECKSUM H 11AB1731)
+(SEVENBITSAFEFLAG TRUE)
+(CHARACTER H 0
+   (CHARWD R 1.0)
+   )