summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-06-08 21:13:50 +0000
committerKarl Berry <karl@freefriends.org>2023-06-08 21:13:50 +0000
commitda5a1b78ee5a24e9cf309b82a9c458abd7ab0cef (patch)
tree97e2c4767e275e5f812ccb3521677cf9e762d5b9 /Master/texmf-dist/tex/generic
parent3a24c707696a3f879e08e45b1cdf35d2e706a0b8 (diff)
xecjk under lualatex, tex4ht r1336; subfigure/table numbering, tex4ht r1337; spurious </p> after tcolorbox, tex4ht r1338
git-svn-id: svn://tug.org/texlive/trunk@67310 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/html4.4ht6
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/lineno.4ht5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht8
4 files changed, 18 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index c4ef7d5ea2a..be7b3916aea 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
@@ -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 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
}
{\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;}}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht b/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht
index cd542fff5aa..01830d37b77 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/lineno.4ht
@@ -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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht b/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht
index 665f8d5505c..011e102ce11 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/subcaption.4ht
@@ -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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht
index 19c49e71c89..44c81114bd1 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/xecjk-hooks.4ht
@@ -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%
}