summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-xBuild/source/texk/configure7
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.in290
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac4
-rwxr-xr-xBuild/source/texk/web2c/configure22
-rw-r--r--Build/source/texk/web2c/configure.ac2
-rw-r--r--Build/source/texk/web2c/omegafonts/ChangeLog9
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.am24
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in51
-rw-r--r--Build/source/texk/web2c/omegafonts/char_routines.c118
-rw-r--r--Build/source/texk/web2c/omegafonts/ligkern_routines.c24
-rwxr-xr-xBuild/source/texk/web2c/omegafonts/ofonts.test56
-rwxr-xr-xBuild/source/texk/web2c/omegafonts/overbmp.test53
-rw-r--r--Build/source/texk/web2c/omegafonts/parse_ofm.c2
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/inbmp.opl18
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/level1.opl5
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr0.pl47
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr1.pl27
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr1.vpl40
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr2.opl29
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr2.ovp42
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr3.opl29
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontr3.ovp42
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv4.pl47
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv4.vpl88
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv5.opl49
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv5.ovp90
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv6.opl49
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/ofontv6.ovp90
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/overbmp.opl22
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/overbmp.ovp49
-rw-r--r--Build/source/texk/web2c/omegafonts/tests/repeat.opl2
-rw-r--r--Build/source/texk/web2c/omegaware/ChangeLog10
-rw-r--r--Build/source/texk/web2c/omegaware/am/omegaware.am25
-rwxr-xr-xBuild/source/texk/web2c/omegaware/charwd.test38
-rwxr-xr-xBuild/source/texk/web2c/omegaware/level1.test6
-rwxr-xr-xBuild/source/texk/web2c/omegaware/ofonts.test26
-rwxr-xr-xBuild/source/texk/web2c/omegaware/omfonts.test12
-rwxr-xr-xBuild/source/texk/web2c/omegaware/overbmp.test20
-rwxr-xr-xBuild/source/texk/web2c/omegaware/realnum.test6
-rwxr-xr-xBuild/source/texk/web2c/omegaware/repeat.test6
-rwxr-xr-xBuild/source/texk/web2c/omegaware/selectfont.test16
-rwxr-xr-xBuild/source/texk/web2c/omegaware/specialhex.test12
-rw-r--r--Build/source/texk/web2c/omegaware/tests/charwd-r.pl19
-rw-r--r--Build/source/texk/web2c/omegaware/tests/charwd-v.vpl29
-rw-r--r--Build/source/texk/web2c/omegaware/tests/level1.opl5
-rwxr-xr-xBuild/source/texk/web2c/omegaware/vrepeat.test14
47 files changed, 1320 insertions, 356 deletions
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 5e46f00d771..41ae58e8b60 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -715,7 +715,6 @@ with_editor
enable_auto_core
enable_dump_share
enable_ipc
-enable_omfonts
enable_tex
enable_tex_synctex
enable_etex
@@ -1533,8 +1532,6 @@ Optional Features:
--disable-dump-share make fmt/base/mem files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a
program
- --disable-omfonts do not compile and install omfonts (use Web2C
- versions)
--disable-tex do not compile and install TeX
--enable-tex-synctex build TeX with SyncTeX support
--enable-etex compile and install e-TeX
@@ -3669,10 +3666,6 @@ fi
if test "${enable_ipc+set}" = set; then :
enableval=$enable_ipc;
fi
-# Check whether --enable-omfonts was given.
-if test "${enable_omfonts+set}" = set; then :
- enableval=$enable_omfonts;
-fi
# Check whether --enable-tex was given.
if test "${enable_tex+set}" = set; then :
enableval=$enable_tex;
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 0cad925cfea..52d18d79f08 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ac/web2c.ac: Drop configure option --disable-omfonts.
+ * configure.ac: Drop Automake conditional OMFONTS.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Drop the obsolete NATIVE_TEXLIVE_BUILD.
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 7f95656f474..f7984797296 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -87,32 +87,32 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
$(am__EXEEXT_2) eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) \
euptex$(EXEEXT) pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
pdftosrc$(EXEEXT) luatex$(EXEEXT) luajittex$(EXEEXT) \
- txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_6) \
+ txt2zlib$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \
aleph$(EXEEXT) synctex$(EXEEXT)
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_7) \
- ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_8) \
- $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
- $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14) \
- $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \
- $(am__EXEEXT_18) $(am__EXEEXT_19) $(am__EXEEXT_20) \
- $(am__EXEEXT_21) $(am__EXEEXT_22) $(am__EXEEXT_23) \
- $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \
- $(am__EXEEXT_27) $(am__EXEEXT_28)
+bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+ ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
+ $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
+ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
+ $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
+ $(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \
+ $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \
+ $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
+ $(am__EXEEXT_25)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
- $(am__EXEEXT_41)
-check_PROGRAMS = $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) \
- $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
$(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
+ $(am__EXEEXT_38)
+check_PROGRAMS = $(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
+ $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31) \
+ $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_44) ctiedir/ctie.test \
+TESTS = tangle.test $(am__EXEEXT_41) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_14) $(am__append_23) $(am__append_28) \
$(am__append_34) $(am__append_38) $(am__append_40) \
$(am__append_46) $(am__append_50) $(am__append_52) \
$(am__append_58) $(am__append_69) $(am__append_70) \
- $(am__append_78) $(am__append_81) $(am__append_82) \
- $(am__append_85) libmd5/md5.test
+ $(am__append_78) $(am__append_80) $(am__append_83) \
+ libmd5/md5.test
DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
$(srcdir)/am/cweb.am $(srcdir)/am/texmf.am \
$(srcdir)/mplibdir/am/mplib.am \
@@ -248,93 +248,91 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
@XETEX_TRUE@am__append_78 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_79 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_80 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_81 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_82 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_83 = pltotf tftopl
-@ALEPH_TRUE@am__append_84 = aleph
-@ALEPH_TRUE@am__append_85 = $(aleph_tests)
-@SYNCTEX_TRUE@am__append_86 = synctex
-@TEX_SYNCTEX_TRUE@am__append_87 = -I$(srcdir)/synctexdir \
+@OTANGLE_TRUE@am__append_79 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_80 = $(OTANGLE_tests) $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_81 = pltotf tftopl
+@ALEPH_TRUE@am__append_82 = aleph
+@ALEPH_TRUE@am__append_83 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_84 = synctex
+@TEX_SYNCTEX_TRUE@am__append_85 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
-@TEX_SYNCTEX_TRUE@am__append_88 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_89 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_90 = \
+@TEX_SYNCTEX_TRUE@am__append_86 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_87 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_88 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
-@ETEX_SYNCTEX_TRUE@am__append_91 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_89 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
-@ETEX_SYNCTEX_TRUE@am__append_92 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_93 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_94 = \
+@ETEX_SYNCTEX_TRUE@am__append_90 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_91 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_92 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
-@PTEX_SYNCTEX_TRUE@am__append_95 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@am__append_93 = -I$(srcdir)/synctexdir \
@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
-@PTEX_SYNCTEX_TRUE@am__append_96 = $(ZLIB_LIBS)
-@PTEX_SYNCTEX_TRUE@am__append_97 = $(ZLIB_DEPEND)
-@PTEX_SYNCTEX_TRUE@am__append_98 = \
+@PTEX_SYNCTEX_TRUE@am__append_94 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_95 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_96 = \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
-@UPTEX_SYNCTEX_TRUE@am__append_99 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \
@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
-@UPTEX_SYNCTEX_TRUE@am__append_100 = $(ZLIB_LIBS)
-@UPTEX_SYNCTEX_TRUE@am__append_101 = $(ZLIB_DEPEND)
-@UPTEX_SYNCTEX_TRUE@am__append_102 = \
+@UPTEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_100 = \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
-@EPTEX_SYNCTEX_TRUE@am__append_103 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-@EPTEX_SYNCTEX_TRUE@am__append_104 = $(ZLIB_LIBS)
-@EPTEX_SYNCTEX_TRUE@am__append_105 = $(ZLIB_DEPEND)
-@EPTEX_SYNCTEX_TRUE@am__append_106 = \
+@EPTEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_104 = \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
-@EUPTEX_SYNCTEX_TRUE@am__append_107 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
-@EUPTEX_SYNCTEX_TRUE@am__append_108 = $(ZLIB_LIBS)
-@EUPTEX_SYNCTEX_TRUE@am__append_109 = $(ZLIB_DEPEND)
-@EUPTEX_SYNCTEX_TRUE@am__append_110 = \
+@EUPTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_108 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
-@PDFTEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
-@PDFTEX_SYNCTEX_TRUE@am__append_112 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_110 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
-@XETEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_111 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
-@XETEX_SYNCTEX_TRUE@am__append_114 = \
+@XETEX_SYNCTEX_TRUE@am__append_112 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@@ -974,51 +972,47 @@ am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
wovp2ovf$(EXEEXT)
-am__EXEEXT_5 = ofm2opl$(EXEEXT) opl2ofm$(EXEEXT) ovf2ovp$(EXEEXT) \
- ovp2ovf$(EXEEXT)
-am__EXEEXT_6 = $(am__EXEEXT_4) $(am__EXEEXT_5)
-@WEB_TRUE@am__EXEEXT_7 = $(am__EXEEXT_1)
-@TEX_TRUE@am__EXEEXT_8 = tex$(EXEEXT)
-@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_9 = initex$(EXEEXT)
-@MF_TRUE@am__EXEEXT_10 = mf$(EXEEXT)
-@MFN_TRUE@@MF_TRUE@am__EXEEXT_11 = mf-nowin$(EXEEXT)
-@MF_TRUE@@WIN32_TRUE@am__EXEEXT_12 = inimf$(EXEEXT)
-@MP_TRUE@am__EXEEXT_13 = mpost$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT)
-@PWEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2)
-@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT)
-@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3)
-@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT)
-@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
+@TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
+@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_7 = initex$(EXEEXT)
+@MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
+@MFN_TRUE@@MF_TRUE@am__EXEEXT_9 = mf-nowin$(EXEEXT)
+@MF_TRUE@@WIN32_TRUE@am__EXEEXT_10 = inimf$(EXEEXT)
+@MP_TRUE@am__EXEEXT_11 = mpost$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_12 = etex$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_13 = ptex$(EXEEXT)
+@PWEB_TRUE@am__EXEEXT_14 = $(am__EXEEXT_2)
+@EPTEX_TRUE@am__EXEEXT_15 = eptex$(EXEEXT)
+@UPTEX_TRUE@am__EXEEXT_16 = uptex$(EXEEXT)
+@UPWEB_TRUE@am__EXEEXT_17 = $(am__EXEEXT_3)
+@EUPTEX_TRUE@am__EXEEXT_18 = euptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_19 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
-@LUAJITTEX_TRUE@am__EXEEXT_23 = luajittex$(EXEEXT)
-@XETEX_TRUE@am__EXEEXT_24 = xetex$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_25 = $(am__EXEEXT_4)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__EXEEXT_26 = $(am__EXEEXT_5)
-@ALEPH_TRUE@am__EXEEXT_27 = aleph$(EXEEXT)
-@SYNCTEX_TRUE@am__EXEEXT_28 = synctex$(EXEEXT)
-@TEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@LUATEX_TRUE@am__EXEEXT_20 = luatex$(EXEEXT)
+@LUAJITTEX_TRUE@am__EXEEXT_21 = luajittex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_22 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_23 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_24 = aleph$(EXEEXT)
+@SYNCTEX_TRUE@am__EXEEXT_25 = synctex$(EXEEXT)
+@TEX_TRUE@am__EXEEXT_26 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@TEX_TRUE@ tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_30 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_31 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@ETEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@MF_TRUE@am__EXEEXT_27 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_28 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_29 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@ETEX_TRUE@ tftopl$(EXEEXT)
-@PTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@am__EXEEXT_30 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@PTEX_TRUE@ tftopl$(EXEEXT)
-@EPTEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@EPTEX_TRUE@ tftopl$(EXEEXT)
-@UPTEX_TRUE@am__EXEEXT_35 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@UPTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@UPTEX_TRUE@ tftopl$(EXEEXT)
-@EUPTEX_TRUE@am__EXEEXT_36 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EUPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@EUPTEX_TRUE@ tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_37 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_mpost$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_luatex$(EXEEXT)
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luajittex$(EXEEXT)
-@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_41 = txt2zlib$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_34 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_35 = call_mpost$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_36 = call_luatex$(EXEEXT)
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_luajittex$(EXEEXT)
+@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_38 = txt2zlib$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
alephdir/aleph-alephbis.$(OBJEXT) \
@@ -1176,26 +1170,10 @@ nodist_odvitype_OBJECTS = odvitype.$(OBJEXT)
odvitype_OBJECTS = $(nodist_odvitype_OBJECTS)
odvitype_LDADD = $(LDADD)
odvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-nodist_ofm2opl_OBJECTS = ofm2opl.$(OBJEXT)
-ofm2opl_OBJECTS = $(nodist_ofm2opl_OBJECTS)
-ofm2opl_LDADD = $(LDADD)
-ofm2opl_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-nodist_opl2ofm_OBJECTS = opl2ofm.$(OBJEXT)
-opl2ofm_OBJECTS = $(nodist_opl2ofm_OBJECTS)
-opl2ofm_LDADD = $(LDADD)
-opl2ofm_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_otangle_OBJECTS = otangle.$(OBJEXT)
otangle_OBJECTS = $(nodist_otangle_OBJECTS)
otangle_LDADD = $(LDADD)
otangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-nodist_ovf2ovp_OBJECTS = ovf2ovp.$(OBJEXT)
-ovf2ovp_OBJECTS = $(nodist_ovf2ovp_OBJECTS)
-ovf2ovp_LDADD = $(LDADD)
-ovf2ovp_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-nodist_ovp2ovf_OBJECTS = ovp2ovf.$(OBJEXT)
-ovp2ovf_OBJECTS = $(nodist_ovp2ovf_OBJECTS)
-ovp2ovf_LDADD = $(LDADD)
-ovp2ovf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_patgen_OBJECTS = patgen.$(OBJEXT)
patgen_OBJECTS = $(nodist_patgen_OBJECTS)
patgen_LDADD = $(LDADD)
@@ -1473,9 +1451,7 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
$(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
$(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
- $(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \
- $(nodist_otangle_SOURCES) $(nodist_ovf2ovp_SOURCES) \
- $(nodist_ovp2ovf_SOURCES) $(nodist_patgen_SOURCES) \
+ $(nodist_otangle_SOURCES) $(nodist_patgen_SOURCES) \
$(pbibtex_SOURCES) $(nodist_pbibtex_SOURCES) \
$(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
$(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
@@ -1724,13 +1700,13 @@ am__set_TESTS_bases = \
bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
bases=`echo $$bases`
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_42 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_39 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test
-am__EXEEXT_43 = $(am__EXEEXT_42) tests/bibtex-openout-test.pl \
+am__EXEEXT_40 = $(am__EXEEXT_39) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_44 = $(am__EXEEXT_43)
+@WEB_TRUE@am__EXEEXT_41 = $(am__EXEEXT_40)
TEST_SUITE_LOG = test-suite.log
TEST_EXTENSIONS = @EXEEXT@ .test
LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
@@ -2225,7 +2201,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
omegaware/ovf2ovp.web omegaware/ovf2ovp.up \
omegaware/ovf2ovp.ch omegaware/ovp2ovf.web \
omegaware/ovp2ovf.up omegaware/ovp2ovf.ch $(OTANGLE_tests) \
- $(OMFONTS_tests) omegaware/tests/level1.opl \
+ $(OMFONTS_tests) omegaware/tests/charwd-r.pl \
+ omegaware/tests/charwd-v.vpl omegaware/tests/level1.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 \
@@ -2323,6 +2300,7 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
$(omegaware_programs:=.c) $(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.ofm omegaware/tests/xlevel1.opl \
ofont*vf omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
@@ -2450,18 +2428,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_87)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_85)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_88)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_86)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_90)
+dist_tex_SOURCES = texextra.c $(am__append_88)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_89)
+tex_prereq = texd.h $(am__append_87)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -2544,19 +2522,19 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_91)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_89)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_92)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_90)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_94)
+ etexdir/etex_version.h $(am__append_92)
# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_93)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_91)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -2591,20 +2569,20 @@ pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
pproglib = lib/libp.a
libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
libkanji_a_CPPFLAGS = $(ptex_cppflags)
-ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_95)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_93)
# With --enable-ipc, pTeX may need to link with -lsocket.
-ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_96)
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_94)
ptex_DEPENDENCIES = $(ptex_dependencies)
# pTeX C sources
ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
- ptexdir/ptex_version.h $(am__append_98)
+ ptexdir/ptex_version.h $(am__append_96)
# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
-ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_97)
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_95)
ptex_web_srcs = \
tex.web \
tex.ch
@@ -2638,22 +2616,22 @@ ptftopl_DEPENDENCIES = $(ptex_dependencies)
# e-pTeX Tests
#
eptex_tests = eptexdir/eptriptest
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_103)
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_101)
# With --enable-ipc, e-pTeX may need to link with -lsocket.
eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_104)
+ $(ipc_socketlibs) $(am__append_102)
eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-pTeX C sources
eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- eptexdir/eptex_version.h $(am__append_106)
+ eptexdir/eptex_version.h $(am__append_104)
# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
- eptexdir/eptex_version.h $(am__append_105)
+ eptexdir/eptex_version.h $(am__append_103)
eptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2685,21 +2663,21 @@ upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
uptexdir/yokotate.test
libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
libukanji_a_CPPFLAGS = $(uptex_cppflags)
-uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_99)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_97)
# With --enable-ipc, upTeX may need to link with -lsocket.
-uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_100)
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_98)
uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
- uptexdir/uptex_version.h $(am__append_102)
+ uptexdir/uptex_version.h $(am__append_100)
# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
uptex_prereq = uptexd.h ptexdir/ptex_version.h \
- uptexdir/uptex_version.h $(am__append_101)
+ uptexdir/uptex_version.h $(am__append_99)
uptex_web_srcs = \
tex.web \
tex.ch
@@ -2734,23 +2712,23 @@ uptftopl_DEPENDENCIES = $(uptex_dependencies)
# e-upTeX Tests
#
euptex_tests = euptexdir/euptriptest
-euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_107)
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_105)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) $(am__append_108)
+ $(ipc_socketlibs) $(am__append_106)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
# e-upTeX C sources
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_110)
+ $(am__append_108)
# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
ptexdir/ptex_version.h eptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_109)
+ uptexdir/uptex_version.h $(am__append_107)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2802,7 +2780,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_111)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_109)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -2815,7 +2793,7 @@ pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_112)
+ $(am__append_110)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -3264,7 +3242,7 @@ xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
$(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_113)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_111)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -3275,7 +3253,7 @@ xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_114)
+ $(am__append_112)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -3310,30 +3288,24 @@ libxetex_prereq = xetexd.h $(xetex_dependencies)
# XeTeX Tests
#
xetex_tests = xetexdir/xetex.test
-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
ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
ow_otangle = WEBINPUTS=.:$(srcdir)/omegaware $(buildenv) $(OTANGLE)
nodist_odvicopy_SOURCES = odvicopy.c odvicopy.h
odvicopy_sources = omegaware/odvicopy.web omegaware/odvicopy.ch
nodist_odvitype_SOURCES = odvitype.c odvitype.h
odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch
-nodist_ofm2opl_SOURCES = ofm2opl.c ofm2opl.h
nodist_wofm2opl_SOURCES = ofm2opl.c ofm2opl.h
-nodist_opl2ofm_SOURCES = opl2ofm.c opl2ofm.h
nodist_wopl2ofm_SOURCES = opl2ofm.c opl2ofm.h
nodist_otangle_SOURCES = otangle.c otangle.h
otangle_sources = omegaware/otangle.web omegaware/otangle.ch
-nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
nodist_wovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
-nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
nodist_wovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
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
@@ -4827,26 +4799,10 @@ odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype
@rm -f odvitype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
-ofm2opl$(EXEEXT): $(ofm2opl_OBJECTS) $(ofm2opl_DEPENDENCIES) $(EXTRA_ofm2opl_DEPENDENCIES)
- @rm -f ofm2opl$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ofm2opl_OBJECTS) $(ofm2opl_LDADD) $(LIBS)
-
-opl2ofm$(EXEEXT): $(opl2ofm_OBJECTS) $(opl2ofm_DEPENDENCIES) $(EXTRA_opl2ofm_DEPENDENCIES)
- @rm -f opl2ofm$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(opl2ofm_OBJECTS) $(opl2ofm_LDADD) $(LIBS)
-
otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
@rm -f otangle$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
-ovf2ovp$(EXEEXT): $(ovf2ovp_OBJECTS) $(ovf2ovp_DEPENDENCIES) $(EXTRA_ovf2ovp_DEPENDENCIES)
- @rm -f ovf2ovp$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ovf2ovp_OBJECTS) $(ovf2ovp_LDADD) $(LIBS)
-
-ovp2ovf$(EXEEXT): $(ovp2ovf_OBJECTS) $(ovp2ovf_DEPENDENCIES) $(EXTRA_ovp2ovf_DEPENDENCIES)
- @rm -f ovp2ovf$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ovp2ovf_OBJECTS) $(ovp2ovf_LDADD) $(LIBS)
-
patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
@rm -f patgen$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 886923d1044..cc4a2cc3af1 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -25,10 +25,6 @@ AC_ARG_ENABLE([ipc],
AS_HELP_STRING([--disable-ipc],
[disable TeX's --ipc option, i.e., pipe to a program],
kpse_indent_26))[]dnl
-AC_ARG_ENABLE([omfonts],
- AS_HELP_STRING([--disable-omfonts],
- [do not compile and install omfonts (use Web2C versions)],
- kpse_indent_26))[]dnl
dnl [PROG, BUILD-OR-NO, SYNC-OR-NO, TEXT, REQUIRED-LIBS]
m4_define([kpse_tex_progs], [dnl
[[tex], [yes], [no], [TeX], []],
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 2e60c725ba9..7c08b276ced 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -751,8 +751,6 @@ MFN_FALSE
MFN_TRUE
MF_FALSE
MF_TRUE
-OMFONTS_FALSE
-OMFONTS_TRUE
OTANGLE_FALSE
OTANGLE_TRUE
XETEX_SYNCTEX_FALSE
@@ -972,7 +970,6 @@ with_editor
enable_auto_core
enable_dump_share
enable_ipc
-enable_omfonts
enable_tex
enable_tex_synctex
enable_etex
@@ -1702,8 +1699,6 @@ Optional Features:
--enable-auto-core cause TeX&MF to dump core, given a certain filename
--disable-dump-share make fmt/base/mem files architecture-dependent
--disable-ipc disable TeX's --ipc option, i.e., pipe to a program
- --disable-omfonts do not compile and install omfonts (use Web2C
- versions)
--disable-tex do not compile and install TeX
--enable-tex-synctex build TeX with SyncTeX support
--enable-etex compile and install e-TeX
@@ -17982,10 +17977,6 @@ fi
if test "${enable_ipc+set}" = set; then :
enableval=$enable_ipc;
fi
-# Check whether --enable-omfonts was given.
-if test "${enable_omfonts+set}" = set; then :
- enableval=$enable_omfonts;
-fi
# Check whether --enable-tex was given.
if test "${enable_tex+set}" = set; then :
enableval=$enable_tex;
@@ -19539,15 +19530,6 @@ else
OTANGLE_FALSE=
fi
- if test "x$enable_omfonts" != xno; then
- OMFONTS_TRUE=
- OMFONTS_FALSE='#'
-else
- OMFONTS_TRUE='#'
- OMFONTS_FALSE=
-fi
-
-
if test "x$enable_mf" != xno; then
MF_TRUE=
MF_FALSE='#'
@@ -24422,10 +24404,6 @@ if test -z "${OTANGLE_TRUE}" && test -z "${OTANGLE_FALSE}"; then
as_fn_error $? "conditional \"OTANGLE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${OMFONTS_TRUE}" && test -z "${OMFONTS_FALSE}"; then
- as_fn_error $? "conditional \"OMFONTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${MF_TRUE}" && test -z "${MF_FALSE}"; then
as_fn_error $? "conditional \"MF\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 451212f36f0..4e81dba929c 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -153,8 +153,6 @@ AS_IF([test "x$enable_aleph:$enable_xetex:$enable_omfonts" = xno:no:yes],
AM_CONDITIONAL([OTANGLE],
[test "x$enable_otangle" = xyes])[]dnl
-AM_CONDITIONAL([OMFONTS], [test "x$enable_omfonts" != xno])
-
AM_CONDITIONAL([MF], [test "x$enable_mf" != xno])
AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno])
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 8c2af72d2df..9583e665f1c 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop Automake conditional OMFONTS.
+ * ofonts.test, overbmp.test, tests/ofont*, tests/inbmp.opl,
+ tests/overbmp.* (new): Shell scripts and data for new tests.
+
+ * char_routines.c, ligkern_routines.c, parse_ofm.c: Allow char
+ codes from Supplementary Unicode Planes (<=10FFFF).
+
2013-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* omfonts.c (main): Use make_suffix() for implied ofm_name.
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.am b/Build/source/texk/web2c/omegafonts/Makefile.am
index bc3fda25aaa..4c5bfd00405 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.am
+++ b/Build/source/texk/web2c/omegafonts/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/omegafonts/
##
-## Copyright (C) 2009-2013 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.
##
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
@@ -18,12 +18,10 @@ $(proglib): ${top_srcdir}/lib/*.c
bin_PROGRAMS =
if OTANGLE
-if OMFONTS
bin_PROGRAMS += omfonts
if WIN32
noinst_PROGRAMS = call_omfonts
endif WIN32
-endif OMFONTS
endif OTANGLE
EXTRA_PROGRAMS = omfonts
@@ -82,7 +80,6 @@ bin_links = \
include $(top_srcdir)/../../am/bin_links.am
if OTANGLE
-if OMFONTS
install-exec-hook: install-bin-links
if WIN32
for f in $(linked_programs); do \
@@ -95,17 +92,14 @@ if WIN32
rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
done
endif WIN32
-endif OMFONTS
endif OTANGLE
## Tests
##
-OMFONTS_tests = charwd.test level1.test omfonts.test realnum.test \
- repeat.test selectfont.test specialhex.test
+OMFONTS_tests = charwd.test level1.test ofonts.test omfonts.test overbmp.test \
+ realnum.test repeat.test selectfont.test specialhex.test
if OTANGLE
-if OMFONTS
TESTS = $(OMFONTS_tests)
-endif OMFONTS
endif OTANGLE
EXTRA_DIST = $(OMFONTS_tests)
@@ -116,11 +110,23 @@ DISTCLEANFILES += tests/charwdr.* tests/charwdv.*
## level1.test
EXTRA_DIST += tests/level1.opl
DISTCLEANFILES += tests/xlevel1.ofm tests/xlevel1.opl
+## ofonts.test
+EXTRA_DIST += tests/ofontr0.pl \
+ tests/ofontr1.pl tests/ofontr1.vpl \
+ tests/ofontr2.opl tests/ofontr2.ovp \
+ tests/ofontr3.opl tests/ofontr3.ovp \
+ tests/ofontv4.pl tests/ofontv4.vpl \
+ tests/ofontv5.opl tests/ofontv5.ovp \
+ tests/ofontv6.opl tests/ofontv6.ovp
+DISTCLEANFILES += tests/xofont*
## omfonts.test
EXTRA_DIST += tests/Cherokee.pl tests/OCherokee.ovp
DISTCLEANFILES += tests/Cherokee.tfm tests/OCherokee.ofm \
tests/OCherokee.opl tests/OCherokee.ovf \
tests/xCherokee.* tests/xOCherokee.*
+## overbmp.test
+EXTRA_DIST += tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp
+DISTCLEANFILES += tests/xinbmp* tests/xoverbmp*
## realnum.test
EXTRA_DIST += tests/realnum.opl tests/realnum.out
DISTCLEANFILES += tests/realnum.*
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index 185cc7e480f..01f690fa300 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -79,9 +79,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = $(am__EXEEXT_1)
-@OMFONTS_TRUE@@OTANGLE_TRUE@am__append_1 = omfonts
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS = \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ call_omfonts$(EXEEXT)
+@OTANGLE_TRUE@am__append_1 = omfonts
+@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS = call_omfonts$(EXEEXT)
EXTRA_PROGRAMS = omfonts$(EXEEXT)
DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am pl-parser.h \
@@ -138,7 +137,7 @@ CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@OMFONTS_TRUE@@OTANGLE_TRUE@am__EXEEXT_1 = omfonts$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_1 = omfonts$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
@@ -706,9 +705,10 @@ call_omfonts_CPPFLAGS = -DEXEPROG=\"omfonts.exe\"
nodist_call_omfonts_SOURCES = ../callexe.c
call_omfonts_LDADD =
DISTCLEANFILES = pl-parser.output tests/charwdr.* tests/charwdv.* \
- tests/xlevel1.ofm tests/xlevel1.opl tests/Cherokee.tfm \
- tests/OCherokee.ofm tests/OCherokee.opl tests/OCherokee.ovf \
- tests/xCherokee.* tests/xOCherokee.* tests/realnum.* \
+ tests/xlevel1.ofm tests/xlevel1.opl tests/xofont* \
+ tests/Cherokee.tfm tests/OCherokee.ofm tests/OCherokee.opl \
+ tests/OCherokee.ovf tests/xCherokee.* tests/xOCherokee.* \
+ tests/xinbmp* tests/xoverbmp* tests/realnum.* \
tests/xrepeated.* tests/sample*.ofm tests/sample*.ovf \
tests/sample1-h.opl tests/xsample*.out tests/specialhex.ofm \
tests/specialhex.opl tests/specialhex.ovf tests/xspecialhex.*
@@ -719,15 +719,20 @@ bin_links = \
omfonts$(EXEEXT):ovf2ovp \
omfonts$(EXEEXT):ovp2ovf
-OMFONTS_tests = charwd.test level1.test omfonts.test realnum.test \
- repeat.test selectfont.test specialhex.test
+OMFONTS_tests = charwd.test level1.test ofonts.test omfonts.test overbmp.test \
+ realnum.test repeat.test selectfont.test specialhex.test
-@OMFONTS_TRUE@@OTANGLE_TRUE@TESTS = $(OMFONTS_tests)
+@OTANGLE_TRUE@TESTS = $(OMFONTS_tests)
EXTRA_DIST = $(OMFONTS_tests) tests/charwd-r.pl tests/charwd-v.vpl \
- tests/level1.opl tests/Cherokee.pl tests/OCherokee.ovp \
- tests/realnum.opl tests/realnum.out tests/repeat.opl \
- tests/repeated.opl tests/sample.out tests/sample.ovp \
- tests/sample0-h.opl tests/specialhex.ovp
+ tests/level1.opl tests/ofontr0.pl tests/ofontr1.pl \
+ tests/ofontr1.vpl tests/ofontr2.opl tests/ofontr2.ovp \
+ tests/ofontr3.opl tests/ofontr3.ovp tests/ofontv4.pl \
+ tests/ofontv4.vpl tests/ofontv5.opl tests/ofontv5.ovp \
+ tests/ofontv6.opl tests/ofontv6.ovp tests/Cherokee.pl \
+ tests/OCherokee.ovp tests/inbmp.opl tests/overbmp.opl \
+ tests/overbmp.ovp tests/realnum.opl tests/realnum.out \
+ tests/repeat.opl tests/repeated.opl tests/sample.out \
+ tests/sample.ovp tests/sample0-h.opl tests/specialhex.ovp
all: all-am
.SUFFIXES:
@@ -1201,9 +1206,7 @@ maintainer-clean-generic:
-rm -f pl-lexer.c
-rm -f pl-parser.c
-rm -f pl-parser.h
-@OMFONTS_FALSE@install-exec-hook:
@OTANGLE_FALSE@install-exec-hook:
-@OMFONTS_FALSE@uninstall-hook:
@OTANGLE_FALSE@uninstall-hook:
clean: clean-am
@@ -1320,14 +1323,14 @@ uninstall-bin-links:
@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
@WIN32_FALSE@ done
-@OMFONTS_TRUE@@OTANGLE_TRUE@install-exec-hook: install-bin-links
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ done
-@OMFONTS_TRUE@@OTANGLE_TRUE@uninstall-hook: uninstall-bin-links
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
-@OMFONTS_TRUE@@OTANGLE_TRUE@@WIN32_TRUE@ done
+@OTANGLE_TRUE@install-exec-hook: install-bin-links
+@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
+@OTANGLE_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+@OTANGLE_TRUE@@WIN32_TRUE@ done
+@OTANGLE_TRUE@uninstall-hook: uninstall-bin-links
+@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
+@OTANGLE_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
+@OTANGLE_TRUE@@WIN32_TRUE@ done
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/texk/web2c/omegafonts/char_routines.c b/Build/source/texk/web2c/omegafonts/char_routines.c
index 772edb5dd9a..b7e65d2377c 100644
--- a/Build/source/texk/web2c/omegafonts/char_routines.c
+++ b/Build/source/texk/web2c/omegafonts/char_routines.c
@@ -38,6 +38,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
#include "dvi.h"
#define PLANE 0x10000
+#define INDEX_MAX (PLANE-1)
#define HALFPLANE 0x08000
#define MAX_START_OFM 65535
@@ -61,9 +62,9 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
* or when the character is referenced in a charlist cycle, an extensible
* piece or in a ligature/kerning table. In the latter case, ensure_existence
* is called, and it sets the defined field of the character to be FALSE;
- *
+ *
* init_character also sets current_character to the character entry;
- *
+ *
*/
unsigned bc=0x7fffffff;
@@ -247,7 +248,7 @@ check_existence_all_character_fields(void)
char_entry *entry;
unsigned *exten;
unsigned j;
-
+
FOR_ALL_EXISTING_CHARACTERS(
unsigned c = plane*PLANE + index;
if (entry->indices[C_WD] == NULL) {
@@ -264,22 +265,33 @@ check_existence_all_character_fields(void)
check_existence_and_safety(c, entry->remainder, "",
"%sCharacter (H %X) NEXTLARGER than (H %X) "
"has no CHARACTER spec");
+ if (entry->remainder > 0xffff) {
+ fprintf(stderr, "Character (H %X) NEXTLARGER than (H %X) "
+ "exceeds ffff\n", entry->remainder, c);
+ exit(2);
+ }
break;
}
case TAG_EXT:{
exten = entry->extens;
for (j=E_MIN; j<=E_MAX; j++) {
- if (exten[j]!=0)
+ if (exten[j]!=0) {
check_existence_and_safety(c, exten[j],
extensible_pieces[j],
"%s piece (H %X) of character (H %X) "
"has no CHARACTER spec");
+ if (exten[j] > 0xfff) {
+ fprintf(stderr, "%s piece (H %X) of character (H %X) "
+ "exceeds ffff\n", extensible_pieces[j], exten[j], c);
+ exit(2);
+ }
+ }
}
break;
}
}
)
-}
+}
void
clear_ligature_entries(void)
@@ -368,7 +380,7 @@ print_characters(boolean read_ovf)
lentry = lig_kern_table + entry->remainder;
if (lentry->entries[0] > STOP_FLAG) {
lentry = lig_kern_table +
- (256*lentry->entries[2]+lentry->entries[3]);
+ (256*lentry->entries[2]+lentry->entries[3]);
}
do {
print_one_lig_kern_entry(lentry, FALSE);
@@ -460,7 +472,7 @@ print_packet(unsigned char *packet_start, unsigned packet_length)
arg = ovf_get_arg(&packet, cmd - DVI_SET_1 + 1, FALSE);
print_set_char(arg);
break;
- case DVI_NOP:
+ case DVI_NOP:
packet++;
break;
case DVI_PUSH:
@@ -860,66 +872,88 @@ unsigned num_char_info, words_per_entry;
void
compute_ofm_character_info(void)
{
+ unsigned c;
unsigned plane, index;
char_entry *entry;
bc = 0x7fffffff; ec=0;
FOR_ALL_EXISTING_CHARACTERS(
- unsigned c = plane*PLANE + index;
+ c = plane*PLANE + index;
if (c < bc) bc = c;
if (c > ec) ec = c;
)
if (bc > ec) bc = 1;
+
+ /* fill gaps */
+ for (plane = 0; plane < plane_max; plane++) {
+ if (planes[plane] == NULL) {
+ planes[plane] = (char_entry **)xmalloc(PLANE * sizeof(char_entry *));
+ char_max[plane] = 0;
+ planes[plane][0] = NULL;
+ }
+ for (index = char_max[plane]+1; index <= INDEX_MAX; index++) {
+ planes[plane][index] = NULL;
+ }
+ char_max[plane] = INDEX_MAX;
+ }
+
switch (ofm_level) {
case OFM_TFM: {
- if (ec>255)
+ if (ec>0xff)
fatal_error_1(
"Char (%x) too big for TFM (max ff); use OFM file",ec);
break;
}
case OFM_LEVEL0: {
- if (ec>65535)
+ if (ec>0x10ffff)
fatal_error_1(
- "Char (%x) too big for OFM level-0 (max ffff); use level-2",
+ "Char (%x) too big for OFM level-0 (max 10ffff); use level-2",
ec);
break;
}
case OFM_LEVEL1: {
- if (ec>65535)
+ if (ec>0x10ffff)
fatal_error_1(
- "Char (%x) too big for OFM level-1 (max ffff); use level-2",
+ "Char (%x) too big for OFM level-1 (max 10ffff); use level-2",
ec);
- /* Level 1 only uses plane 0. Take advantage of this fact. */
num_char_info = 0;
- for (index = bc; index <=ec; index++) {
- unsigned saved_index = index;
+ for (c = bc; c <= ec; c++) {
+ unsigned saved_c = c;
char_entry *next;
- entry = planes[0][index];
+ plane = c / PLANE;
+ index = c % PLANE;
+ entry = planes[plane][index];
if ((entry != NULL) && (WD_ENTRY != 0)) {
unsigned wd = WD_ENTRY, ht = HT_ENTRY, dp = DP_ENTRY, ic = IC_ENTRY;
- index += entry->copies;
- for (; index < ec; index++) {
- next = planes[0][index+1];
+ c += entry->copies;
+ for (; (c < ec) && (c-saved_c < 0xffff); c++) {
+ plane = (c+1) / PLANE;
+ index = (c+1) % PLANE;
+ next = planes[plane][index];
if ((WD_NEXT != wd) || (HT_NEXT != ht) ||
(DP_NEXT != dp) || (IC_NEXT != ic) ||
(RM_NEXT != entry->remainder) || (TG_NEXT != entry->tag))
break;
- planes[0][index+1] = entry;
+ planes[plane][index] = entry;
}
} else {
- planes[0][index] = NULL;
- init_character(index, NULL);
+ plane = c / PLANE;
+ index = c % PLANE;
+ planes[plane][index] = NULL;
+ init_character(c, NULL);
entry = current_character;
- for (; index < ec; index++) {
- next = planes[0][index+1];
+ for (; (c < ec) && (c-saved_c < 0xffff); c++) {
+ plane = (c+1) / PLANE;
+ index = (c+1) % PLANE;
+ next = planes[plane][index];
if (WD_NEXT != 0)
break;
- planes[0][index+1] = entry;
+ planes[plane][index] = entry;
}
}
- entry->copies = index - saved_index;
+ entry->copies = c - saved_c;
num_char_info++;
}
break;
@@ -937,9 +971,9 @@ output_ofm_character_info(void)
switch (ofm_level) {
case OFM_TFM: {
plane=0;
- for (index = bc; index <=ec; index++) {
- entry = planes[plane][index];
- if (entry == NULL) {
+ for (index = bc; index <= ec; index++) {
+ entry = planes[plane][index];
+ if (entry == NULL) {
out_ofm_4(0);
} else {
out_ofm(WD_ENTRY);
@@ -951,10 +985,13 @@ output_ofm_character_info(void)
break;
}
case OFM_LEVEL0: {
- plane=0;
- for (index = bc; index <=ec; index++) {
- entry = planes[plane][index];
- if (entry == NULL) {
+ unsigned c;
+
+ for (c = bc; c <= ec; c++) {
+ plane = c / PLANE;
+ index = c % PLANE;
+ entry = planes[plane][index];
+ if (entry == NULL) {
out_ofm_4(0); out_ofm_4(0);
} else {
out_ofm_2(WD_ENTRY);
@@ -969,10 +1006,13 @@ output_ofm_character_info(void)
}
case OFM_LEVEL1: {
unsigned i;
- plane=0;
- for (index = bc; index <=ec; index++) {
- entry = planes[plane][index];
- if (entry == NULL) {
+ unsigned c;
+
+ for (c = bc; c <= ec; c++) {
+ plane = c / PLANE;
+ index = c % PLANE;
+ entry = planes[plane][index];
+ if (entry == NULL) {
for (i=0; i<words_per_entry; i++)
out_ofm_4(0);
} else {
@@ -992,7 +1032,7 @@ output_ofm_character_info(void)
/* padding */
if (0 == npc % 2)
out_ofm_2(0);
- index += copies;
+ c += copies;
}
}
break;
diff --git a/Build/source/texk/web2c/omegafonts/ligkern_routines.c b/Build/source/texk/web2c/omegafonts/ligkern_routines.c
index 5302466dfde..6291b9cfb76 100644
--- a/Build/source/texk/web2c/omegafonts/ligkern_routines.c
+++ b/Build/source/texk/web2c/omegafonts/ligkern_routines.c
@@ -82,7 +82,7 @@ void
set_stop_command(void)
{
if (lk_step_ended == TRUE) {
- lig_kern_table[nl-1].entries[0] =
+ lig_kern_table[nl-1].entries[0] =
lig_kern_table[nl-1].entries[0] / 256 * 256 + STOP_FLAG;
} else {
warning_0("STOP must follow LIG or KRN; ignored");
@@ -316,7 +316,7 @@ int
l_eval(unsigned x, unsigned y)
{
hash_list h;
-
+
if ((x==CHAR_ERROR) || (y==CHAR_ERROR)) return CHAR_ERROR;
h = l_hash_lookup(x, y);
if (h == NULL) return y;
@@ -427,22 +427,38 @@ check_ligature_program(unsigned c, unsigned lab)
entry = lig_kern_table+lig_ptr;
if (l_hash_input(lig_ptr,c)) {
if (entry->entries[2] < KERN_FLAG) {
- if (entry->entries[1] != bchar)
+ if (entry->entries[1] != bchar) {
check_existence_and_safety(c, entry->entries[1],
ligature_commands[entry->entries[2]],
"%s character examined by (H %X)");
+ if (entry->entries[1] > 0xffff) {
+ fprintf(stderr, "%s character (H %X) examined by (H %X) "
+ "exceeds ffff\n", ligature_commands[entry->entries[2]], entry->entries[1], c);
+ exit(2);
+ }
+ }
if (entry->entries[3] >= 128)
/* Needs fixing */
if ((c < 128) || (c == -1))
if ((entry->entries[1] < 128) ||
- (entry->entries[1] == bchar))
+ (entry->entries[1] == bchar))
seven_bit_calculated = 0;
check_existence_and_safety(c, entry->entries[3],
ligature_commands[entry->entries[2]],
"%s character generated by (H %X)");
+ if (entry->entries[3] >0xffff) {
+ fprintf(stderr, "%s character (H %X) generated by (H %X) "
+ "exceeds ffff\n", ligature_commands[entry->entries[2]], entry->entries[3], c);
+ exit(2);
+ }
} else {
check_existence_and_safety(c, entry->entries[1],
"KRN", "%s character examined by (H %X)");
+ if (entry->entries[1] > 0xffff) {
+ fprintf(stderr, "KRN character (H %X) examined by (H %X) "
+ "exceeds ffff\n", entry->entries[1], c);
+ exit(2);
+ }
}
}
if (entry->entries[0] >= STOP_FLAG) lig_ptr = nl;
diff --git a/Build/source/texk/web2c/omegafonts/ofonts.test b/Build/source/texk/web2c/omegafonts/ofonts.test
new file mode 100755
index 00000000000..16a5bee25b5
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/ofonts.test
@@ -0,0 +1,56 @@
+#! /bin/sh
+
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+test -d tests || mkdir -p tests
+
+VPL='ofontr1 ofontv4'
+OVP='ofontr2 ofontr3 ofontv5 ofontv6'
+
+TEXMFCNF=$srcdir/../../kpathsea
+OFMFONTS=.:$srcdir/tests
+export TEXMFCNF OFMFONTS
+
+exit 77
+set -x
+
+for f in $VPL; do
+ ./omfonts -opl2ofm $srcdir/tests/$f.pl tests/x$f.tfm || exit 1
+ ./omfonts -ofm2opl 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
+ ./omfonts -opl2ofm $srcdir/tests/$f tests/x$f || exit 1
+ ./omfonts -ofm2opl 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
+ ./omfonts -opl2ofm $srcdir/tests/$f.pl tests/x$f.tfm || exit 1
+ ./omfonts -ofm2opl 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
+ ./omfonts -ovp2ovf $srcdir/tests/$f.vpl tests/x$f.vf tests/x$f.tfm || exit 1
+ ./omfonts -ofm2opl tests/x$f.tfm tests/x$f.pl || exit 1
+ diff $srcdir/tests/$f.pl tests/x$f.pl || exit 1
+ ./omfonts -ovf2ovp 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
+ ./omfonts -ovp2ovf $srcdir/tests/$f tests/x$f tests/x$f || exit 1
+ ./omfonts -ofm2opl tests/x$f tests/x$f || exit 1
+ diff $srcdir/tests/$f.opl tests/x$f.opl || exit 1
+ ./omfonts -ovf2ovp tests/x$f tests/x$f tests/x$f || exit 1
+ diff $srcdir/tests/$f.ovp tests/x$f.ovp || exit 1
+done
+
+exit 0
+
+
diff --git a/Build/source/texk/web2c/omegafonts/overbmp.test b/Build/source/texk/web2c/omegafonts/overbmp.test
new file mode 100755
index 00000000000..fc3771c73c2
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/overbmp.test
@@ -0,0 +1,53 @@
+#! /bin/sh
+
+# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+test -d tests || mkdir -p tests
+
+TEXMFCNF=$srcdir/../../kpathsea
+OFMFONTS=./tests
+export TEXMFCNF OFMFONTS
+
+exit 77
+set -x
+
+./omfonts -opl2ofm $srcdir/tests/inbmp tests/xinbmp || exit 1
+
+./omfonts -ofm2opl xinbmp tests/xinbmp || exit 1
+
+diff $srcdir/tests/inbmp.opl tests/xinbmp.opl || exit 1
+
+./omfonts -ovp2ovf $srcdir/tests/overbmp.ovp tests/xoverbmp || exit 1
+
+./omfonts -ofm2opl xoverbmp tests/xoverbmp || exit 1
+
+diff $srcdir/tests/overbmp.opl tests/xoverbmp.opl || exit 1
+
+./omfonts -ovf2ovp 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
+
+./omfonts -opl2ofm tests/xinbmp1 tests/xinbmp1 || exit 1
+
+./omfonts -ofm2opl 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
+
+./omfonts -ovp2ovf tests/xoverbmp1.ovp tests/xoverbmp1 || exit 1
+
+sed -e '/OFMLEVEL/s/H 1/H 0/' tests/xoverbmp.opl >tests/xoverbmp1.opl
+
+./omfonts -ofm2opl xoverbmp1 tests/xoverbmp2 || exit 1
+
+diff tests/xoverbmp1.opl tests/xoverbmp2.opl || exit 1
+
+./omfonts -ovf2ovp tests/xoverbmp1 xoverbmp1 tests/xoverbmp2 || exit 1
+
+diff tests/xoverbmp1.ovp tests/xoverbmp2.ovp || exit 1
+
diff --git a/Build/source/texk/web2c/omegafonts/parse_ofm.c b/Build/source/texk/web2c/omegafonts/parse_ofm.c
index fc22024233b..823d68209a2 100644
--- a/Build/source/texk/web2c/omegafonts/parse_ofm.c
+++ b/Build/source/texk/web2c/omegafonts/parse_ofm.c
@@ -183,7 +183,7 @@ ofm_organize(void)
eval_four_bytes(&ne);
eval_four_bytes(&np);
eval_four_bytes(&font_dir);
- top_char = 65535;
+ top_char = 0x10ffff;
top_width = 65535;
top_height = 255;
top_depth = 255;
diff --git a/Build/source/texk/web2c/omegafonts/tests/inbmp.opl b/Build/source/texk/web2c/omegafonts/tests/inbmp.opl
new file mode 100644
index 00000000000..aef0f847fbf
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/inbmp.opl
@@ -0,0 +1,18 @@
+(OFMLEVEL D 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)
+(FONTDIMEN
+ )
+(CHARACTER H 4E00
+ (CHARWD R 1.0)
+ )
+(CHARACTER H 53F1
+ (CHARWD R 1.0)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/level1.opl b/Build/source/texk/web2c/omegafonts/tests/level1.opl
index 2a700e7ada0..048e6b14f0e 100644
--- a/Build/source/texk/web2c/omegafonts/tests/level1.opl
+++ b/Build/source/texk/web2c/omegafonts/tests/level1.opl
@@ -37,3 +37,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/omegafonts/tests/ofontr0.pl b/Build/source/texk/web2c/omegafonts/tests/ofontr0.pl
new file mode 100644
index 00000000000..0cf4c883ccb
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr0.pl
@@ -0,0 +1,47 @@
+(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 BB0E7BF)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 41
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 42
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 43
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ )
+(CHARACTER H 44
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 45
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 46
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr1.pl b/Build/source/texk/web2c/omegafonts/tests/ofontr1.pl
new file mode 100644
index 00000000000..fb77c215a38
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr1.pl
@@ -0,0 +1,27 @@
+(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 9748D64)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 7F
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 80
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr1.vpl b/Build/source/texk/web2c/omegafonts/tests/ofontr1.vpl
new file mode 100644
index 00000000000..9e043344a21
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr1.vpl
@@ -0,0 +1,40 @@
+(VTITLE Mapping ofontr1 to ofontr0)
+(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 9748D64)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr0)
+ (FONTCHECKSUM H BB0E7BF)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 7F
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SETCHAR H 41)
+ )
+ )
+(CHARACTER H 80
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SETCHAR H 42)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr2.opl b/Build/source/texk/web2c/omegafonts/tests/ofontr2.opl
new file mode 100644
index 00000000000..1e0b5b44b4e
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr2.opl
@@ -0,0 +1,29 @@
+(OFMLEVEL D 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 6415BA2B)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 17F
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ )
+(CHARACTER H 180
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr2.ovp b/Build/source/texk/web2c/omegafonts/tests/ofontr2.ovp
new file mode 100644
index 00000000000..2b953d253e3
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr2.ovp
@@ -0,0 +1,42 @@
+(VTITLE Mapping ofontr2 to ofontr0)
+(OFMLEVEL D 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 6415BA2B)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr0)
+ (FONTCHECKSUM H BB0E7BF)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 17F
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ (MAP
+ (SETCHAR H 43)
+ )
+ )
+(CHARACTER H 180
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SETCHAR H 44)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr3.opl b/Build/source/texk/web2c/omegafonts/tests/ofontr3.opl
new file mode 100644
index 00000000000..5a005f10f05
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr3.opl
@@ -0,0 +1,29 @@
+(OFMLEVEL D 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 9141B113)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 27F
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 280
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontr3.ovp b/Build/source/texk/web2c/omegafonts/tests/ofontr3.ovp
new file mode 100644
index 00000000000..608376df9ab
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontr3.ovp
@@ -0,0 +1,42 @@
+(VTITLE Mapping ofontr3 to ofontr0)
+(OFMLEVEL D 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 9141B113)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr0)
+ (FONTCHECKSUM H BB0E7BF)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 27F
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SETCHAR H 45)
+ )
+ )
+(CHARACTER H 280
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ (MAP
+ (SETCHAR H 46)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv4.pl b/Build/source/texk/web2c/omegafonts/tests/ofontv4.pl
new file mode 100644
index 00000000000..c3f18f3e40d
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv4.pl
@@ -0,0 +1,47 @@
+(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 C1668DBB)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 7C
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 7D
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ )
+(CHARACTER H 7E
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 81
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 82
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 83
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv4.vpl b/Build/source/texk/web2c/omegafonts/tests/ofontv4.vpl
new file mode 100644
index 00000000000..c77d8be3d94
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv4.vpl
@@ -0,0 +1,88 @@
+(VTITLE Mapping ofontv4 to ofontr1+ofontr2+ofontr3)
+(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 C1668DBB)
+(SEVENBITSAFEFLAG TRUE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr1)
+ (FONTCHECKSUM H 9748D64)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 1
+ (FONTNAME ofontr2)
+ (FONTCHECKSUM H 6415BA2B)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 2
+ (FONTNAME ofontr3)
+ (FONTCHECKSUM H 9141B113)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 7C
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SETCHAR H 7F)
+ )
+ )
+(CHARACTER H 7D
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 17F)
+ )
+ )
+(CHARACTER H 7E
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 27F)
+ )
+ )
+(CHARACTER H 81
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SETCHAR H 80)
+ )
+ )
+(CHARACTER H 82
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 180)
+ )
+ )
+(CHARACTER H 83
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 280)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv5.opl b/Build/source/texk/web2c/omegafonts/tests/ofontv5.opl
new file mode 100644
index 00000000000..19aac187c26
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv5.opl
@@ -0,0 +1,49 @@
+(OFMLEVEL D 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 4A681BA5)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 17C
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ )
+(CHARACTER H 17D
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 17E
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 181
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 182
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ )
+(CHARACTER H 183
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv5.ovp b/Build/source/texk/web2c/omegafonts/tests/ofontv5.ovp
new file mode 100644
index 00000000000..f01e8b7797a
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv5.ovp
@@ -0,0 +1,90 @@
+(VTITLE Mapping ofontv5 to ofontr2+ofontr3+ofontr1)
+(OFMLEVEL D 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 4A681BA5)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr2)
+ (FONTCHECKSUM H 6415BA2B)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 1
+ (FONTNAME ofontr3)
+ (FONTCHECKSUM H 9141B113)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 2
+ (FONTNAME ofontr1)
+ (FONTCHECKSUM H 9748D64)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 17C
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ (MAP
+ (SETCHAR H 17F)
+ )
+ )
+(CHARACTER H 17D
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 27F)
+ )
+ )
+(CHARACTER H 17E
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 7F)
+ )
+ )
+(CHARACTER H 181
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SETCHAR H 180)
+ )
+ )
+(CHARACTER H 182
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 280)
+ )
+ )
+(CHARACTER H 183
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 80)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv6.opl b/Build/source/texk/web2c/omegafonts/tests/ofontv6.opl
new file mode 100644
index 00000000000..8a7b6b7027b
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv6.opl
@@ -0,0 +1,49 @@
+(OFMLEVEL D 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 2DCEE34A)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(CHARACTER H 27C
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 27D
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ )
+(CHARACTER H 27E
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ )
+(CHARACTER H 281
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ )
+(CHARACTER H 282
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
+(CHARACTER H 283
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/ofontv6.ovp b/Build/source/texk/web2c/omegafonts/tests/ofontv6.ovp
new file mode 100644
index 00000000000..babf355c922
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/ofontv6.ovp
@@ -0,0 +1,90 @@
+(VTITLE Mapping ofontv6 to ofontr3+ofontr1+ofontr2)
+(OFMLEVEL D 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 2DCEE34A)
+(SEVENBITSAFEFLAG FALSE)
+(FONTDIMEN
+ (SLANT R 0.0)
+ (SPACE R 0.25)
+ (STRETCH R 0.2)
+ (SHRINK R 0.1)
+ (XHEIGHT R 0.45)
+ (QUAD R 1.0)
+ (EXTRASPACE R 0.111)
+ )
+(MAPFONT D 0
+ (FONTNAME ofontr3)
+ (FONTCHECKSUM H 9141B113)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 1
+ (FONTNAME ofontr1)
+ (FONTCHECKSUM H 9748D64)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(MAPFONT D 2
+ (FONTNAME ofontr2)
+ (FONTCHECKSUM H 6415BA2B)
+ (FONTAT R 1.0)
+ (FONTDSIZE R 10.0)
+ )
+(CHARACTER H 27C
+ (CHARWD R 0.6)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SETCHAR H 27F)
+ )
+ )
+(CHARACTER H 27D
+ (CHARWD R 0.8)
+ (CHARHT R 1.1)
+ (CHARDP R 0.1)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 7F)
+ )
+ )
+(CHARACTER H 27E
+ (CHARWD R 0.8)
+ (CHARHT R 1.2)
+ (CHARDP R 0.2)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 17F)
+ )
+ )
+(CHARACTER H 281
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.1)
+ (MAP
+ (SETCHAR H 280)
+ )
+ )
+(CHARACTER H 282
+ (CHARWD R 0.9)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SELECTFONT D 1)
+ (SETCHAR H 80)
+ )
+ )
+(CHARACTER H 283
+ (CHARWD R 0.7)
+ (CHARHT R 0.9)
+ (CHARIC R 0.2)
+ (MAP
+ (SELECTFONT D 2)
+ (SETCHAR H 180)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/overbmp.opl b/Build/source/texk/web2c/omegafonts/tests/overbmp.opl
new file mode 100644
index 00000000000..7cc4615c3ff
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/overbmp.opl
@@ -0,0 +1,22 @@
+(OFMLEVEL D 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)
+(CHARACTER H 4E00
+ (CHARWD R 1.0)
+ )
+(CHARACTER H 53F1
+ (CHARWD R 1.0)
+ )
+(CHARACTER H 20B9F
+ (CHARWD R 1.0)
+ )
+(CHARACTER H 20BB7
+ (CHARWD R 1.0)
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/overbmp.ovp b/Build/source/texk/web2c/omegafonts/tests/overbmp.ovp
new file mode 100644
index 00000000000..06886a456a9
--- /dev/null
+++ b/Build/source/texk/web2c/omegafonts/tests/overbmp.ovp
@@ -0,0 +1,49 @@
+(VTITLE JVF with characters above the Basic Multilingual Plane)
+(OFMLEVEL D 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 xinbmp)
+ (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)
+ )
+ )
diff --git a/Build/source/texk/web2c/omegafonts/tests/repeat.opl b/Build/source/texk/web2c/omegafonts/tests/repeat.opl
index 8cf09282d2f..09099826e4b 100644
--- a/Build/source/texk/web2c/omegafonts/tests/repeat.opl
+++ b/Build/source/texk/web2c/omegafonts/tests/repeat.opl
@@ -1,4 +1,4 @@
-(OFMLEVEL H 1)
+(OFMLEVEL D 1)
(FONTDIR TL)
(FAMILY UNSPECIFIED)
(FACE F MRR)
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