CTAN sync 202309010301

5 files changed, 45 insertions, 17 deletions

diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index b78d72cf6c..731d18e098 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,14 +1,25 @@
-<<<<<<< .mine
-2023-08-14  Karl Berry  <karl@freefriends.org>
+2023-08-31  Michal Hoftich  <michal.h21@gmail.com>
 
-	* 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  <karl@freefriends.org>
+
+	* tex4ht-4ht.tex,
+	* tex4ht-docbook.tex: copyright 2023.
+
+2023-08-18  Michal Hoftich  <michal.h21@gmail.com>
+
+	* 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  <michal.h21@gmail.com>
 	
 	* 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  <karl@freefriends.org>
+
+	* 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  <michal.h21@gmail.com>
 
 	* tex4ht-mathml.tex (mathml.4ht): fixed handling of \tfrac and
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index edb2d48b65..6ac26a7046 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/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\><<<
 % tikz-hooks.4ht (|version), generated from |jobname.tex
-% Copyright 2021 TeX Users Group
+% Copyright 2020-2023 TeX Users Group
 |<TeX4ht license text|>
 \ifdefined\pgfsysdriver\else%
   \typeout{*****************************}
diff --git a/support/TeX4ht/source/tex4ht-docbook.tex b/support/TeX4ht/source/tex4ht-docbook.tex
index 3c9888f2db..b6ac89f11d 100644
--- a/support/TeX4ht/source/tex4ht-docbook.tex
+++ b/support/TeX4ht/source/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\><<<
 % 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
 |<TeX4ht copywrite|>
 >>>
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 0854a7bd11..8e6c52b3b7 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/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)
 
 
 \<configure html4 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{<div class="tcolorbox \@currenvir" id="\:tcbcolid">} 
   % \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<div class="tcolorbox-title">}\par}
 {\ifvmode\IgnorePar\fi\EndP\HCode{</div>\Hnewline<div class="tcolorbox-content">}}
diff --git a/support/TeX4ht/source/tex4ht-mkht.tex b/support/TeX4ht/source/tex4ht-mkht.tex
index dcae4366fa..206adb13ef 100644
--- a/support/TeX4ht/source/tex4ht-mkht.tex
+++ b/support/TeX4ht/source/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