summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2023-07-16 13:50:42 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2023-07-16 13:50:42 +0000
commit7d872ada040cbe958cff98ad58cbfd5720166cb6 (patch)
tree705cc35cdd5f7d7092cff1e3c76ed4dd9b8c16b7
parent8ab502c61dd1b6bdde94c1f05a89214f5e92d4ba (diff)
[CWEB] Straighten case logic in sections 263/280 and 316.
git-svn-id: svn://tug.org/texlive/trunk@67648 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-mini.ch8
-rw-r--r--Build/source/texk/web2c/cwebdir/ctwill-w2c.ch15
-rw-r--r--Build/source/texk/web2c/cwebdir/cweave.w8
3 files changed, 15 insertions, 16 deletions
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
index 6ed7400dc3c..e8617e437d7 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-mini.ch
@@ -1950,6 +1950,14 @@ Section 279.
@+cur_name=sort_ptr->head;@/
@z
+Section 280.
+
+@x
+ if (xislower(*j)) { out_str("\\\\");@+ break; }
+@y
+ if (xislower(*j)) { out_str("\\\\");@+ break;@+ }
+@z
+
Section 285.
@x
diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
index 5bcaecae0e1..c7acb53960f 100644
--- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
+++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
@@ -1252,13 +1252,6 @@ switch (cur_name->ilk) {
@z
@x
- case wildcard: out_str("\\9");@+ goto not_an_identifier;
-@y
- case roman: out_str(" ");@+ goto not_an_identifier;
- case wildcard: out_str("\\9");@+ goto not_an_identifier;
-@z
-
-@x
case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
case custom:
out_str("$\\");
@@ -1267,6 +1260,7 @@ switch (cur_name->ilk) {
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 @@ switch (cur_name->ilk) {@+char *j;@+@t}\6{\4@>
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 @@ lowcase: out_str("\\\\");
@.\\\\@>
case wildcard: out_str("\\9"); break;
@.\\9@>
- case typewriter: allcaps: out_str("\\.");
+ case typewriter: out_str("\\."); break;
@.\\.@>
case roman: break;
case custom:
diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w
index dc645e94d65..c0f14a20d3e 100644
--- a/Build/source/texk/web2c/cwebdir/cweave.w
+++ b/Build/source/texk/web2c/cwebdir/cweave.w
@@ -4774,9 +4774,8 @@ switch (cur_name->ilk) {@+char *j;@+@t}\6{\4@>
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 @@ lowcase: out_str("\\\\");
@.\\\\@>
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: