texlive[63183] Build/source/texk/web2c/cwebdir: [CWEB] Fix a

[commits+ascherer at tug.org]

Revision: 63183
          http://tug.org/svn/texlive?view=revision&revision=63183
Author:   ascherer
Date:     2022-04-30 18:16:09 +0200 (Sat, 30 Apr 2022)
Log Message:
-----------
[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.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
    trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
    trunk/Build/source/texk/web2c/cwebdir/cweave.w

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2022-04-30 09:13:35 UTC (rev 63182)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2022-04-30 16:16:09 UTC (rev 63183)
@@ -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,

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2022-04-30 09:13:35 UTC (rev 63182)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2022-04-30 16:16:09 UTC (rev 63183)
@@ -671,14 +671,14 @@
 @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

Modified: trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch	2022-04-30 09:13:35 UTC (rev 63182)
+++ trunk/Build/source/texk/web2c/cwebdir/cweav-w2c.ch	2022-04-30 16:16:09 UTC (rev 63183)
@@ -309,13 +309,13 @@
 @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

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2022-04-30 09:13:35 UTC (rev 63182)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2022-04-30 16:16:09 UTC (rev 63183)
@@ -2644,7 +2644,7 @@
 
 @<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);