diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-15 22:01:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-15 22:01:19 +0000 |
commit | 3ee2977707ff83eca4b12192fd4eec480f78f139 (patch) | |
tree | 38f7e3c9fd68c5ae5658bed83c36b464e1fee0f3 | |
parent | 0fdc68a8d0680a02be89075c491e158e554f61b3 (diff) |
load dvisvgm driver for pgf, tex4ht r1439; tcolorbox breakable boxes, tex4ht r1440; do not use tcolorbox \RecallEndP, tex4ht 1441
git-svn-id: svn://tug.org/texlive/trunk@69445 c570f23f-e606-0410-a88d-b1316a301751
6 files changed, 92 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 1c3748eab37..8371f083c7f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,16 @@ +2024-01-15 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (tcolorbox.4ht): don't use \RecallEndP in + tcolorbox, it can lead to spurious </p> tags. + https://github.com/michal-h21/make4ht/issues/142#issuecomment-1891507567 + + * tex4ht-4ht.tex (tcolorbox.4ht): fixed support for breakable boxes. + https://github.com/michal-h21/make4ht/issues/142 + + * tex4ht-4ht.tex (usepackage.4ht, tikz-hooks.4ht, pgf-hooks.4ht): + load the Dvisvgm driver for PGF when the PFG package is used. + https://github.com/michal-h21/make4ht/issues/142 + 2024-01-13 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (memoir.4ht): don't load booktabs.4ht from diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 12ae8e003e1..9372b02b23a 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1438 2024-01-13 16:45:49Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1442 2024-01-15 22:00:31Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -4891,7 +4891,7 @@ converted to SVG by default. \<tikz-hooks.4ht\><<< % tikz-hooks.4ht (|version), generated from |jobname.tex -% Copyright 2020-2023 TeX Users Group +% Copyright 2020-2024 TeX Users Group |<TeX4ht license text|> \ifdefined\pgfsysdriver\else% \typeout{*****************************} @@ -4921,6 +4921,38 @@ converted to SVG by default. \fi >>> \AddFile{9}{tikz-hooks} +%%%%%%%%%%%%%%%%%%% +\Section{pgf.sty} +%%%%%%%%%%%%%%%%%%% + +\<pgf.4ht\><<< +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% pgf.4ht |version % +% Copyright (C) |CopyYear.2003. Eitan M. Gurari % +|<TeX4ht copyright|> +\Hinput{pgf} +\endinput +>>> \AddFile{9}{pgf} + +\<add to usepackage\><<< +\Configure{PackageHooks}{pgf.sty}{pgf-hooks.4ht} +>>> + +The following code loads the dvisvgm driver for TeX4ht. The default +TeX4ht driver provided by TikZ doesn't work well. + +\<pgf-hooks.4ht\><<< +% pgf-hooks.4ht (|version), generated from |jobname.tex +% Copyright 2024 TeX Users Group +|<TeX4ht license text|> +\ifdefined\pgfsysdriver\else% + \typeout{*****************************} + \typeout{TeX4ht info: Using dvisvgm4ht TikZ driver. Put \detokenize{\def\pgfsysdriver{driver-name}} to your + document before use of TikZ if you want to another driver. Use tikz+ option if your TikZ pictures use patterns.}% + \def\pgfsysdriver{pgfsys-dvisvgm4ht.def}% +\fi% +>>> \AddFile{9}{pgf-hooks} + %%%%%%%%%%%%%%%%%% \Section{pdfbase.sty} %%%%%%%%%%%%%%%%%% @@ -28180,18 +28212,6 @@ be wrapped around \''\mfpic ... \endmfpic', \Configure{ @V}{}{} >>> -%%%%%%%%%%%%%%%%%%% -\Section{pgf.sty} -%%%%%%%%%%%%%%%%%%% - -\<pgf.4ht\><<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% pgf.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -|<TeX4ht copyright|> -\Hinput{pgf} -\endinput ->>> \AddFile{9}{pgf} %%%%%%%%%%%%%%%%%%%%%%% \Section{color.sty} @@ -28595,7 +28615,7 @@ We need to use dvips driver with XeLaTeX %%%%%%%%%%%%%%%%%%%%%%% \<tcolorbox.4ht\><<< % tcolorbox.4ht (|version), generated from |jobname.tex -% Copyright 2020-2023 TeX Users Group +% Copyright 2020-2024 TeX Users Group |<TeX4ht license text|> % use custom counter that increments for every \tcolorbox @@ -28627,7 +28647,9 @@ We need to use dvips driver with XeLaTeX \c:tcolorbox% \box\tcb@upperbox% % the paragraph opened in the upper box can be unclosed - \RecallEndP + % but I cannot find an example where it matters. \RecallEndP caused issues in the following sample: + % https://github.com/michal-h21/make4ht/issues/142#issuecomment-1891507567 + % \RecallEndP % deal with lower box, if it is set \iftcb@hasLower% \a:tcolorlowerbox% @@ -28640,6 +28662,7 @@ We need to use dvips driver with XeLaTeX \HLet\tcb@drawcolorbox\:tempa % overwrite other versions of box drawing macros \HLet\tcb@drawcolorbox@standalone\:tempa +\HLet\tcb@drawcolorbox@breakable\:tempa % save the state of paragraph before opening the content box \pend:def\tcb@set@@upper@and@lower{\SaveEndP} diff --git a/Master/texmf-dist/tex/generic/tex4ht/pgf-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/pgf-hooks.4ht new file mode 100644 index 00000000000..80a35b9e438 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/pgf-hooks.4ht @@ -0,0 +1,27 @@ +% pgf-hooks.4ht (2024-01-15-14:00), generated from tex4ht-4ht.tex +% Copyright 2024 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project <http://tug.org/tex4ht>. +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2024-01-15-14:00} + +\ifdefined\pgfsysdriver\else% + \typeout{*****************************} + \typeout{TeX4ht info: Using dvisvgm4ht TikZ driver. Put \detokenize{\def\pgfsysdriver{driver-name}} to your + document before use of TikZ if you want to another driver. Use tikz+ option if your TikZ pictures use patterns.}% + \def\pgfsysdriver{pgfsys-dvisvgm4ht.def}% +\fi% + diff --git a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht index dd9dede9589..bb260533ab7 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht @@ -1,5 +1,5 @@ -% tcolorbox.4ht (2023-10-20-09:23), generated from tex4ht-4ht.tex -% Copyright 2020-2023 TeX Users Group +% tcolorbox.4ht (2024-01-15-13:12), generated from tex4ht-4ht.tex +% Copyright 2020-2024 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-10-20-09:23} +\immediate\write-1{version 2024-01-15-13:12} % use custom counter that increments for every \tcolorbox @@ -48,7 +48,9 @@ \c:tcolorbox% \box\tcb@upperbox% % the paragraph opened in the upper box can be unclosed - \RecallEndP + % but I cannot find an example where it matters. \RecallEndP caused issues in the following sample: + % https://github.com/michal-h21/make4ht/issues/142#issuecomment-1891507567 + % \RecallEndP % deal with lower box, if it is set \iftcb@hasLower% \a:tcolorlowerbox% @@ -61,6 +63,7 @@ \HLet\tcb@drawcolorbox\:tempa % overwrite other versions of box drawing macros \HLet\tcb@drawcolorbox@standalone\:tempa +\HLet\tcb@drawcolorbox@breakable\:tempa % save the state of paragraph before opening the content box \pend:def\tcb@set@@upper@and@lower{\SaveEndP} diff --git a/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht index 9de7ac0a950..ee871bd4075 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht @@ -1,5 +1,5 @@ -% tikz-hooks.4ht (2023-08-27-08:01), generated from tex4ht-4ht.tex -% Copyright 2020-2023 TeX Users Group +% tikz-hooks.4ht (2024-01-15-14:00), generated from tex4ht-4ht.tex +% Copyright 2020-2024 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -16,7 +16,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-08-27-08:01} +\immediate\write-1{version 2024-01-15-14:00} \ifdefined\pgfsysdriver\else% \typeout{*****************************} diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index a42fe990ac2..856a232caaa 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2024-01-05-14:29), generated from tex4ht-4ht.tex +% usepackage.4ht (2024-01-15-14:00), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2024 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-01-05-14:29} +\immediate\write-1{version 2024-01-15-14:00} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -64,6 +64,7 @@ \Configure{PackageHooks}{polyglossia.sty}{polyglossia-hooks.4ht} \Configure{PackageHooks}{fontspec.sty}{fontspec-hooks.4ht} \Configure{PackageHooks}{tikz.sty}{tikz-hooks.4ht} +\Configure{PackageHooks}{pgf.sty}{pgf-hooks.4ht} \Configure{PackageHooks}{pdfbase.sty}{pdfbase-hooks.4ht} \Configure{PackageHooks}{pdfx.sty}{pdfx-hooks.4ht} \Configure{PackageHooks}{lua-widow-control.sty}{lua-widow-control-hooks.4ht} |