CTAN sync 202404210301

4 files changed, 30 insertions, 7 deletions

diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 9f90bcb335..ff3cebbb9d 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,18 @@
+2024-04-19  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (tcolorbox.4ht): close boxes after the \tcbox
+	command.
+	https://github.com/wo/logic2
+	* tex4ht-html.tex (html4.4ht): don't print title box in Tcolorbox if
+	it is empty.
+	https://github.com/wo/logic2
+
+2024-04-18  Karl Berry  <karl@freefriends.org>
+
+	* Makefile (derived): do not add tex4ht_fonts_minionpro_derived,
+	since Minion is nonfree. Maybe we could get it into tlcontrib
+	if there is demand.
+
 2024-04-18  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-4ht.tex (usepackage.4ht, xyling-hooks.4ht, xyling.4ht):
diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile
index 3d2d16b365..fd6995f4a5 100644
--- a/support/TeX4ht/source/Makefile
+++ b/support/TeX4ht/source/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1498 2024-04-04 15:27:36Z michal_h21 $
+# $Id: Makefile 1503 2024-04-18 22:51:03Z karl $
 # This file is public domain.  Originally written 2010, Karl Berry.
 # Assumes GNU make.
 
@@ -227,7 +227,10 @@ derived += $(tex4ht_fonts_mnsymbol_derived)
 tex4ht_fonts_mnsymbol_derived = \
 	$(ht_fonts_devdir)/unicode/MnSymbol/MnSymbolA-Bold10.htf
 
-derived += $(tex4ht_fonts_minionpro_derived)
+# somehow have to push this to tlcontrib; since Minion is nonfree,
+# can't put it into TL. For now, avoid compiling/installing it,
+# since then it shows up with all the consistency checks.
+#derived += $(tex4ht_fonts_minionpro_derived)
 tex4ht_fonts_minionpro_derived = \
 	$(ht_fonts_devdir)/unicode/Minion_Pro/MinionPro-It-lf-l1-ot1.htf
 
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index e615b9603e..4c5fe4127a 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1502 2024-04-18 12:55:56Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1504 2024-04-19 15:48:03Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -28844,7 +28844,9 @@ We need to use dvips driver with XeLaTeX
   \fi%
   % open title
   \b:tcolorbox%
-  \kvtcb@before@title\kvtcb@title\kvtcb@after@title%
+  \ifx\kvtcb@title\@empty\else
+    \kvtcb@before@title\kvtcb@title\kvtcb@after@title%
+  \fi
   % close title and open main box
   \c:tcolorbox%
   \box\tcb@upperbox%
@@ -28875,6 +28877,9 @@ We need to use dvips driver with XeLaTeX
 \def\:tempb{\d:tcolorbox\o:tcb@endboxanddraw:}
 \HLet\tcb@endboxanddraw\:tempb
 
+% this should correctly close tcolorbox after the \tcbox command
+\append:defIII\tcb@ox{\d:tcolorbox}
+
 % tcolorbox supports libraries, but it loads them
 % in a way that doesn't register them for the use 
 % with .4ht files.
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 9ea67de9bc..3cdfddd791 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1481 2024-02-29 16:25:52Z michal_h21 $
+% $Id: tex4ht-html4.tex 1504 2024-04-19 15:48:03Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -16477,8 +16477,8 @@ Blue  = 1-minimum(1,Yellow *(1-Black)+Black)
       padding-right:\calc:tcbpadding{\kvtcb@rightupper};
   }}
 }
-{\HCode{\Hnewline<div class="tcolorbox-title">}\par}
-{\ifvmode\IgnorePar\fi\EndP\HCode{</div>\Hnewline<div class="tcolorbox-content">}}
+{\ifx\kvtcb@title\@empty\else\HCode{\Hnewline<div class="tcolorbox-title">}\par\fi}
+{\ifx\kvtcb@title\@empty\else\ifvmode\IgnorePar\fi\EndP\HCode{</div>}\fi\HCode{\Hnewline<div class="tcolorbox-content">}}
 {\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\SaveEndP\par\ShowPar}%
 
 \Css{.tcolorbox{margin-top:0.5em;margin-bottom: 0.5em;}}