minor pltotf/vptovf bug fix

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

6 files changed, 102 insertions, 0 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index fcda8873285..8fce04bcc29 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pltotf.ch, vptovf.ch: Bug fix, from ptexdir/ppltotf.ch by
+	Ken Nakano <nakano@nextsolution.co.jp>.
+
 2010-04-21  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* bibtex.ch: Fix a small bug (duplicate entry) in bibtex.web.
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index b1578d99a62..bc60822e75f 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* opl2ofm.ch, ovp2ovf.ch: Bug fix, from ../ptexdir/ppltotf.ch by
+	Ken Nakano <nakano@nextsolution.co.jp>.
+
 2010-04-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* odvicopy.ch (dvi_name): New global variable.
diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.ch b/Build/source/texk/web2c/omegaware/opl2ofm.ch
index 2510e995faa..98b0b02a008 100644
--- a/Build/source/texk/web2c/omegaware/opl2ofm.ch
+++ b/Build/source/texk/web2c/omegaware/opl2ofm.ch
@@ -93,6 +93,29 @@ rewritebin (tfm_file, tfm_name);
 @d first_ord=0 {ordinal number of the smallest element of |char|}
 @z
 
+@x [28] (fill_buffer) end-of-line counts as a delimiter. Possibly a bug.
+  while (limit<buf_size-1)and(not eoln(pl_file)) do begin
+    incr(limit); read(pl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(pl_file);
+@y
+  while (limit<buf_size-2)and(not eoln(pl_file)) do begin
+    incr(limit); read(pl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(pl_file);
+  if right_ln then begin incr(limit); buffer[limit+1]:=' ';
+    end;
+@z
+
+@x [31] (get_keyword_char) Unnecessary due to previous change.
+begin while (loc=limit)and(not right_ln) do fill_buffer;
+if loc=limit then cur_char:=" " {end-of-line counts as a delimiter}
+else begin
+@y
+begin while loc=limit do fill_buffer;
+begin
+@z
+
 @x [79] `index' might be a library routine.
 |k|th element of its list.
 @y
diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.ch b/Build/source/texk/web2c/omegaware/ovp2ovf.ch
index 8e5695027a1..50487ed175c 100644
--- a/Build/source/texk/web2c/omegaware/ovp2ovf.ch
+++ b/Build/source/texk/web2c/omegaware/ovp2ovf.ch
@@ -89,6 +89,29 @@ rewritebin (tfm_file, tfm_name);
 @d first_ord=0 {ordinal number of the smallest element of |char|}
 @z
 
+@x [34] (fill_buffer) end-of-line counts as a delimiter. Possibly a bug.
+  while (limit<buf_size-1)and(not eoln(vpl_file)) do begin
+    incr(limit); read(vpl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(vpl_file);
+@y
+  while (limit<buf_size-1)and(not eoln(vpl_file)) do begin
+    incr(limit); read(vpl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(vpl_file);
+  if right_ln then begin incr(limit); buffer[limit+1]:=' ';
+    end;
+@z
+
+@x [37] (get_keyword_char) Unnecessary due to previous change.
+begin while (loc=limit)and(not right_ln) do fill_buffer;
+if loc=limit then cur_char:=" " {end-of-line counts as a delimiter}
+else begin
+@y
+begin while loc=limit do fill_buffer;
+begin
+@z
+
 % [89] `index' is not a good choice for an identifier on Unix systems.
 % Neither is `class', on AIX.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Build/source/texk/web2c/pltotf.ch b/Build/source/texk/web2c/pltotf.ch
index de2951933e6..c75a73ddb97 100644
--- a/Build/source/texk/web2c/pltotf.ch
+++ b/Build/source/texk/web2c/pltotf.ch
@@ -89,6 +89,29 @@ rewritebin (tfm_file, tfm_name);
 @d first_ord=0 {ordinal number of the smallest element of |char|}
 @z
 
+@x [28] (fill_buffer) end-of-line counts as a delimiter. Possibly a bug.
+else  begin while (limit<buf_size-1)and(not eoln(pl_file)) do
+    begin incr(limit); read(pl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(pl_file);
+@y
+else  begin while (limit<buf_size-2)and(not eoln(pl_file)) do
+    begin incr(limit); read(pl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(pl_file);
+  if right_ln then begin incr(limit); buffer[limit+1]:=' ';
+    end;
+@z
+
+@x [31] (get_keyword_char) Unnecessary due to previous change.
+begin while (loc=limit)and(not right_ln) do fill_buffer;
+if loc=limit then cur_char:=" " {end-of-line counts as a delimiter}
+else  begin cur_char:=xord[buffer[loc+1]];
+@y
+begin while loc=limit do fill_buffer;
+  begin cur_char:=xord[buffer[loc+1]];
+@z
+
 @x [79] `index' might be a library routine.
 |k|th element of its list.
 @y
diff --git a/Build/source/texk/web2c/vptovf.ch b/Build/source/texk/web2c/vptovf.ch
index 3e558952d62..2c859b76ee7 100644
--- a/Build/source/texk/web2c/vptovf.ch
+++ b/Build/source/texk/web2c/vptovf.ch
@@ -83,6 +83,29 @@ rewritebin (tfm_file, tfm_name);
 @d first_ord=0 {ordinal number of the smallest element of |char|}
 @z
 
+@x [34] (fill_buffer) end-of-line counts as a delimiter. Possibly a bug.
+else  begin while (limit<buf_size-1)and(not eoln(vpl_file)) do
+    begin incr(limit); read(vpl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(vpl_file);
+@y
+else  begin while (limit<buf_size-2)and(not eoln(vpl_file)) do
+    begin incr(limit); read(vpl_file,buffer[limit]);
+    end;
+  buffer[limit+1]:=' '; right_ln:=eoln(vpl_file);
+  if right_ln then begin incr(limit); buffer[limit+1]:=' ';
+    end;
+@z
+
+@x [37] (get_keyword_char) Unnecessary due to previous change.
+begin while (loc=limit)and(not right_ln) do fill_buffer;
+if loc=limit then cur_char:=" " {end-of-line counts as a delimiter}
+else  begin cur_char:=xord[buffer[loc+1]];
+@y
+begin while loc=limit do fill_buffer;
+  begin cur_char:=xord[buffer[loc+1]];
+@z
+
 % [89] `index' is not a good choice for an identifier on Unix systems.
 % Neither is `class', on AIX.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%