texlive[68418] Build/source/texk/web2c/cwebdir: [CWEB] HiTeX does not

[commits+ascherer at tug.org]

Revision: 68418
          https://tug.org/svn/texlive?view=revision&revision=68418
Author:   ascherer
Date:     2023-10-01 17:50:46 +0200 (Sun, 01 Oct 2023)
Log Message:
-----------
[CWEB] HiTeX does not produce PDF output.

In cwebacromac, we visually group the sets of '\fi'.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/Makefile
    trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex

Modified: trunk/Build/source/texk/web2c/cwebdir/Makefile
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/Makefile	2023-10-01 09:48:30 UTC (rev 68417)
+++ trunk/Build/source/texk/web2c/cwebdir/Makefile	2023-10-01 15:50:46 UTC (rev 68418)
@@ -88,7 +88,7 @@
 	comm-w32.ch ctang-w32.ch cweav-w32.ch \
 	comm-os2.ch comm-mac.ch
 
-.SUFFIXES: .dvi .tex .w .pdf
+.SUFFIXES: .dvi .tex .w .pdf .hnt
 
 .w.tex:
 	$(CWEAVE) $*
@@ -113,10 +113,15 @@
 	 dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
 	 pdftex ) pdftex $* ;; \
 	 xetex ) xetex $* ;; \
-	 hitex ) hitex $* ;; \
 	 luatex ) luatex $* ;; \
 	esac
 
+.w.hnt:
+	make $*.tex
+	case "$(PDFTEX)" in \
+	 hitex ) hitex $* ;; \
+	esac
+
 all: ctangle cweave
 
 cautiously: ctangle

Modified: trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex	2023-10-01 09:48:30 UTC (rev 68417)
+++ trunk/Build/source/texk/web2c/cwebdir/cwebacromac.tex	2023-10-01 15:50:46 UTC (rev 68418)
@@ -52,16 +52,18 @@
     \ifx\nxt~\addF\space
     \else\ifx\nxt\onespace\addF\space
     \else\the\usersanitizer
-    \iftokprocessed\else\makeolproctokctli
-    \iftokprocessed\else\makeolproctokctlii
-    \iftokprocessed\else\makeolproctokctliii % if not recognised, skip it
-    \fi\fi\fi\fi\fi
-   \else  % we don't have a control sequence, it's an ordinary char
+      \iftokprocessed\else\makeolproctokctli
+      \iftokprocessed\else\makeolproctokctlii
+      \iftokprocessed\else\makeolproctokctliii % if not recognised, skip it
+      \fi\fi\fi
+    \fi\fi
+  \else  % we don't have a control sequence, it's an ordinary char
     \ifx/\nxt \addF{\string\/}% quote chars special to PDF with backslash
     \else\ifx(\nxt \addF{\string\(}\else\ifx)\nxt \addF{\string\)}%
     \else\ifx[\nxt \addF{\string\[}\else\ifx]\nxt \addF{\string\]}%
     \else\expandafter\makeolproctokchar\meaning\nxt
-   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+    \fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi \fi\fi\fi
   \next
 }
 \def\makeolproctokchar#1 #2 #3{\addF{#3}}
@@ -85,7 +87,9 @@
   \else\ifx\nxt\{\addF\lbchar       \else\ifx\nxt\}\addF\rbchar
   \else\ifx\nxt\ \addF\space        \else\ifx\nxt\#\addF{\string\#}%
   \else\ifx\nxt\PP\addF{++}\else\ifx\nxt\MM\addF{--}%
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
+  \fi\fi
 }
 \def\makeolproctokctlii{%
   \ifx\nxt\MG\addF{->}\else\ifx\nxt\GG\addF{>>}%
@@ -105,7 +109,7 @@
   \else\ifx\nxt\AM\addF&\else\ifx\nxt\%\addF{\string\%}%
   \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
-  \fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi \fi
 }
 \def\makeolproctokctliii{%
   \ifx\nxt\V\addF{||}\else\ifx\nxt\W\addF{&&}\else\ifx\nxt\Z\addF{<=}%
@@ -120,7 +124,7 @@
   \else\ifx\nxt\Xorxeq\addF{\space or_eq\space}%
   \else\ifx\nxt\Xxor\addF{\space xor\space}%
   \else\ifx\nxt\Xxorxeq\addF{\space xor_eq\space}%
-  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+  \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
   \fi\fi\fi\fi\fi
 }
 \def\outlinedone{\edef\outlinest{\global\noexpand\toksE={\the\toksF}}%