summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2022-04-30 16:16:09 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2022-04-30 16:16:09 +0000
commit1d49888d9e901de30bacf6653082e9ef4180e3d7 (patch)
treecf519f1f6e5f0d84137446e8043687c0d4ce0867 /Build
parentbb8806a19250194fd6af49fc358aeee3b3513964 (diff)
[CWEB] Fix a preprocessor issue.
In the very rare case of a multi-line preprocessor macro as in file 'gb_io.w' of The Stanford GraphBase, CWEAVE issued a spurious line '\1\1\2\2\6' that forces an extra empty line in the TeX output. git-svn-id: svn://tug.org/texlive/trunk@63183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/cwebdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch6
-rw-r--r--Build/source/texk/web2c/cwebdir/cweav-w2c.ch4
-rw-r--r--Build/source/texk/web2c/cwebdir/cweave.w2
4 files changed, 12 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog
index a85748558a4..b45da0eee5a 100644
--- a/Build/source/texk/web2c/cwebdir/ChangeLog
+++ b/Build/source/texk/web2c/cwebdir/ChangeLog
@@ -1,3 +1,9 @@
+2022-04-30 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w: Fix a preprocessor issue (gb_io.w).
+
2022-03-10 Andreas Scherer <https://ascherer.github.io>
* Makefile,
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index 9924a47946e..b7166e6a9c9 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -671,14 +671,14 @@ static token_pointer tok_loc; /* where the first identifier appears */
@x
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@y
@<Cases for |exp|@>=
if(cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); make_ministring(pp); big_app1(pp);
- if (indent_param_decl) big_app(dindent);
+ make_underlined(pp); make_ministring(pp);
+ if (indent_param_decl) big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
index 2f776674788..9a3b4b885f7 100644
--- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
@@ -309,13 +309,13 @@ print_text( /* prints a token list for debugging; not used in |main| */
@x
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@y
@<Cases for |exp|@>=
if(cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); if (indent_param_decl) big_app(dindent);
+ make_underlined(pp); if (indent_param_decl) big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@z
diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w
index f23baa3dabc..f0938cd58a5 100644
--- a/Build/source/texk/web2c/cwebdir/cweave.w
+++ b/Build/source/texk/web2c/cwebdir/cweave.w
@@ -2644,7 +2644,7 @@ to be performed.
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
else if (cat1==unop) squash(pp,2,exp,-2,2);