summaryrefslogtreecommitdiff
path: root/support/TeX4ht
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-09 03:01:52 +0000
committerNorbert Preining <norbert@preining.info>2023-06-09 03:01:52 +0000
commit33607c11aca40cfb1f454d818091f19aa47ba651 (patch)
tree5d8041db908d47b985a199a5fb9187c518fcc591 /support/TeX4ht
parent538e6d6e7c75b7cca5470604811205f9dbd55c03 (diff)
CTAN sync 202306090301
Diffstat (limited to 'support/TeX4ht')
-rw-r--r--support/TeX4ht/source/ChangeLog16
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex12
-rw-r--r--support/TeX4ht/source/tex4ht-html4.tex4
3 files changed, 27 insertions, 5 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 7e44dcefdb..8cb57cc2c5 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,19 @@
+2023-06-08 Michal Hoftich <michal.h21@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@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@gmail.com>
* tex4ht-html4.tex (html4.4ht): check if Xskak's nextfen is defined.
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 93aa3e4818..ec2bbf683f 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -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 @@ Note that not all commands are provided, more can be added on user request.
\DeclareDocumentCommand\xeCJKsetup{m}{}
% }
\AtBeginDocument{%
- \xeuniuseblock{CJK}
+ \ifdefined\xeuniuseblock%
+ \xeuniuseblock{CJK}%
+ \fi%
}
>>> \AddFile{9}{xecjk-hooks}
@@ -12673,11 +12675,15 @@ prevent this issue.
\<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}
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 83d2bc51a3..3b8c4290a6 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -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 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black)
}
{\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;}}