texlive[67648] Build/source/texk/web2c/cwebdir: [CWEB] Straighten

[commits+ascherer at tug.org]

Revision: 67648
          http://tug.org/svn/texlive?view=revision&revision=67648
Author:   ascherer
Date:     2023-07-16 15:50:42 +0200 (Sun, 16 Jul 2023)
Log Message:
-----------
[CWEB] Straighten case logic in sections 263/280 and 316.

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 00:47:17 UTC (rev 67647)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-mini.ch	2023-07-16 13:50:42 UTC (rev 67648)
@@ -1950,6 +1950,14 @@
   @+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 00:47:17 UTC (rev 67647)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2023-07-16 13:50:42 UTC (rev 67648)
@@ -1252,13 +1252,6 @@
 @z
 
 @x
-  case wildcard: out_str("\\9");@+ goto not_an_identifier;
- at y
-  case roman: out_str("  ");@+ goto not_an_identifier;
-  case wildcard: out_str("\\9");@+ goto not_an_identifier;
- at z
-
- at x
   case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
   case custom:
     out_str("$\\");
@@ -1267,6 +1260,7 @@
     out('$');
     goto name_done;
 @y
+  case roman: out_str("  ");
 not_an_identifier: out_name(cur_name,false); goto name_done;
   case custom: out_str("\\$"); break;
 @.\\\$@>
@@ -1885,9 +1879,8 @@
     if (is_tiny(cur_name)) out_str("\\|");
     else {
       for (j=cur_name->byte_start;j<(cur_name+1)->byte_start;j++)
-        if (xislower(*j)) goto lowcase;
-      goto allcaps;
-lowcase: out_str("\\\\");
+        if (xislower(*j)) { out_str("\\\\");@+ break; }
+      out_str("\\."); /* \.{UPPERCASE} */
     }
   break;
 @.\\|@>
@@ -1895,7 +1888,7 @@
 @.\\\\@>
   case wildcard: out_str("\\9"); break;
 @.\\9@>
-  case typewriter: allcaps: out_str("\\.");
+  case typewriter: out_str("\\."); break;
 @.\\.@>
   case roman: break;
   case custom:

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 00:47:17 UTC (rev 67647)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2023-07-16 13:50:42 UTC (rev 67648)
@@ -4774,9 +4774,8 @@
     if (is_tiny(cur_name)) out_str("\\|");
     else {
       for (j=cur_name->byte_start;j<(cur_name+1)->byte_start;j++)
-        if (xislower(*j)) goto lowcase;
-      out_str("\\."); break;
-lowcase: out_str("\\\\");
+        if (xislower(*j)) { out_str("\\\\");@+ break; }
+      out_str("\\."); /* \.{UPPERCASE} */
     }
     break;
 @.\\|@>
@@ -4784,8 +4783,7 @@
 @.\\\\@>
   case wildcard: out_str("\\9");@+ goto not_an_identifier;
 @.\\9@>
-  case typewriter: out_str("\\.");
-  @=/* fall through */@>@;
+  case typewriter: out_str("\\.");@+ goto not_an_identifier;
 @.\\.@>
   case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
   case custom: