From ae07d43c5d362ac12dc82d36edec4ddf4a9c6344 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Aug 2023 22:22:14 +0000 Subject: padding for tcolorbox boxes, tex4ht r1363 git-svn-id: svn://tug.org/texlive/trunk@68129 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 38 ++++++++++++++++------ .../source/generic/tex4ht/tex4ht-4ht.tex | 4 +-- .../source/generic/tex4ht/tex4ht-docbook.tex | 6 ++-- .../source/generic/tex4ht/tex4ht-html4.tex | 12 ++++++- .../source/generic/tex4ht/tex4ht-mkht.tex | 2 +- Master/texmf-dist/tex/generic/tex4ht/docbook.4ht | 6 ++-- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 16 +++++++-- Master/texmf-dist/tex/generic/tex4ht/mkht.4ht | 37 +++------------------ .../texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht | 6 ++-- 9 files changed, 68 insertions(+), 59 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index b78d72cf6c5..731d18e0986 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,14 +1,25 @@ -<<<<<<< .mine -2023-08-14 Karl Berry +2023-08-31 Michal Hoftich - * tex4ht-mkht.tex: remove context scripts, which date from - the Ruby era of many years ago. ConTeXt has its own (far better) - methods for handling XML and HTML anyway. - From htcontext bug report, Vincenzo Mantova mail to tex-live, - 14 Aug 2023 20:01:23. + * tex4ht-html4.tex (html4.4ht): calculate padding for individual + Tcolorbox boxes. + https://tex.stackexchange.com/a/694862/2891 + +2023-08-27 Karl Berry + + * tex4ht-4ht.tex, + * tex4ht-docbook.tex: copyright 2023. + +2023-08-18 Michal Hoftich + + * tex4ht-html4.tex (html4.4ht): added support for column width in + "b" and "m" table preamble tokens. Fixed wrong alignment and word + wrapping. + https://tex.stackexchange.com/a/693816/2891 + + * tex4ht-html4.tex (html4.4ht): simplified setting of table column + widths with the `p-width` option. + https://tex.stackexchange.com/a/693816/2891 -||||||| .r1356 -======= 2023-08-16 Michal Hoftich * tex4ht-4ht.tex (memoir.4ht): added indexing support for Memoir. @@ -17,7 +28,14 @@ * tex4ht-4ht.tex (tikz-hooks.4ht): fixed infinite loop with externalization when TikZ was used multiple times in the document. ->>>>>>> .r1358 +2023-08-14 Karl Berry + + * tex4ht-mkht.tex: remove context scripts, which date from + the Ruby era of many years ago. ConTeXt has its own (far better) + methods for handling XML and HTML anyway. + From htcontext bug report, Vincenzo Mantova mail to tex-live, + 14 Aug 2023 20:01:23. + 2023-08-13 Michal Hoftich * tex4ht-mathml.tex (mathml.4ht): fixed handling of \tfrac and diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index edb2d48b650..6ac26a7046a 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 1358 2023-08-16 14:04:38Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1362 2023-08-27 15:01:41Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -4888,7 +4888,7 @@ converted to SVG by default. \<<< % tikz-hooks.4ht (|version), generated from |jobname.tex -% Copyright 2021 TeX Users Group +% Copyright 2020-2023 TeX Users Group | \ifdefined\pgfsysdriver\else% \typeout{*****************************} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex index 3c9888f2db8..b6ac89f11de 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex @@ -1,8 +1,8 @@ -% $Id: tex4ht-docbook.tex 1354 2023-08-13 17:55:27Z michal_h21 $ +% $Id: tex4ht-docbook.tex 1362 2023-08-27 15:01:41Z karl $ % compile 3 times: latex tex4ht-docbook % or xhlatex tex4ht-docbook "html,3,sections+" % -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -28,7 +28,7 @@ \<<< % docbook.4ht (|version), generated from |jobname.tex -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright |CopyYear.2000. Eitan M. Gurari | >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 0854a7bd117..8e6c52b3b75 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1360 2023-08-18 12:03:13Z michal_h21 $ +% $Id: tex4ht-html4.tex 1363 2023-08-31 15:26:11Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -16500,11 +16500,21 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black) \<<< +% support macro for correct calculation of padding in Tcolorbox +\def\calc:tcbpadding#1{\strip@pt\dimexpr \kvtcb@boxsep+#1\relax px} + \Configure{tcolorbox} {\ifvmode\IgnorePar\fi\EndP\HCode{
} % \tcbcolid and colors are defined in tcolorbox.4ht \Css{\#\:tcbcolid\space .tcolorbox-title{color: \:tcbcoltitle; background-color: \:tcbcolframe;}} \Css{\#\:tcbcolid\space .tcolorbox-content{color: \:tcbcolupper; background-color: \:tcbcolback; border: 1px solid \:tcbcolframe;}} + % calculate paddings + \Css{\#\:tcbcolid\space div{ + padding-top:\calc:tcbpadding{\kvtcb@top}; + padding-bottom:\calc:tcbpadding{\kvtcb@bottom}; + padding-left:\calc:tcbpadding{\kvtcb@leftupper}; + padding-right:\calc:tcbpadding{\kvtcb@rightupper}; + }} } {\HCode{\Hnewline
}\par} {\ifvmode\IgnorePar\fi\EndP\HCode{
\Hnewline
}} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex index dcae4366fab..206adb13ef9 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-mkht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-mkht.tex 955 2021-06-20 16:36:07Z karl $ +% $Id: tex4ht-mkht.tex 1361 2023-08-20 15:23:27Z karl $ % (1) latex tex4ht-mkht % (2) perl -c mk4ht.perl (checking correctness) % (3) latex mkht-scripts.4ht diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht index 8bb0847889f..6b57308c4d8 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht @@ -1,5 +1,5 @@ -% docbook.4ht (2023-08-13-13:20), generated from tex4ht-docbook.tex -% Copyright 2009-2021 TeX Users Group +% docbook.4ht (2023-08-27-08:01), generated from tex4ht-docbook.tex +% Copyright 2009-2023 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % % This work may be distributed and/or modified under the @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2023-08-13-13:20} +\immediate\write-1{version 2023-08-27-08:01} \exit:ifnot{Preamble,% algorithmic,% diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index a4e0e09e23a..c698c4fe1a8 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-08-18-15:49), generated from tex4ht-html4.tex +% html4.4ht (2023-08-31-15:04), 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-08-18-15:49} +\immediate\write-1{version 2023-08-31-15:04} \exit:ifnot{8859-6,% CJK,% @@ -40514,11 +40514,21 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{tcolorbox} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \Configure{tcolorbox} + % support macro for correct calculation of padding in Tcolorbox +\def\calc:tcbpadding#1{\strip@pt\dimexpr \kvtcb@boxsep+#1\relax px} + +\Configure{tcolorbox} {\ifvmode\IgnorePar\fi\EndP\HCode{
} % \tcbcolid and colors are defined in tcolorbox.4ht \Css{\#\:tcbcolid\space .tcolorbox-title{color: \:tcbcoltitle; background-color: \:tcbcolframe;}} \Css{\#\:tcbcolid\space .tcolorbox-content{color: \:tcbcolupper; background-color: \:tcbcolback; border: 1px solid \:tcbcolframe;}} + % calculate paddings + \Css{\#\:tcbcolid\space div{ + padding-top:\calc:tcbpadding{\kvtcb@top}; + padding-bottom:\calc:tcbpadding{\kvtcb@bottom}; + padding-left:\calc:tcbpadding{\kvtcb@leftupper}; + padding-right:\calc:tcbpadding{\kvtcb@rightupper}; + }} } {\HCode{\Hnewline
}\par} {\ifvmode\IgnorePar\fi\EndP\HCode{
\Hnewline
}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht index a186116620f..65b0635e54c 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/mkht.4ht @@ -1,4 +1,4 @@ -% mkht.4ht (2020-11-23-10:05), generated from tex4ht-mkht.tex +% mkht.4ht (2023-08-27-00:00), generated from tex4ht-mkht.tex % Copyright 2009-2020 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -18,9 +18,9 @@ % If you modify this program, changing the % version identification would be appreciated. % -\immediate\write-1{version \ifx \JOBNAME\UnDefined 2020-11-23-10:05\else |version\fi} +\immediate\write-1{version \ifx \JOBNAME\UnDefined 2023-08-27-00:00\else |version\fi} -\immediate\write-1{version 2020-11-23-10:05} +\immediate\write-1{version 2023-08-27-00:00} \def\exit{\documentclass{article}\begin{document}\end{document}\endinput} \bgroup @@ -240,21 +240,6 @@ etex |<@|>5 |<'|>|||empty>>> \<<< \catcode`\@=0\catcode`\\=13 >>> -%%%%%%%%%%%%%%% -\section{ConTeXt} -%%%%%%%%%%%%%%% - - -\<<< -|| - | - |tex4ht ||<@|>1 | - |t4ht ||<@|>1 | - ->>> - -\<<< -|texexec --arg="ht-1=|<@|>2" --use=tex4ht --dvi --nobackend |<@|>5 |<@|>1 >>> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{XeTeX} @@ -323,7 +308,6 @@ mex |<@|>5 |<'|>|||empty>>> \def\Quote{\bgroup \setcats \Qcont} \def\Qcont#1{\egroup\def\quote{#1}} \def\Argchar{\bgroup \setcats \Acont}\def\Acont#1{\egroup\def\argchar{#1}} \def\Dirchar{\bgroup \setcats \Dicont}\def\Dicont#1{\egroup\def\dirchar{#1}} -\def\Rubycall{\bgroup \setcats \Dcont}\def\Dcont#1{\egroup\def\rubyCall{#1}} \def\Echooff{\bgroup \setcats \Dcont}\def\Dcont#1{\egroup\def\echoOff{#1}} \def\Ext{\bgroup \setcats \Econt} \def\Econt#1{\egroup\def\ext{#1}% \def\firstln{unix}\ifx \firstln\ext @@ -342,7 +326,6 @@ mex |<@|>5 |<'|>|||empty>>> \let\quote=\relax \let\argchar=\relax \let\dirchar=\relax -\let\rubyCall=\relax \let\echoOff=\relax \let\ext=\relax \ifx \script\UnDef \let\script=\relax \fi @@ -373,9 +356,6 @@ mex |<@|>5 |<'|>|||empty>>> \<<< |base>>> -\<<< -|rubyCall>>> - \<<< |echoOff>>> @@ -398,7 +378,7 @@ to insert the at-echo off only for Windows. \<<< | -|Rem |ScriptFileName|AddExtn (2020-11-23-10:05), generated from tex4ht-mkht.tex +|Rem |ScriptFileName|AddExtn (2023-08-27-00:00), generated from tex4ht-mkht.tex |Rem Copyright 2009-2020 TeX Users Group |Rem Copyright 2003-2009 Eitan M. Gurari |Rem @@ -437,7 +417,6 @@ to insert the at-echo off only for Windows. \temp\quote \temp\argchar \temp\dirchar - \temp\rubyCall \temp\echoOff \temp\ext \temp\script @@ -467,12 +446,6 @@ to insert the at-echo off only for Windows. % \OutputCodE\<\pref texi.\ext\> \script{\pref texi}{\ext} % % -\<\pref context.\ext\><<< -\ ->>> % -% -\OutputCodE\<\pref context.\ext\> \script{\pref context}{\ext} % -% \<\pref xetex.\ext\><<< \ >>> % @@ -510,7 +483,6 @@ to insert the at-echo off only for Windows. \Quote{'} \Argchar{$} \Dirchar{-f/} -\Rubycall{} \Echooff{} \Remark{#} @@ -527,7 +499,6 @@ to insert the at-echo off only for Windows. \Quote{} \Argchar{%} \Dirchar{} -\Rubycall{call } \Echooff{@echo off} \Remark{Rem } diff --git a/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/tikz-hooks.4ht index e38325558e5..9de7ac0a950 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-16-13:07), generated from tex4ht-4ht.tex -% Copyright 2021 TeX Users Group +% tikz-hooks.4ht (2023-08-27-08:01), generated from tex4ht-4ht.tex +% Copyright 2020-2023 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-16-13:07} +\immediate\write-1{version 2023-08-27-08:01} \ifdefined\pgfsysdriver\else% \typeout{*****************************} -- cgit v1.2.3