omegaware: Prepare for upTeX versions

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

5 files changed, 8 insertions, 13 deletions

diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 42838ba68f3..bc3d2692e5d 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* opl2ofm.web: Correctly compute mem_size=max_char*4+8;
+	* ofm2opl.web, ovf2ovp.web: Drop unused mem_size.
+
+	* ovf2ovp.ch: Shorten change set (for upTeX version).
+
 2011-12-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* selectfont.test, tests/sample.out, tests/sample.ovp,
diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.web b/Build/source/texk/web2c/omegaware/ofm2opl.web
index 1dd7039ba01..4b402e76fb5 100644
--- a/Build/source/texk/web2c/omegaware/ofm2opl.web
+++ b/Build/source/texk/web2c/omegaware/ofm2opl.web
@@ -129,7 +129,6 @@ reduce \.{TFtoPL}'s capacity.
 @!xmax_char=65536; {|max_char|+1}
 @!xxmax_char=65537;{|max_char|+2}
 @!xmax_label=80001;{must be greater than |max_lig_steps|}
-@!mem_size=262152; {|max_char|*4+8}
 
 @ Here are some macros for common programming idioms.
 
diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.web b/Build/source/texk/web2c/omegaware/opl2ofm.web
index e03f745d204..89a591d8666 100644
--- a/Build/source/texk/web2c/omegaware/opl2ofm.web
+++ b/Build/source/texk/web2c/omegaware/opl2ofm.web
@@ -132,7 +132,7 @@ reduce \.{PLtoTF}'s capacity.
 @!xmax_char=65536; {|max_char|+1}
 @!xxmax_char=65537;{|max_char|+2}
 @!xxxmax_char=65538;{|max_char|+3}
-@!mem_size=262144; {|max_char|*4+8}
+@!mem_size=262148; {|max_char|*4+8}
 @!max_width=65535; {the largest character width number}
 @!max_height=255; {the largest character height number}
 @!max_depth=255; {the largest character depth number}
diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.ch b/Build/source/texk/web2c/omegaware/ovf2ovp.ch
index 24ec29f0a02..caead6f17b3 100644
--- a/Build/source/texk/web2c/omegaware/ovf2ovp.ch
+++ b/Build/source/texk/web2c/omegaware/ovf2ovp.ch
@@ -167,18 +167,8 @@ print_ln('pt')
 
 @x [39] Open another TFM file.
 reset(tfm_file,cur_name);
-@^system dependencies@>
-if eof(tfm_file) then
-  print_ln('---not loaded, font metric file can''t be opened!')
-@.font metric file can\'t be opened@>
-else  begin font_bc:=0; font_ec:=65536; {will cause error if not modified soon}
 @y
 tfm_file := kpse_open_file (cur_name, kpse_ofm_format);
-@^system dependencies@>
-if eof(tfm_file) then
-  print_ln('---not loaded, font metric file can''t be opened!')
-@.font metric file can\'t be opened@>
-else  begin font_bc:=0; font_ec:=65536; {will cause error if not modified soon}
 @z
 
 @x [40] Be quiet if not -verbose.
diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.web b/Build/source/texk/web2c/omegaware/ovf2ovp.web
index 589271cd5ec..35885afcda3 100644
--- a/Build/source/texk/web2c/omegaware/ovf2ovp.web
+++ b/Build/source/texk/web2c/omegaware/ovf2ovp.web
@@ -117,7 +117,6 @@ reduce \.{VFtoVP}'s capacity.
 @!xmax_char=65536; {|max_char|+1}
 @!xxmax_char=65537;{|max_char|+2}
 @!xmax_label=80001;{must be greater than |max_lig_steps|}
-@!mem_size=40008; {|max_char|*4+8}
 @!name_length=50; {a file name shouldn't be longer than this}
 @!max_stack=50; {maximum depth of \.{DVI} stack in character packets}