more omegaware bugfixes

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

4 files changed, 32 insertions, 8 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index bed0100ebfb..56d0338c190 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1220,10 +1220,10 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
 	xetexdir/xetexextra.in xetexdir/pool2c.pl \
 	xetexdir/unicode-char-prep.pl xetexdir/appleGlyphNames.c \
 	xetexdir/XeTeXFontMgr_Mac.mm xetexdir/ChangeLog \
-	xetexdir/LICENSE.txt xetexdir/xetex.mk omegaware/ChangeLog \
-	$(odvicopy_sources) $(odvitype_sources) $(ofm2opl_sources) \
-	$(opl2ofm_sources) $(otangle_sources) $(ovf2ovp_sources) \
-	$(ovp2ovf_sources) omegaware/level1.test \
+	xetexdir/LICENSE.txt xetexdir/xetex.mk omegaware/README \
+	omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \
+	$(ofm2opl_sources) $(opl2ofm_sources) $(otangle_sources) \
+	$(ovf2ovp_sources) $(ovp2ovf_sources) omegaware/level1.test \
 	omegaware/omfonts.test omegaware/otangle.test \
 	omegaware/specialhex.test $(aleph_web_srcs) $(aleph_ch_srcs) \
 	lib/texmfmp.c alephdir/ChangeLog alephdir/Makefile \
diff --git a/Build/source/texk/web2c/omegaware/README b/Build/source/texk/web2c/omegaware/README
new file mode 100644
index 00000000000..34593ad5ce2
--- /dev/null
+++ b/Build/source/texk/web2c/omegaware/README
@@ -0,0 +1,23 @@
+Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+You may freely use, modify and/or distribute this file.
+
+	Version 1.12 of the omfonts programs
+	====================================
+	     ( p r e l i m i n a r y )
+
+This directory contains a new Web Version 1.12 of the Omega font conversion
+programs ofm2opl, opl2ofm, ovf2ovp, and ovp2ovf.
+
+After numerous bugfixes and with a slightly modification of one algorithm
+the programs are now able to process ofm_level=-1 (TFM/VF) as well as
+ofm_level=0,1 (OFM/OVF) files.  A virtual font and the local fonts can use
+any combination of these ofm levels.
+
+For the moment VF/OVF files read by ovf2ovp must have the extension '.ovf',
+allowing '.vf' as alternative requires a modification of the Kpathsea
+library that will not be present in TL2009.
+
+Note, however, that all this is still somewhat preliminary.  In particular
+the programs still lack the thorough checking of all input data done in
+TFtoPL&Co and required to diagnose problems with faulty binary files.
+
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 800ac8bc627..0709ea1df30 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -15,7 +15,7 @@ endif !OMFONTS
 endif OTANGLE
 EXTRA_PROGRAMS += $(omegaware_programs)
 
-EXTRA_DIST += omegaware/ChangeLog
+EXTRA_DIST += omegaware/README omegaware/ChangeLog
 DISTCLEANFILES += $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
 	$(omegaware_programs:=.p) $(omegaware_programs:=-web2c)
 
diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.web b/Build/source/texk/web2c/omegaware/ovf2ovp.web
index f3cb5bcc6c7..edc2c5c8b39 100644
--- a/Build/source/texk/web2c/omegaware/ovf2ovp.web
+++ b/Build/source/texk/web2c/omegaware/ovf2ovp.web
@@ -768,7 +768,7 @@ else begin
     end;
   end;
 if lf<>(header_length+lh+ncw+nw+nh+nd+ni+nlw+nk+neew+np+
-        nki+nwi+nkf+nwf+nkr+nwr+nkg+nwg+nkp+nwp) then
+        nki+nwi+nkf+nwf+nkm+nwm+nkr+nwr+nkg+nwg+nkp+nwp) then
   abort('Subfile sizes don''t add up to the stated total!');
 @.Subfile sizes don't add up...@>
 if lh<2 then abort('The header length is only ',lh:1,'!');
@@ -818,7 +818,7 @@ glues_start:=rules_start+nkr;
 penalties_start:=glues_start+nkg;
 ivalues_base:=penalties_start+nkp;
 fvalues_base:=ivalues_base+nwi;
-mvalues_base:=fvalues_base+nwi;
+mvalues_base:=fvalues_base+nwf;
 rules_base:=mvalues_base+nwm;
 glues_base:=rules_base+nwr;
 penalties_base:=glues_base+nwg;
@@ -1275,7 +1275,7 @@ else begin
       read_tfm_word;
       end;
     end;
-  for k:=1 to lh do begin
+  for k:=1 to font_lh do begin
     read_tfm_word;
     if k=1 then @<Check the check sum@>;
     if k=2 then @<Check the design size@>;
@@ -3118,6 +3118,7 @@ begin @<Do the virtual font title@>;
 @<Do the parameters@>;
 @<Do the ivalue parameters@>;@/
 @<Do the fvalue parameters@>;@/
+@<Do the mvalue parameters@>;@/
 @<Do the rule parameters@>;@/
 @<Do the glue parameters@>;@/
 @<Do the penalty parameters@>;@/