diff options
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftex.web | 7 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.web | 7 |
5 files changed, 20 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 30fd6838a24..9106d881c52 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2021-02-05 Karl Berry <karl@freefriends.org> + + * mf.ch: adjust for latest fixes. + 2021-02-05 Donald Knuth <tex-k@tug.org> * mf.web, diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 399a38b2d10..def85fb109f 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2021-02-06 Akira Kakuto <kakuto@w32tex.org> + + * pdftex.web: sync \tracingparagraphs fix from tex.web. + 2021-01-28 Marcel Fabian Krueger <tex@2krueger.de> * tounicode.c ((un)dumptounicode): use integer, not size_t, diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index 373dfd0dcf9..ea81cb048dd 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -1902,8 +1902,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). @@ -2019,7 +2018,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 @@ -24288,6 +24287,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")@/ @@ -24296,6 +24296,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/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 22cb68e501f..183e0d2a9a0 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,3 +1,7 @@ +2021-02-06 Akira Kakuto <kakuto@w32tex.org> + + * xetex.web: sync \tracingparagraphs fix from tex.web. + 2020-10-13 Akira Kakuto <kakuto@w32tex.org> * xetexextra.c: Sync with W32 sources. diff --git a/Build/source/texk/web2c/xetexdir/xetex.web b/Build/source/texk/web2c/xetexdir/xetex.web index 8133d05d46d..d006156a139 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.web +++ b/Build/source/texk/web2c/xetexdir/xetex.web @@ -1994,8 +1994,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). @@ -2111,7 +2110,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 @@ -19916,6 +19915,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")@/ @@ -19924,6 +19924,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; |