summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-05 23:24:43 +0000
committerKarl Berry <karl@freefriends.org>2021-02-05 23:24:43 +0000
commit11dd027cbf5f7643d5d61250363ab0f6c7575faa (patch)
tree6fa7179276037566ef95a65ceeb928886c64ac54 /Build
parent83253b17059e5319d5a096e52e3cbd92f3602fb6 (diff)
\tracingparagraphs mode fix fix from DEK
git-svn-id: svn://tug.org/texlive/trunk@57629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog7
-rw-r--r--Build/source/texk/web2c/mf.ch6
-rw-r--r--Build/source/texk/web2c/mf.web3
-rw-r--r--Build/source/texk/web2c/tex.web7
-rw-r--r--Build/source/texk/web2c/triptrap/trip.log1
5 files changed, 13 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 8f057821caf..30fd6838a24 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,10 @@
+2021-02-05 Donald Knuth <tex-k@tug.org>
+
+ * mf.web,
+ * tex.web: further fixes. Reports from Udo Wermuth
+ and Phelype Oleinik.
+ * triptrap/trip.log: update for newly added blank line.
+
2021-01-31 Karl Berry <karl@freefriends.org>
* weave.ch (banner): 4.5.
diff --git a/Build/source/texk/web2c/mf.ch b/Build/source/texk/web2c/mf.ch
index 1e817753dde..abe01851d93 100644
--- a/Build/source/texk/web2c/mf.ch
+++ b/Build/source/texk/web2c/mf.ch
@@ -1954,12 +1954,6 @@ if (edit_name_start<>0) and (interaction>batch_mode) then
@!init if ini_version then begin store_base_file; return;end;@+tini@/
@z
-@x
-fix_date_and_time; init_randoms(sys_time+sys_day);@/
-@y
-fix_date_and_time; init_randoms(internal[time]+internal[day]);@/
-@z
-
%@x [49.1211] l.23002 - Handle %&base line.
%if (base_ident=0)or(buffer[loc]="&") then
%@y
diff --git a/Build/source/texk/web2c/mf.web b/Build/source/texk/web2c/mf.web
index 9bd87b3141d..065dd2f8021 100644
--- a/Build/source/texk/web2c/mf.web
+++ b/Build/source/texk/web2c/mf.web
@@ -4314,7 +4314,6 @@ routines are going to work.
@!old_setting:0..max_selector;
@!sys_time,@!sys_day,@!sys_month,@!sys_year:integer;
{date and time supplied by external system}
-@^system dependencies@>
@ We will occasionally use |begin_diagnostic| in connection with line-number
printing, as follows. (The parameter |s| is typically |"Path"| or
@@ -23053,7 +23052,7 @@ if (base_ident=0)or(buffer[loc]="&") then
while (loc<limit)and(buffer[loc]=" ") do incr(loc);
end;
buffer[limit]:="%";@/
-fix_date_and_time; init_randoms(sys_time+sys_day);@/
+fix_date_and_time; init_randoms(sys_time+sys_day*unity);@/
@<Initialize the print |selector|...@>;
if loc<limit then if buffer[loc]<>"\" then start_input; {\&{input} assumed}
end
diff --git a/Build/source/texk/web2c/tex.web b/Build/source/texk/web2c/tex.web
index 65d0279f827..62374028b2c 100644
--- a/Build/source/texk/web2c/tex.web
+++ b/Build/source/texk/web2c/tex.web
@@ -1766,8 +1766,7 @@ error messages are
\hang|term_only| (when |interaction>batch_mode| and |log_file| not yet open);
-\hang|log_only| (when |interaction=batch_mode| and |log_file| is open,
- or when tracing paragraphs);
+\hang|log_only| (when |interaction=batch_mode| and |log_file| is open);
\hang|term_and_log| (when |interaction>batch_mode| and |log_file| is open).
@@ -1883,7 +1882,7 @@ var c:ASCII_code; {what the user types}
{used to save global variables when deleting tokens}
begin if history<error_message_issued then history:=error_message_issued;
print_char("."); show_context;
-if interaction=error_stop_mode then if selector<>log_only then
+if interaction=error_stop_mode then
@<Get user's advice and |return|@>;
incr(error_count);
if error_count=100 then
@@ -16290,6 +16289,7 @@ function finite_shrink(@!p:pointer):pointer; {recovers from infinite shrinkage}
var q:pointer; {new glue specification}
begin if no_shrink_error_yet then
begin no_shrink_error_yet:=false;
+ @!stat if tracing_paragraphs>0 then end_diagnostic(true);@+tats@;
print_err("Infinite glue shrinkage found in a paragraph");
@.Infinite glue shrinkage...@>
help5("The paragraph just ended includes some glue that has")@/
@@ -16298,6 +16298,7 @@ begin if no_shrink_error_yet then
("of any length to fit on one line. But it's safe to proceed,")@/
("since the offensive shrinkability has been made finite.");
error;
+ @!stat if tracing_paragraphs>0 then begin_diagnostic;@+tats@;
end;
q:=new_spec(p); shrink_order(q):=normal;
delete_glue_ref(p); finite_shrink:=q;
diff --git a/Build/source/texk/web2c/triptrap/trip.log b/Build/source/texk/web2c/triptrap/trip.log
index 13b2af19d83..37d7c29d07f 100644
--- a/Build/source/texk/web2c/triptrap/trip.log
+++ b/Build/source/texk/web2c/triptrap/trip.log
@@ -1836,6 +1836,7 @@ the \fontdimen values needed in math symbol fonts.
{restoring \mathsurround=0.0pt}
{restoring \fam=0}
{horizontal mode: \par}
+
! Infinite glue shrinkage found in a paragraph.
l.210 ...round60pt\hbox{$$}$\par
}