texlive[67649] Build/source/texk/web2c/cwebdir: [CWEB] Fix last

[commits+ascherer at tug.org]

Revision: 67649
          http://tug.org/svn/texlive?view=revision&revision=67649
Author:   ascherer
Date:     2023-07-16 16:52:40 +0200 (Sun, 16 Jul 2023)
Log Message:
-----------
[CWEB] Fix last commit.

Ouch, my bad! 'break' jumps out of the 'for' loop, not out of the
'switch' group. :o)

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

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-07-16 13:50:42 UTC (rev 67648)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-07-16 14:52:40 UTC (rev 67649)
@@ -1947,17 +1947,9 @@
 @x
   cur_name=sort_ptr->head;
 @y
-  @+cur_name=sort_ptr->head;@/
+  cur_name=sort_ptr->head;@/
 @z
 
-Section 280.
-
- at x
-        if (xislower(*j)) { out_str("\\\\");@+ break; }
- at y
-        if (xislower(*j)) { out_str("\\\\");@+ break;@+ }
- at z
-
 Section 285.
 
 @x

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2023-07-16 13:50:42 UTC (rev 67648)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2023-07-16 14:52:40 UTC (rev 67649)
@@ -1246,9 +1246,9 @@
 @z
 
 @x
-    else {
+    else {@+boolean all_caps=true;@+ at t}\6{@>
 @y
-    else {@+char *j;@+ at t}\6{@>
+    else {@+boolean all_caps=true;@+char *j;@+ at t}\6{@>
 @z
 
 @x
@@ -1877,10 +1877,10 @@
 switch (cur_name->ilk) {@+char *j;@+ at t}\6{\4@>
   case normal: case func_template:
     if (is_tiny(cur_name)) out_str("\\|");
-    else {
+    else {@+boolean all_caps=true;@+ at t}\6{@>
       for (j=cur_name->byte_start;j<(cur_name+1)->byte_start;j++)
-        if (xislower(*j)) { out_str("\\\\");@+ break; }
-      out_str("\\."); /* \.{UPPERCASE} */
+        if (xislower(*j)) all_caps=false;
+      out_str(all_caps ? "\\." : "\\\\");
     }
   break;
 @.\\|@>

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 13:50:42 UTC (rev 67648)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 14:52:40 UTC (rev 67649)
@@ -4772,10 +4772,10 @@
 switch (cur_name->ilk) {@+char *j;@+ at t}\6{\4@>
   case normal: case func_template:
     if (is_tiny(cur_name)) out_str("\\|");
-    else {
+    else {@+boolean all_caps=true;@+ at t}\6{@>
       for (j=cur_name->byte_start;j<(cur_name+1)->byte_start;j++)
-        if (xislower(*j)) { out_str("\\\\");@+ break; }
-      out_str("\\."); /* \.{UPPERCASE} */
+        if (xislower(*j)) all_caps=false;
+      out_str(all_caps ? "\\." : "\\\\");
     }
     break;
 @.\\|@>