web2c/omegaware: Fix glitches in online printing of progress report

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

10 files changed, 35 insertions, 23 deletions

diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index f7393aa627f..02e3fbc0f5b 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -15618,9 +15618,9 @@ else
   FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
   FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
   FREETYPE2_RULE='# Rebuild libfreetype
-$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
+$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
-${top_builddir}/../../libs/freetype2/ft2build.h:
+${top_builddir}/../../libs/freetype2/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index a49d65479c9..efc74746a40 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* {ofm2opl,opl2ofm,ovf2ovp,ovp2ovf}.{ch,web}: Fix glitches in
+	online printing of progress report.
+
 2014-01-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* opl2ofm.up, ovp2ovf.up: Update module numbers.
diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.ch b/Build/source/texk/web2c/omegaware/ofm2opl.ch
index e437a5b1464..05a6ace2e8e 100644
--- a/Build/source/texk/web2c/omegaware/ofm2opl.ch
+++ b/Build/source/texk/web2c/omegaware/ofm2opl.ch
@@ -227,7 +227,7 @@ f:=((tfm[k+1] mod 16)*intcast(@'400)+tfm[k+2])*@'400+tfm[k+3];
       incr(chars_on_line);
       end;
     if no_repeats(c)>0 then begin
-      print_hex(c); print('-'); print_hex(c+no_repeats(c));
+      print_hex(c); print('-'); print_hex(c+no_repeats(c)); incr(chars_on_line);
       left; out('CHARREPEAT'); out_char(c); out_char(no_repeats(c)); out_ln;
       end
     else begin
@@ -239,7 +239,7 @@ f:=((tfm[k+1] mod 16)*intcast(@'400)+tfm[k+2])*@'400+tfm[k+3];
       end;
     if no_repeats(c)>0 then begin
       if verbose then begin
-        print_hex(c); print('-'); print_hex(c+no_repeats(c));
+        print_hex(c); print('-'); print_hex(c+no_repeats(c)); incr(chars_on_line);
         end;
       left; out('CHARREPEAT'); out_char(c); out_char(no_repeats(c)); out_ln;
       end
diff --git a/Build/source/texk/web2c/omegaware/ofm2opl.web b/Build/source/texk/web2c/omegaware/ofm2opl.web
index 6e3f442ca79..0c678907aaf 100644
--- a/Build/source/texk/web2c/omegaware/ofm2opl.web
+++ b/Build/source/texk/web2c/omegaware/ofm2opl.web
@@ -1195,7 +1195,7 @@ to keep track of how many are currently there. We also keep track of
 whether or not any errors have had to be corrected.
 
 @<Glob...@>=
-@!chars_on_line:0..8; {the number of characters printed on the current line}
+@!chars_on_line:0..9; {the number of characters printed on the current line}
 @!perfect:boolean; {was the file free of errors?}
 
 @ @<Set init...@>=
@@ -1917,14 +1917,14 @@ sort_ptr:=0; {this will suppress `\.{STOP}' lines in ligature comments}
 c:=bc;
 while (c<=ec) do
   begin if width_index(c)>0 then
-    begin if chars_on_line=8 then
+    begin if chars_on_line>=8 then
       begin print_ln(' '); chars_on_line:=1;
       end
     else  begin if chars_on_line>0 then print(' ');
       incr(chars_on_line);
       end;
     if no_repeats(c)>0 then begin
-      print_hex(c); print('-'); print_hex(c+no_repeats(c));
+      print_hex(c); print('-'); print_hex(c+no_repeats(c)); incr(chars_on_line);
       left; out('CHARREPEAT'); out_char(c); out_char(no_repeats(c)); out_ln;
       end
     else begin
diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.ch b/Build/source/texk/web2c/omegaware/opl2ofm.ch
index 1d09ca8ac14..7d512e59a7c 100644
--- a/Build/source/texk/web2c/omegaware/opl2ofm.ch
+++ b/Build/source/texk/web2c/omegaware/opl2ofm.ch
@@ -136,10 +136,10 @@ if verbose then @<Print |c| in hex notation@>;
 if verbose then @<Print |c| in hex notation@>;
 @z
 @x
-print('-'); print_hex(c+crange);
+print('-'); print_hex(c+crange); incr(chars_on_line);
 @y
 if verbose then begin
-  print('-'); print_hex(c+crange);
+  print('-'); print_hex(c+crange); incr(chars_on_line);
   end;
 @z
 
diff --git a/Build/source/texk/web2c/omegaware/opl2ofm.web b/Build/source/texk/web2c/omegaware/opl2ofm.web
index 1d18184f58e..7564848daa8 100644
--- a/Build/source/texk/web2c/omegaware/opl2ofm.web
+++ b/Build/source/texk/web2c/omegaware/opl2ofm.web
@@ -599,7 +599,7 @@ code is printed in octal notation. Up to eight such codes appear on a line;
 so we have a variable to keep track of how many are currently there.
 
 @<Glob...@>=
-@!chars_on_line:0..8; {the number of characters printed on the current line}
+@!chars_on_line:0..9; {the number of characters printed on the current line}
 
 @ @<Set init...@>=
 chars_on_line:=0;
@@ -2233,7 +2233,7 @@ if ((c+crange)>max_char) then begin
   err_print('Character range too large');
   crange:=0;
   end;
-print('-'); print_hex(c+crange);
+print('-'); print_hex(c+crange); incr(chars_on_line);
 while level=1 do begin
   while cur_char=" " do get_next;
   if cur_char="(" then read_character_property
@@ -2420,7 +2420,7 @@ print_digs(j);
 end;
 
 @ @<Print |c| in hex...@>=
-begin if chars_on_line=8 then
+begin if chars_on_line>=8 then
   begin print_ln(' '); chars_on_line:=1;
   end
 else  begin if chars_on_line>0 then print(' ');
diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.ch b/Build/source/texk/web2c/omegaware/ovf2ovp.ch
index 1c6259e46aa..a29a2aebbd3 100644
--- a/Build/source/texk/web2c/omegaware/ovf2ovp.ch
+++ b/Build/source/texk/web2c/omegaware/ovf2ovp.ch
@@ -345,15 +345,23 @@ f:=((tfm[k+1] mod 16)*intcast(@'400)+tfm[k+2])*@'400+tfm[k+3];
 
 % [101] No progress reports unless verbose.
 @x
+    begin if chars_on_line=8 then
+      begin print_ln(' '); chars_on_line:=1;
+      end
+    else  begin if chars_on_line>0 then print(' ');
       incr(chars_on_line);
       end;
-    for cprime:=c to (c+no_repeats(c)) do begin
     print_hex(cprime); {progress report}
 @y
-      if verbose then incr(chars_on_line);
+    begin if verbose then
+      begin if chars_on_line=8 then
+        begin print_ln(' '); chars_on_line:=1;
+        end
+      else  begin if chars_on_line>0 then print(' ');
+        incr(chars_on_line);
+        end;
+      print_hex(cprime); {progress report}
       end;
-    for cprime:=c to (c+no_repeats(c)) do begin
-    if verbose then print_hex(cprime); {progress report}
 @z
 
 % [112] No nonlocal goto's.
diff --git a/Build/source/texk/web2c/omegaware/ovf2ovp.web b/Build/source/texk/web2c/omegaware/ovf2ovp.web
index d6d9a6f3e79..0c28b572ab2 100644
--- a/Build/source/texk/web2c/omegaware/ovf2ovp.web
+++ b/Build/source/texk/web2c/omegaware/ovf2ovp.web
@@ -2457,13 +2457,13 @@ sort_ptr:=0; {this will suppress `\.{STOP}' lines in ligature comments}
 c:=bc;
 while (c<=ec) do
   begin if width_index(c)>0 then
+   for cprime:=c to (c+no_repeats(c)) do
     begin if chars_on_line=8 then
       begin print_ln(' '); chars_on_line:=1;
       end
     else  begin if chars_on_line>0 then print(' ');
       incr(chars_on_line);
       end;
-    for cprime:=c to (c+no_repeats(c)) do begin
     print_hex(cprime); {progress report}
     left; out('CHARACTER'); out_char(cprime); out_ln;
     if ofm_on then check_unused(c);
@@ -2506,7 +2506,6 @@ while (c<=ec) do
     if not do_map(cprime) then goto final_end;
     right;
     end;
-    end;
   c:=c+1+no_repeats(c);
   end
 
diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.ch b/Build/source/texk/web2c/omegaware/ovp2ovf.ch
index f003e8bf211..80a34d00f28 100644
--- a/Build/source/texk/web2c/omegaware/ovp2ovf.ch
+++ b/Build/source/texk/web2c/omegaware/ovp2ovf.ch
@@ -131,10 +131,10 @@ if verbose then @<Print |c| in hex notation@>;
 if verbose then @<Print |c| in hex notation@>;
 @z
 @x
-print('-'); print_hex(c+crange);
+print('-'); print_hex(c+crange); incr(chars_on_line);
 @y
 if verbose then begin
-  print('-'); print_hex(c+crange);
+  print('-'); print_hex(c+crange); incr(chars_on_line);
   end;
 @z
 
diff --git a/Build/source/texk/web2c/omegaware/ovp2ovf.web b/Build/source/texk/web2c/omegaware/ovp2ovf.web
index c09ed23af6b..e10d0faaa7f 100644
--- a/Build/source/texk/web2c/omegaware/ovp2ovf.web
+++ b/Build/source/texk/web2c/omegaware/ovp2ovf.web
@@ -774,7 +774,7 @@ code is printed in octal notation. Up to eight such codes appear on a line;
 so we have a variable to keep track of how many are currently there.
 
 @<Glob...@>=
-@!chars_on_line:0..8; {the number of characters printed on the current line}
+@!chars_on_line:0..9; {the number of characters printed on the current line}
 
 @ @<Set init...@>=
 chars_on_line:=0;
@@ -2613,7 +2613,7 @@ if ((c+crange)>max_char) then begin
   err_print('Character range too large');
   crange:=0;
   end;
-print('-'); print_hex(c+crange);
+print('-'); print_hex(c+crange); incr(chars_on_line);
 while level=1 do begin
   while cur_char=" " do get_next;
   if cur_char="(" then read_character_property
@@ -2804,7 +2804,7 @@ print_digs(j);
 end;
 
 @ @<Print |c| in hex...@>=
-begin if chars_on_line=8 then begin
+begin if chars_on_line>=8 then begin
   print_ln(' '); chars_on_line:=1;
   end
 else begin