summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-06-05 21:03:29 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-06-05 21:03:29 +0000
commit4834fcaa9a100ed230f6185f0bb135f17ca74185 (patch)
tree38b220ad05b2cf6acb2d34c76bef3524562c0682 /Build
parentde06c7609f7c5ae994f40fefd6303dd494e012d1 (diff)
[CWEB] Fix newline blunder in case of error.
A post on the tex-k list (see https://tug.org/pipermail/tex-k/2020-Jun/003198.html) revealed a bug in the 'common' code: Trying to avoid an empty line in a normal run with option '-p' ("show no progress messages") suppressed a necessary newline in an faulty run. git-svn-id: svn://tug.org/texlive/trunk@55422 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rw-r--r--Build/source/texk/web2c/cwebboot.cin2
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/cwebdir/comm-w2c.ch2
4 files changed, 10 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index eacf0e65515..61301da3b57 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebboot.cin: Fix newline blunder in case of error.
+
2020-06-04 Andreas Scherer <https://ascherer.github.io>
* bibtex.ch: Purge 'active E' chunk completely.
diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin
index 4615c95bd75..1cbb77dc6ae 100644
--- a/Build/source/texk/web2c/cwebboot.cin
+++ b/Build/source/texk/web2c/cwebboot.cin
@@ -1310,7 +1310,7 @@ update_terminal;mark_error;
#line 804 "cwebdir/comm-w2c.ch"
int wrap_up(void){
-if(show_progress)new_line;
+if(show_progress||show_happiness||(history> spotless))new_line;
#line 1153 "cwebdir/common.w"
if(show_stats)
print_stats();
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index 51c8d0ed710..79b89554b66 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch: Fix newline blunder in case of error.
+
2020-06-01 Andreas Scherer <https://ascherer.github.io>
* texinputs/pdfwebtocfront.tex: Adapt to 'pwebmac.tex 4.5.2.
diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
index 45de7df1714..34b92c1e6e2 100644
--- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch
@@ -802,7 +802,7 @@ int wrap_up() {
putchar('\n');
@y
int wrap_up(void) {
- if (show_progress) new_line;
+ if (show_progress || show_happiness || (history > spotless)) new_line;
@z
@x