texk/web2c: Drop configure option '--disable-omfonts'

omegaware: Always build wofm2opl&Co, more tests
omegafonts: Allow char codes from Supplementary Unicode Planes

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

15 files changed, 168 insertions, 76 deletions

diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 8e91f067725..9179924aebe 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,13 @@
+2014-07-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/omegaware.am: Drop Automake conditional OMFONTS.
+	Always build and test wofm2opl&Co (instead of ofm2opl&Co).
+	* level1.test, ofonts.test, omfonts.test, overbmp.test,
+	realnum.test, repeat.test, selectfont.test, specialhex.test:
+	Adapted.
+	* charwd.test, tests/charwd-r.pl, tests/charwd-v.vpl (new):
+	Shell script and data for a new test.
+
 2014-05-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* odvicopy.ch, odvicopy.web: Fixed a non-Web2C bug and several
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 3c267bf1521..a9339fb9bf6 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -3,15 +3,10 @@
 ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
-omegaware_tools = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
-omegaware_font_tools = ofm2opl opl2ofm ovf2ovp ovp2ovf
-omegaware_programs = $(omegaware_tools) $(omegaware_font_tools)
+omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
 
 if OTANGLE
-bin_PROGRAMS += $(omegaware_tools)
-if !OMFONTS
-bin_PROGRAMS += $(omegaware_font_tools)
-endif !OMFONTS
+bin_PROGRAMS += $(omegaware_programs)
 endif OTANGLE
 EXTRA_PROGRAMS += $(omegaware_programs)
 
@@ -42,7 +37,6 @@ odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch
 odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
 	$(tangle_silent)$(ow_tangle) odvitype odvitype
 
-nodist_ofm2opl_SOURCES = ofm2opl.c ofm2opl.h
 nodist_wofm2opl_SOURCES = ofm2opl.c ofm2opl.h
 ofm2opl.c ofm2opl.h: ofm2opl-web2c
 	@$(web2c) ofm2opl
@@ -55,7 +49,6 @@ ofm2opl.web: tie$(EXEEXT) omegaware/ofm2opl.web omegaware/ofm2opl.up
 EXTRA_DIST += omegaware/ofm2opl.web omegaware/ofm2opl.up omegaware/ofm2opl.ch
 DISTCLEANFILES += ofm2opl.web
 
-nodist_opl2ofm_SOURCES = opl2ofm.c opl2ofm.h
 nodist_wopl2ofm_SOURCES = opl2ofm.c opl2ofm.h
 opl2ofm.c opl2ofm.h: opl2ofm-web2c
 	@$(web2c) opl2ofm
@@ -78,7 +71,6 @@ otangle_sources = omegaware/otangle.web omegaware/otangle.ch
 otangle.p: tangle$(EXEEXT) $(otangle_sources)
 	$(tangle_silent)$(ow_tangle) otangle otangle
 
-nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
 nodist_wovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
 ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
 	@$(web2c) ovf2ovp
@@ -91,7 +83,6 @@ ovf2ovp.web: tie$(EXEEXT) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
 EXTRA_DIST += omegaware/ovf2ovp.web omegaware/ovf2ovp.up omegaware/ovf2ovp.ch
 DISTCLEANFILES += ovf2ovp.web
 	
-nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
 nodist_wovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
 ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
 	@$(web2c) ovp2ovf
@@ -108,20 +99,20 @@ DISTCLEANFILES += ovp2ovf.web
 ##
 OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
 	omegaware/otangle.test
-OMFONTS_tests = omegaware/level1.test omegaware/ofonts.test \
-	omegaware/omfonts.test omegaware/overbmp.test\
+OMFONTS_tests = omegaware/charwd.test omegaware/level1.test omegaware/ofonts.test \
+	omegaware/omfonts.test omegaware/overbmp.test \
 	omegaware/realnum.test omegaware/repeat.test \
 	omegaware/selectfont.test omegaware/specialhex.test \
 	omegaware/vrepeat.test
 EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
 
 if OTANGLE
-TESTS += $(OTANGLE_tests)
-if !OMFONTS
-TESTS += $(OMFONTS_tests)
-endif !OMFONTS
+TESTS += $(OTANGLE_tests) $(OMFONTS_tests)
 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/level1.test
 EXTRA_DIST += omegaware/tests/level1.opl
 DISTCLEANFILES += omegaware/tests/xlevel1.ofm omegaware/tests/xlevel1.opl
diff --git a/Build/source/texk/web2c/omegaware/charwd.test b/Build/source/texk/web2c/omegaware/charwd.test
new file mode 100755
index 00000000000..3db3e360fc8
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/charwd.test
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+# Copyright (C) 2010-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
+
+grep -v 'CHARWD R' $srcdir/$tests/charwd-r.pl >$tests/charwdr.pl
+
+TEXMFCNF=$srcdir/../kpathsea \
+  ./wopl2ofm -verbose $tests/charwdr.pl $tests/charwdr.tfm || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  OFMFONTS=.:$tests \
+  ./wofm2opl -verbose $tests/charwdr.tfm $tests/charwdr.xpl || exit 1
+
+diff $srcdir/$tests/charwd-r.pl $tests/charwdr.xpl || exit 1
+
+grep -v 'CHARWD R' $srcdir/$tests/charwd-v.vpl >$tests/charwdv.vpl
+
+TEXMFCNF=$srcdir/../kpathsea \
+  ./wovp2ovf -verbose $tests/charwdv.vpl $tests/charwdv.vf $tests/charwdv.tfm || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  OFMFONTS=.:$tests \
+  ./wofm2opl -verbose $tests/charwdr.tfm $tests/charwdr.xpl || exit 1
+
+diff $srcdir/$tests/charwd-r.pl $tests/charwdr.xpl || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea \
+  OFMFONTS=.:$tests \
+  VFFONTS=$tests \
+  ./wovf2ovp -verbose $tests/charwdv.vf $tests/charwdv.tfm $tests/charwdv.xpl || exit 1
+
+diff $srcdir/$tests/charwd-v.vpl $tests/charwdv.xpl || exit 1
+
diff --git a/Build/source/texk/web2c/omegaware/level1.test b/Build/source/texk/web2c/omegaware/level1.test
index ed40ebde855..4273fcb4286 100755
--- a/Build/source/texk/web2c/omegaware/level1.test
+++ b/Build/source/texk/web2c/omegaware/level1.test
@@ -1,16 +1,16 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-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
 
-./opl2ofm -verbose $srcdir/$tests/level1 $tests/xlevel1 || exit 1
+./wopl2ofm -verbose $srcdir/$tests/level1 $tests/xlevel1 || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/xlevel1 $tests/xlevel1 || exit 1
+  ./wofm2opl -verbose $tests/xlevel1 $tests/xlevel1 || exit 1
 
 diff $srcdir/$tests/level1.opl $tests/xlevel1.opl || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/ofonts.test b/Build/source/texk/web2c/omegaware/ofonts.test
index 9cdad045234..0b3b928913d 100755
--- a/Build/source/texk/web2c/omegaware/ofonts.test
+++ b/Build/source/texk/web2c/omegaware/ofonts.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 tests=omegaware/tests
@@ -11,47 +11,47 @@ VPL='ofontr1 ofontv4'
 OVP='ofontr2 ofontr3 ofontv5 ofontv6'
 
 for f in $VPL; do
-  ./opl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
+  ./wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
-    ./ofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
+    ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
   diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
 done
 
 for f in $OVP; do
-  ./opl2ofm -verbose $srcdir/$tests/$f $tests/x$f || exit 1
+  ./wopl2ofm -verbose $srcdir/$tests/$f $tests/x$f || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
-    ./ofm2opl -verbose $tests/x$f $tests/x$f || exit 1
+    ./wofm2opl -verbose $tests/x$f $tests/x$f || exit 1
   diff $srcdir/$tests/$f.opl $tests/x$f.opl || exit 1
 done
 
 rm -rf $tests/xofont*
 
 for f in ofontr0; do
-  ./opl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
+  ./wopl2ofm -verbose $srcdir/$tests/$f.pl $tests/x$f.tfm || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
-    ./ofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
+    ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
   diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
 done
 
 for f in $VPL; do
-  ./ovp2ovf -verbose $srcdir/$tests/$f.vpl $tests/x$f.vf $tests/x$f.tfm || exit 1
+  ./wovp2ovf -verbose $srcdir/$tests/$f.vpl $tests/x$f.vf $tests/x$f.tfm || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
-    ./ofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
+    ./wofm2opl -verbose $tests/x$f.tfm $tests/x$f.pl || exit 1
   diff $srcdir/$tests/$f.pl $tests/x$f.pl || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
     OFMFONTS=.:$srcdir/$tests \
-    ./ovf2ovp -verbose $tests/x$f.vf $tests/x$f.tfm $tests/x$f.vpl || exit 1
+    ./wovf2ovp -verbose $tests/x$f.vf $tests/x$f.tfm $tests/x$f.vpl || exit 1
   diff $srcdir/$tests/$f.vpl $tests/x$f.vpl || exit 1
 done
 
 for f in $OVP; do
-  ./ovp2ovf -verbose $srcdir/$tests/$f $tests/x$f $tests/x$f || exit 1
+  ./wovp2ovf -verbose $srcdir/$tests/$f $tests/x$f $tests/x$f || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
-    ./ofm2opl -verbose $tests/x$f $tests/x$f || exit 1
+    ./wofm2opl -verbose $tests/x$f $tests/x$f || exit 1
   diff $srcdir/$tests/$f.opl $tests/x$f.opl || exit 1
   TEXMFCNF=$srcdir/../kpathsea \
     OFMFONTS=.:$srcdir/$tests \
-    ./ovf2ovp -verbose $tests/x$f $tests/x$f $tests/x$f || exit 1
+    ./wovf2ovp -verbose $tests/x$f $tests/x$f $tests/x$f || exit 1
   diff $srcdir/$tests/$f.ovp $tests/x$f.ovp || exit 1
 done
 
diff --git a/Build/source/texk/web2c/omegaware/omfonts.test b/Build/source/texk/web2c/omegaware/omfonts.test
index 38fafef64a2..1fda20aef63 100755
--- a/Build/source/texk/web2c/omegaware/omfonts.test
+++ b/Build/source/texk/web2c/omegaware/omfonts.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 tests=omegaware/tests
@@ -16,21 +16,21 @@ diff $srcdir/$tests/Cherokee.pl $tests/xCherokee.pl || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=./$tests \
-  ./ovp2ovf -verbose $srcdir/$tests/OCherokee $tests/OCherokee $tests/OCherokee || exit 1
+  ./wovp2ovf -verbose $srcdir/$tests/OCherokee $tests/OCherokee $tests/OCherokee || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/OCherokee $tests/OCherokee || exit 1
+  ./wofm2opl -verbose $tests/OCherokee $tests/OCherokee || exit 1
 
-./opl2ofm -verbose $tests/OCherokee $tests/xOCherokee || exit 1
+./wopl2ofm -verbose $tests/OCherokee $tests/xOCherokee || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/xOCherokee $tests/xOCherokee || exit 1
+  ./wofm2opl -verbose $tests/xOCherokee $tests/xOCherokee || exit 1
 
 diff $tests/OCherokee.opl $tests/xOCherokee.opl || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=.:./$tests \
-  ./ovf2ovp -verbose $tests/OCherokee $tests/OCherokee $tests/xOCherokee || exit 1
+  ./wovf2ovp -verbose $tests/OCherokee $tests/OCherokee $tests/xOCherokee || exit 1
 
 diff $srcdir/$tests/OCherokee.ovp $tests/xOCherokee.ovp || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/overbmp.test b/Build/source/texk/web2c/omegaware/overbmp.test
index 6a9c0dcab02..7c8bfb10cf9 100755
--- a/Build/source/texk/web2c/omegaware/overbmp.test
+++ b/Build/source/texk/web2c/omegaware/overbmp.test
@@ -11,42 +11,42 @@ TEXMFCNF=$srcdir/../kpathsea
 OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./opl2ofm -verbose $srcdir/$tests/inbmp $tests/xinbmp || exit 1
+./wopl2ofm -verbose $srcdir/$tests/inbmp $tests/xinbmp || exit 1
 
-./ofm2opl -verbose xinbmp $tests/xinbmp || exit 1
+./wofm2opl -verbose xinbmp $tests/xinbmp || exit 1
 
 diff $srcdir/$tests/inbmp.opl $tests/xinbmp.opl || exit 1
 
-./ovp2ovf -verbose $srcdir/$tests/overbmp.ovp $tests/xoverbmp || exit 1
+./wovp2ovf -verbose $srcdir/$tests/overbmp.ovp $tests/xoverbmp || exit 1
 
-./ofm2opl -verbose xoverbmp $tests/xoverbmp || exit 1
+./wofm2opl -verbose xoverbmp $tests/xoverbmp || exit 1
 
 diff $srcdir/$tests/overbmp.opl $tests/xoverbmp.opl || exit 1
 
-./ovf2ovp -verbose $tests/xoverbmp xoverbmp $tests/xoverbmp.ovp || exit 1
+./wovf2ovp -verbose $tests/xoverbmp xoverbmp $tests/xoverbmp.ovp || exit 1
 
 diff $srcdir/$tests/overbmp.ovp $tests/xoverbmp.ovp || exit 1
 
 sed -e '/OFMLEVEL/s/H 0/H 1/' $tests/xinbmp.opl >$tests/xinbmp1.opl
 
-./opl2ofm -verbose $tests/xinbmp1 $tests/xinbmp1 || exit 1
+./wopl2ofm -verbose $tests/xinbmp1 $tests/xinbmp1 || exit 1
 
-./ofm2opl -verbose xinbmp1 $tests/xinbmp2 || exit 1
+./wofm2opl -verbose xinbmp1 $tests/xinbmp2 || exit 1
 
 diff $tests/xinbmp1.opl $tests/xinbmp1.opl || exit 1
 
 sed -e '/OFMLEVEL/s/H 1/H 0/' -e 's/xinbmp)/xinbmp1)/;s/xoverbmp)/xoverbmp1)/' \
 	$tests/xoverbmp.ovp >$tests/xoverbmp1.ovp
 
-./ovp2ovf -verbose $tests/xoverbmp1.ovp $tests/xoverbmp1 || exit 1
+./wovp2ovf -verbose $tests/xoverbmp1.ovp $tests/xoverbmp1 || exit 1
 
 sed -e '/OFMLEVEL/s/H 1/H 0/' $tests/xoverbmp.opl >$tests/xoverbmp1.opl
 
-./ofm2opl -verbose xoverbmp1 $tests/xoverbmp2 || exit 1
+./wofm2opl -verbose xoverbmp1 $tests/xoverbmp2 || exit 1
 
 diff $tests/xoverbmp1.opl $tests/xoverbmp2.opl || exit 1
 
-./ovf2ovp -verbose $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || exit 1
+./wovf2ovp -verbose $tests/xoverbmp1 xoverbmp1 $tests/xoverbmp2 || exit 1
 
 diff $tests/xoverbmp1.ovp $tests/xoverbmp2.ovp || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/realnum.test b/Build/source/texk/web2c/omegaware/realnum.test
index d0ea71e6e2d..2d119afe755 100755
--- a/Build/source/texk/web2c/omegaware/realnum.test
+++ b/Build/source/texk/web2c/omegaware/realnum.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 tests=omegaware/tests
@@ -11,9 +11,9 @@ TEXMFCNF=$srcdir/../kpathsea
 OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./opl2ofm -verbose $srcdir/$tests/realnum $tests/xrealnum || exit 1
+./wopl2ofm -verbose $srcdir/$tests/realnum $tests/xrealnum || exit 1
 
-./ofm2opl -verbose xrealnum $tests/xrealnum || exit 1
+./wofm2opl -verbose xrealnum $tests/xrealnum || exit 1
 
 diff $srcdir/$tests/realnum.out $tests/xrealnum.opl || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/repeat.test b/Build/source/texk/web2c/omegaware/repeat.test
index 157ce1ac91b..a0af94bbf0d 100755
--- a/Build/source/texk/web2c/omegaware/repeat.test
+++ b/Build/source/texk/web2c/omegaware/repeat.test
@@ -1,16 +1,16 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-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
 
-./opl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
+./wopl2ofm -verbose $srcdir/$tests/repeat $tests/xrepeated || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 1
+  ./wofm2opl -verbose $tests/xrepeated $tests/xrepeated || exit 1
 
 diff $srcdir/$tests/repeated.opl $tests/xrepeated.opl || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/selectfont.test b/Build/source/texk/web2c/omegaware/selectfont.test
index 8bcfba7bab5..e753e746df5 100755
--- a/Build/source/texk/web2c/omegaware/selectfont.test
+++ b/Build/source/texk/web2c/omegaware/selectfont.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 tests=omegaware/tests
@@ -11,23 +11,23 @@ TEXMFCNF=$srcdir/../kpathsea
 OFMFONTS=./$tests
 export TEXMFCNF OFMFONTS
 
-./opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || exit 1
+./wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample0-h || exit 1
 
-./opl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || exit 1
+./wopl2ofm -verbose $srcdir/$tests/sample0-h $tests/sample1-h || exit 1
 
-./ofm2opl -verbose sample1-h $tests/sample1-h || exit 1
+./wofm2opl -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
+./wovp2ovf -verbose $srcdir/$tests/sample $tests/sample $tests/sample || exit 1
 
-./ovf2ovp -verbose $tests/sample sample $tests/xsample.out  || exit 1
+./wovf2ovp -verbose $tests/sample sample $tests/xsample.out  || exit 1
 
 diff $srcdir/$tests/sample.out $tests/xsample.out || exit 1
 
-./ovp2ovf -verbose $srcdir/$tests/sample.ovp $tests/sample2.ovf || exit 1
+./wovp2ovf -verbose $srcdir/$tests/sample.ovp $tests/sample2.ovf || exit 1
 
-./ovf2ovp -verbose $tests/sample2 sample2 $tests/xsample2.out || exit 1
+./wovf2ovp -verbose $tests/sample2 sample2 $tests/xsample2.out || exit 1
 
 diff $srcdir/$tests/sample.out $tests/xsample2.out || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/specialhex.test b/Build/source/texk/web2c/omegaware/specialhex.test
index 98af481f0db..b582e0ccfe8 100755
--- a/Build/source/texk/web2c/omegaware/specialhex.test
+++ b/Build/source/texk/web2c/omegaware/specialhex.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 tests=omegaware/tests
@@ -9,21 +9,21 @@ test -d $tests || mkdir -p $tests
 
 TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=./$tests \
-  ./ovp2ovf -verbose $srcdir/$tests/specialhex $tests/specialhex $tests/specialhex || exit 1
+  ./wovp2ovf -verbose $srcdir/$tests/specialhex $tests/specialhex $tests/specialhex || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/specialhex $tests/specialhex || exit 1
+  ./wofm2opl -verbose $tests/specialhex $tests/specialhex || exit 1
 
-./opl2ofm -verbose $tests/specialhex $tests/xspecialhex || exit 1
+./wopl2ofm -verbose $tests/specialhex $tests/xspecialhex || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
-  ./ofm2opl -verbose $tests/xspecialhex $tests/xspecialhex || exit 1
+  ./wofm2opl -verbose $tests/xspecialhex $tests/xspecialhex || exit 1
 
 diff $tests/specialhex.opl $tests/xspecialhex.opl || exit 1
 
 TEXMFCNF=$srcdir/../kpathsea \
   OFMFONTS=.:./$tests \
-  ./ovf2ovp -verbose $tests/specialhex $tests/specialhex $tests/xspecialhex || exit 1
+  ./wovf2ovp -verbose $tests/specialhex $tests/specialhex $tests/xspecialhex || exit 1
 
 diff $srcdir/$tests/specialhex.ovp $tests/xspecialhex.ovp || exit 1
 
diff --git a/Build/source/texk/web2c/omegaware/tests/charwd-r.pl b/Build/source/texk/web2c/omegaware/tests/charwd-r.pl
new file mode 100644
index 00000000000..7440dd427cf
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/charwd-r.pl
@@ -0,0 +1,19 @@
+(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 1011DEC8)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+   (SLANT R 0.0)
+   (SPACE R 0.5)
+   (STRETCH R 0.3)
+   (SHRINK R 0.1)
+   (XHEIGHT R 0.8)
+   (QUAD R 1.0)
+   )
+(CHARACTER H 23
+   (CHARWD R 0.0)
+   )
diff --git a/Build/source/texk/web2c/omegaware/tests/charwd-v.vpl b/Build/source/texk/web2c/omegaware/tests/charwd-v.vpl
new file mode 100644
index 00000000000..c6b5da53d53
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/charwd-v.vpl
@@ -0,0 +1,29 @@
+(VTITLE Test missing CHARWD)
+(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 CDC67EC9)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+   (SLANT R 0.0)
+   (SPACE R 0.5)
+   (STRETCH R 0.3)
+   (SHRINK R 0.1)
+   (XHEIGHT R 0.8)
+   (QUAD R 1.0)
+   )
+(MAPFONT D 0
+   (FONTNAME charwdr)
+   (FONTCHECKSUM H 1011DEC8)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(CHARACTER H 22
+   (CHARWD R 0.0)
+   (MAP
+      (SETCHAR H 23)
+      )
+   )
diff --git a/Build/source/texk/web2c/omegaware/tests/level1.opl b/Build/source/texk/web2c/omegaware/tests/level1.opl
index 6705727511f..1bcf6a73470 100644
--- a/Build/source/texk/web2c/omegaware/tests/level1.opl
+++ b/Build/source/texk/web2c/omegaware/tests/level1.opl
@@ -22,3 +22,8 @@
    (CHARHT R 0.9)
    (CHARDP R 0.1)
    )
+(CHARREPEAT H 20001 H FFFE
+   (CHARWD R 1.0)
+   (CHARHT R 0.9)
+   (CHARDP R 0.1)
+   )
diff --git a/Build/source/texk/web2c/omegaware/vrepeat.test b/Build/source/texk/web2c/omegaware/vrepeat.test
index 0f33c01c91d..51b969616bf 100755
--- a/Build/source/texk/web2c/omegaware/vrepeat.test
+++ b/Build/source/texk/web2c/omegaware/vrepeat.test
@@ -12,32 +12,32 @@ export TEXMFCNF OFMFONTS
 test -d $tests || mkdir -p $tests
 
 echo 'opl2ofm -verbose vrepeat0 yrepeat0'
-./opl2ofm -verbose $srcdir/$tests/vrepeat0 $tests/yrepeat0 && \
+./wopl2ofm -verbose $srcdir/$tests/vrepeat0 $tests/yrepeat0 && \
   cmp $srcdir/$tests/vrepeat0.ofm $tests/yrepeat0.ofm && echo || exit 1
 
 echo 'ofm2opl -verbose yrepeat0 yrepeat0'
-./ofm2opl -verbose $tests/yrepeat0 $tests/yrepeat0 && \
+./wofm2opl -verbose $tests/yrepeat0 $tests/yrepeat0 && \
   diff -u $srcdir/$tests/vrepeat0.opl $tests/yrepeat0.opl && echo || exit 1
 
 echo 'ovp2ovf -verbose vrepeat1 yrepeat1'
-./ovp2ovf -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat1 && \
+./wovp2ovf -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat1 && \
   cmp $srcdir/$tests/vrepeat1.ovf $tests/yrepeat1.ovf && \
   cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat1.ofm && echo || exit 1
 
 echo 'ovf2ovp -verbose yrepeat1 yrepeat1 yrepeat1'
-./ovf2ovp -verbose $tests/yrepeat1 yrepeat1 $tests/yrepeat1
+./wovf2ovp -verbose $tests/yrepeat1 yrepeat1 $tests/yrepeat1
   diff -u $srcdir/$tests/vrepeat1.ovp $tests/yrepeat1.ovp && echo || exit 1
 
 echo 'ofm2opl -verbose yrepeat1 yrepeat1'
-./ofm2opl -verbose $tests/yrepeat1 $tests/yrepeat1 && \
+./wofm2opl -verbose $tests/yrepeat1 $tests/yrepeat1 && \
   diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat1.opl && echo || exit 1
 
 echo 'opl2ofm -verbose vrepeat1 yrepeat2'
-./opl2ofm -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat2 && \
+./wopl2ofm -verbose $srcdir/$tests/vrepeat1 $tests/yrepeat2 && \
   cmp $srcdir/$tests/vrepeat1.ofm $tests/yrepeat2.ofm && echo || exit 1
 
 echo 'ofm2opl -verbose yrepeat2 yrepeat2'
-./ofm2opl -verbose $tests/yrepeat2 $tests/yrepeat2 && \
+./wofm2opl -verbose $tests/yrepeat2 $tests/yrepeat2 && \
   diff -u $srcdir/$tests/vrepeat1.opl $tests/yrepeat2.opl && echo || exit 1
 
 exit 0