[tex4ht-commits] [SCM] tex4ht updated: r1139 - trunk/lit

[Karl Berry]

Author: karl
Date: 2022-05-25 01:16:19 +0000 (Wed, 25 May 2022)
New Revision: 1139

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-cond4ht.tex
Log:
use \toks0 instead of direct \ifx inside \usepackage[...]

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2022-05-23 12:21:20 UTC (rev 1138)
+++ trunk/lit/ChangeLog	2022-05-25 01:16:19 UTC (rev 1139)
@@ -1,3 +1,10 @@
+2022-05-24  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-cond4ht.tex (\mkfilename == mktex4ht.4ht):
+	instead of doing an \ifx inside \usepackage[...], set and use
+	\toks0. Seems to avoid some instances of 
+	"(\end occurred when \ifx on line NN was incomplete)".
+
 2022-05-23  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (xr-hyper.4ht): added closing \fi to prevent

Modified: trunk/lit/tex4ht-cond4ht.tex
===================================================================
--- trunk/lit/tex4ht-cond4ht.tex	2022-05-23 12:21:20 UTC (rev 1138)
+++ trunk/lit/tex4ht-cond4ht.tex	2022-05-25 01:16:19 UTC (rev 1139)
@@ -2,11 +2,12 @@
 % (1)  tex tex4ht-cond4ht    or   xhtex tex4ht-cond4ht
 % (2)  tex cond4ht.4ht
 %
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2022 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 % Released under LPPL 1.3c+.
 % See tex4ht-cpright.tex for license text.
 
+\vbadness=10000
 \csname tex4ht\endcsname
 
   \input ProTex.sty
@@ -454,7 +455,7 @@
 %  the copyright notice.
 %
 % |mkfilename (|version), generated from |jobname.4ht
-% Copyright 2009-2021 TeX Users Group
+% Copyright 2009-2022 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 |<TeX4ht copywrite|>
 
@@ -567,12 +568,14 @@
 }
    \catcode`\:=12
 
-
-
 \documentclass{book}
    \ifx \HCode\UnDef
-      \def\temp{\usepackage[\ifx \OPTIONS\UnDef
-                     xhtml,3,sections+\else \OPTIONS\fi]{tex4ht}}
+      \ifx\OPTIONS\UnDef
+        \toks0={xhtml,3,sections+}%
+      \else
+        \toks0={\OPTIONS}%
+      \fi
+      \def\temp{\usepackage[\the\toks0]{tex4ht}}
       \expandafter\temp
    \fi
    \Configure{ProTex}{4ht,<<<>>|empty>,||,title,list,[[]]}