diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-31 12:59:39 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-07-31 12:59:39 +0000 |
commit | eb4571bc2de59e9a184977ff4dd9baded863722c (patch) | |
tree | 119782aec451347aee208130d417ad45762475f9 /Build | |
parent | a28ea11a38e0166d492eebfa724103ec32f21cd6 (diff) |
texk/web2c/omegaware: Fixed a bug in computation of lf
git-svn-id: svn://tug.org/texlive/trunk@34787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/web2c/omegaware/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/opl2ofm.ch | 14 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/opl2ofm.web | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/ovp2ovf.ch | 14 | ||||
-rw-r--r-- | Build/source/texk/web2c/omegaware/ovp2ovf.web | 6 |
5 files changed, 14 insertions, 32 deletions
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog index 9179924aebe..9398c4d3bf3 100644 --- a/Build/source/texk/web2c/omegaware/ChangeLog +++ b/Build/source/texk/web2c/omegaware/ChangeLog @@ -1,3 +1,9 @@ +2014-07-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * opl2ofm.web, ovp2ovf.web: Fixed a bug in computation of lf. + * opl2ofm.{ch,web}: Adapted (more) to PLtoTF Version 3.6. + * ovp2ovf.{ch,web}: Adapted (more) to VPtoVF Version 1.6. + 2014-07-09 Peter Breitenlohner <peb@mppmu.mpg.de> * am/omegaware.am: Drop Automake conditional OMFONTS. diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.ch b/Build/source/texk/web2c/omegaware/opl2ofm.ch index 7d512e59a7c..38e79328be9 100644 --- a/Build/source/texk/web2c/omegaware/opl2ofm.ch +++ b/Build/source/texk/web2c/omegaware/opl2ofm.ch @@ -94,20 +94,6 @@ correspond to one-character constants like \.{"A"} in \.{WEB} language. @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} diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.web b/Build/source/texk/web2c/omegaware/opl2ofm.web index efb401ef08e..caf1aab169a 100644 --- a/Build/source/texk/web2c/omegaware/opl2ofm.web +++ b/Build/source/texk/web2c/omegaware/opl2ofm.web @@ -650,10 +650,12 @@ if left_ln then if eof(pl_file) then begin limit:=1; buffer[1]:=')'; right_ln:=false; input_has_ended:=true; end -else begin while (limit<buf_size-1)and(not eoln(pl_file)) do +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; if left_ln then @<Set |loc| to the number of leading blanks in the buffer, and check the indentation@>; end; @@ -2835,7 +2837,7 @@ case ofm_level of end; 0: begin lf:=14+lh+2*(ec-bc+1)+memory[width]+memory[height]+memory[depth]+ - memory[italic]+2*nl+lk_offset+nk+2*ne+np; + memory[italic]+2*(nl+lk_offset)+nk+2*ne+np; end; 1: begin @<Compute the character info size@>; diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.ch b/Build/source/texk/web2c/omegaware/ovp2ovf.ch index 80a34d00f28..1c727230122 100644 --- a/Build/source/texk/web2c/omegaware/ovp2ovf.ch +++ b/Build/source/texk/web2c/omegaware/ovp2ovf.ch @@ -84,20 +84,6 @@ correspond to one-character constants like \.{"A"} in \.{WEB} language. @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-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} diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.web b/Build/source/texk/web2c/omegaware/ovp2ovf.web index 8e1c0604388..718a66cb2d5 100644 --- a/Build/source/texk/web2c/omegaware/ovp2ovf.web +++ b/Build/source/texk/web2c/omegaware/ovp2ovf.web @@ -826,10 +826,12 @@ if left_ln then if eof(vpl_file) then begin limit:=1; buffer[1]:=')'; right_ln:=false; input_has_ended:=true; end -else begin while (limit<buf_size-1)and(not eoln(vpl_file)) do +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; if left_ln then @<Set |loc| to the number of leading blanks in the buffer, and check the indentation@>; end; @@ -3472,7 +3474,7 @@ case ofm_level of end; 0: begin lf:=14+lh+2*(ec-bc+1)+memory[width]+memory[height]+memory[depth]+ - memory[italic]+2*nl+lk_offset+nk+2*ne+np; + memory[italic]+2*(nl+lk_offset)+nk+2*ne+np; end; 1: begin @<Compute the character info size@>; |