omegaware/ovp2ovf: Bug fix - CHARREPEAT is at most 0xffff

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

7 files changed, 120 insertions, 10 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 878c8b9523e..9efcf779155 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1936,7 +1936,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
 	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/realnum.opl \
+	omegaware/tests/OCherokee.ovp omegaware/tests/inbmp0.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 \
@@ -2013,13 +2014,14 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
 	omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
 	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
 	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
-	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/specialhex.ofm \
-	omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
-	omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
-	aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+	omegaware/tests/inbmp1.* 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/specialhex.ofm omegaware/tests/specialhex.opl \
+	omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+	$(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) \
@@ -2948,7 +2950,8 @@ OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
 	omegaware/otangle.test
 
 OMFONTS_tests = omegaware/level1.test omegaware/ofonts.test \
-	omegaware/omfonts.test omegaware/realnum.test omegaware/repeat.test \
+	omegaware/omfonts.test omegaware/overbmp.test\
+	omegaware/realnum.test omegaware/repeat.test \
 	omegaware/selectfont.test omegaware/specialhex.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 84570b1711f..28b926dddbc 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ovp2ovf.up: Ensure char_repeats[c]<=0xffff.
+	* overbmp.test, tests/inbmp0.opl, tests/overbmp.ovp (new):
+	Shell script and data for a new test,
+	inspired by TANAKA Takuji <KXD02663@nifty.ne.jp>.
+
 2013-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* opl2ofm.{ch,web}: Drop ASCII_04, ASCII_10, ASCII_14, MBL_string,
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index e834e7790ca..1f4d92e8b22 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -102,7 +102,8 @@ 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/realnum.test omegaware/repeat.test \
+	omegaware/omfonts.test omegaware/overbmp.test\
+	omegaware/realnum.test omegaware/repeat.test \
 	omegaware/selectfont.test omegaware/specialhex.test
 EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
 
@@ -145,6 +146,9 @@ EXTRA_DIST += omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp
 DISTCLEANFILES += omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
 	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
 	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.*
+## omegaware/overbmp.test
+EXTRA_DIST += omegaware/tests/inbmp0.opl omegaware/tests/overbmp.ovp
+DISTCLEANFILES += omegaware/tests/inbmp1.* omegaware/tests/xoverbmp.*
 ## omegaware/otangle.test
 DISTCLEANFILES += ocftest.*
 ## omegaware/realnum.test
diff --git a/Build/source/texk/web2c/omegaware/overbmp.test b/Build/source/texk/web2c/omegaware/overbmp.test
new file mode 100755
index 00000000000..41daceb4b40
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/overbmp.test
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Copyright (C) 2013 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/inbmp0 $tests/inbmp1 || exit 1
+
+./ofm2opl -verbose inbmp1 $tests/inbmp1 || exit 1
+
+diff $srcdir/$tests/inbmp0.opl $tests/inbmp1.opl || exit 1
+
+./ovp2ovf -verbose $srcdir/$tests/overbmp.ovp $tests/xoverbmp || exit 1
+
+./ovf2ovp -verbose $tests/xoverbmp xoverbmp $tests/xoverbmp.ovp || exit 1
+
+diff $srcdir/$tests/overbmp.ovp $tests/xoverbmp.ovp || exit 1
+
diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.up b/Build/source/texk/web2c/omegaware/ovp2ovf.up
index 9c57961ed34..6a6165a5528 100644
--- a/Build/source/texk/web2c/omegaware/ovp2ovf.up
+++ b/Build/source/texk/web2c/omegaware/ovp2ovf.up
@@ -44,3 +44,9 @@ procedure read_packet(@!c:byte);
 @y
 procedure read_packet(@!c:integer);
 @z
+
+@x [188]
+      while (not diff) and (cprime<=ec) do begin
+@y
+      while (not diff) and (cprime<=ec) and (cprime-c<@"10000) do begin
+@z
diff --git a/Build/source/texk/web2c/omegaware/tests/inbmp0.opl b/Build/source/texk/web2c/omegaware/tests/inbmp0.opl
new file mode 100644
index 00000000000..7f23d0b8298
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/inbmp0.opl
@@ -0,0 +1,16 @@
+(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 AA6297E0)
+(SEVENBITSAFEFLAG FALSE)
+(CHARACTER H 4E00
+   (CHARWD R 1.0)
+   )
+(CHARACTER H 53F1
+   (CHARWD R 1.0)
+   )
diff --git a/Build/source/texk/web2c/omegaware/tests/overbmp.ovp b/Build/source/texk/web2c/omegaware/tests/overbmp.ovp
new file mode 100644
index 00000000000..1b9d2c1a9ee
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/tests/overbmp.ovp
@@ -0,0 +1,49 @@
+(VTITLE JVF with characters above the Basic Multilingual Plane)
+(OFMLEVEL H 1)
+(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 DD8C3992)
+(SEVENBITSAFEFLAG FALSE)
+(MAPFONT D 0
+   (FONTNAME inbmp1)
+   (FONTCHECKSUM H AA6297E0)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(MAPFONT D 1
+   (FONTNAME xoverbmp)
+   (FONTCHECKSUM H DD8C3992)
+   (FONTAT R 1.0)
+   (FONTDSIZE R 10.0)
+   )
+(CHARACTER H 4E00
+   (CHARWD R 1.0)
+   (MAP
+      (SETCHAR H 4E00)
+      )
+   )
+(CHARACTER H 53F1
+   (CHARWD R 1.0)
+   (MAP
+      (SELECTFONT D 1)
+      (SETCHAR H 20B9F)
+      )
+   )
+(CHARACTER H 20B9F
+   (CHARWD R 1.0)
+   (MAP
+      (SELECTFONT D 1)
+      (SETCHAR H 20BB7)
+      )
+   )
+(CHARACTER H 20BB7
+   (CHARWD R 1.0)
+   (MAP
+      (SETCHAR H 53F1)
+      )
+   )