diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-09 15:00:28 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-09 15:00:28 +0000 |
commit | eaa50fe2459839e0840e1881bde94292f082e95a (patch) | |
tree | cccb583dbb05f1538c1984e5efc11631478500bf /Build/source/texk/web2c/omegaware | |
parent | 45e626a25db7227df58d91582938a3967357512a (diff) |
omegaware/ovp2ovf: Bug fix - CHARREPEAT is at most 0xffff
git-svn-id: svn://tug.org/texlive/trunk@32369 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/omegaware')
-rw-r--r-- | Build/source/texk/web2c/omegaware/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/am/omegaware.am | 6 | ||||
-rwxr-xr-x | Build/source/texk/web2c/omegaware/overbmp.test | 25 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/ovp2ovf.up | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/tests/inbmp0.opl | 16 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/tests/overbmp.ovp | 49 |
6 files changed, 108 insertions, 1 deletions
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) + ) + ) |