texlive[67310] Master/texmf-dist: xecjk under lualatex, tex4ht r1336;
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 8 23:13:50 CEST 2023
Revision: 67310
http://tug.org/svn/texlive?view=revision&revision=67310
Author: karl
Date: 2023-06-08 23:13:50 +0200 (Thu, 08 Jun 2023)
Log Message:
-----------
xecjk under lualatex, tex4ht r1336; subfigure/table numbering, tex4ht r1337; spurious </p> after tcolorbox, tex4ht r1338
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1336
http://tug.org/svn/texlive?view=revision&revision=1337
http://tug.org/svn/texlive?view=revision&revision=1338
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht
trunk/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,3 +1,19 @@
+2023-06-08 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-html4.tex (html4.4ht): removed spurious </p> after the
+ tcolorbox environment.
+ https://tex.stackexchange.com/q/688072/2891
+
+2023-06-07 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (subcaption.4ht): fixed numbering of subfigures and
+ subtables.
+ https://tex.stackexchange.com/a/687996/2891
+
+ * tex4ht-4ht.tex (xecjk-hooks.4ht): allow xeCJK to be executed with
+ LuaLaTeX.
+ https://github.com/michal-h21/make4ht/issues/123
+
2023-06-02 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-html4.tex (html4.4ht): check if Xskak's nextfen is defined.
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1334 2023-05-21 14:16:15Z karl $
+% $Id: tex4ht-4ht.tex 1337 2023-06-07 20:53:50Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -4343,7 +4343,9 @@
\DeclareDocumentCommand\xeCJKsetup{m}{}
% }
\AtBeginDocument{%
- \xeuniuseblock{CJK}
+ \ifdefined\xeuniuseblock%
+ \xeuniuseblock{CJK}%
+ \fi%
}
>>> \AddFile{9}{xecjk-hooks}
@@ -12673,11 +12675,15 @@
\<subcaption.4ht\><<<
% subcaption.4ht (|version), generated from |jobname.tex
-% Copyright 2021 TeX Users Group
+% Copyright 2021-2023 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{subfigure}{2}
\ConfigureEnv{subfigure}{\a:subfigure}{\b:subfigure}{}{}
\ConfigureEnv{subtable}{\a:subfigure}{\b:subfigure}{}{}
+% these counters are not reset with TeX4ht, which leads to
+% wrong numbering of subfigures
+\AddToHook{env/figure/begin}{\setcounter{subfigure}{0}}
+\AddToHook{env/table/begin}{\setcounter{subtable}{0}}
\Hinput{subcaption}
\endinput
>>> \AddFile{9}{subcaption}
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1335 2023-06-02 11:15:08Z michal_h21 $
+% $Id: tex4ht-html4.tex 1338 2023-06-08 20:40:46Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -16508,7 +16508,7 @@
}
{\HCode{\Hnewline<div class="tcolorbox-title">}\par}
{\ifvmode\IgnorePar\fi\EndP\HCode{</div>\Hnewline<div class="tcolorbox-content">}}
-{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\par}
+{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\SaveEndP\par\ShowPar}%
\Css{.tcolorbox{margin-top:0.5em;margin-bottom: 0.5em;}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/html4.4ht 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,4 +1,4 @@
-% html4.4ht (2023-06-02-14:47), generated from tex4ht-html4.tex
+% html4.4ht (2023-06-08-13:46), generated from tex4ht-html4.tex
% Copyright 2009-2023 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-06-02-14:47}
+\immediate\write-1{version 2023-06-08-13:46}
\exit:ifnot{8859-6,%
CJK,%
@@ -40542,7 +40542,7 @@
}
{\HCode{\Hnewline<div class="tcolorbox-title">}\par}
{\ifvmode\IgnorePar\fi\EndP\HCode{</div>\Hnewline<div class="tcolorbox-content">}}
-{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\par}
+{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\SaveEndP\par\ShowPar}%
\Css{.tcolorbox{margin-top:0.5em;margin-bottom: 0.5em;}}
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,4 +1,5 @@
-% lineno.4ht (2023-05-07-07:40), generated from tex4ht-4ht.tex
+% lineno.4ht (2023-05-21-07:16), generated from tex4ht-4ht.tex
+% Copyright 2009-2023 TeX Users Group
% Copyright 2000-2009 Eitan M. Gurari
%
% This work may be distributed and/or modified under the
@@ -16,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-05-07-07:40}
+\immediate\write-1{version 2023-05-21-07:16}
\let\:tempc\linelabel
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,5 +1,5 @@
-% subcaption.4ht (2021-07-04-09:13), generated from tex4ht-4ht.tex
-% Copyright 2021 TeX Users Group
+% subcaption.4ht (2023-06-08-13:14), generated from tex4ht-4ht.tex
+% Copyright 2021-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,11 +16,15 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-07-04-09:13}
+\immediate\write-1{version 2023-06-08-13:14}
\NewConfigure{subfigure}{2}
\ConfigureEnv{subfigure}{\a:subfigure}{\b:subfigure}{}{}
\ConfigureEnv{subtable}{\a:subfigure}{\b:subfigure}{}{}
+% these counters are not reset with TeX4ht, which leads to
+% wrong numbering of subfigures
+\AddToHook{env/figure/begin}{\setcounter{subfigure}{0}}
+\AddToHook{env/table/begin}{\setcounter{subtable}{0}}
\Hinput{subcaption}
\endinput
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht 2023-06-08 21:05:37 UTC (rev 67309)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht 2023-06-08 21:13:50 UTC (rev 67310)
@@ -1,4 +1,4 @@
-% xecjk-hooks.4ht (2020-10-17-13:53), generated from tex4ht-4ht.tex
+% xecjk-hooks.4ht (2023-06-08-13:14), generated from tex4ht-4ht.tex
% Copyright 2020 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2020-10-17-13:53}
+\immediate\write-1{version 2023-06-08-13:14}
\:dontusepackage{xeCJK}
\:AtEndOfPackage{%
@@ -32,6 +32,8 @@
\DeclareDocumentCommand\xeCJKsetup{m}{}
% }
\AtBeginDocument{%
- \xeuniuseblock{CJK}
+ \ifdefined\xeuniuseblock%
+ \xeuniuseblock{CJK}%
+ \fi%
}
More information about the tex-live-commits
mailing list.