[tex4ht-commits] [SCM] tex4ht updated: r1047 - trunk/lit

[Michal Hoftich]

Author: michal_h21
Date: 2022-01-04 12:04:12 +0000 (Tue, 04 Jan 2022)
New Revision: 1047

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-4ht.tex
Log:
Fixed regressions with Tcolorbox

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2022-01-02 22:32:28 UTC (rev 1046)
+++ trunk/lit/ChangeLog	2022-01-04 12:04:12 UTC (rev 1047)
@@ -1,3 +1,8 @@
+2022-01-04  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (tcolorbox.4ht): fixed conflict with updated
+	Tcolorbox package.
+
 2022-01-02  Karl Berry  <karl at freefriends.org>
 
 	* tex4ht-4ht.tex (ifthen.4ht, url.4ht): use |<TeX4ht copywrite>

Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2022-01-02 22:32:28 UTC (rev 1046)
+++ trunk/lit/tex4ht-4ht.tex	2022-01-04 12:04:12 UTC (rev 1047)
@@ -26949,7 +26949,7 @@
 % use custom counter that increments for every \tcolorbox
 \newcounter{:tcbcolcount}
 
-\def\tcb at drawcolorbox{%
+\def\:tempa{%
   \stepcounter{:tcbcolcount}%
   % save text and background colors for use in CSS
   \get:xcolorcss{tcbcolbacktitle}\:tcbcolbacktitle%
@@ -26979,13 +26979,21 @@
     \box\tcb at lowerbox%
     \b:tcolorlowerbox%
   \fi%
-  % close box
-  \d:tcolorbox%
+  % We need to close box in \tcb at endboxanddraw
 }
 
+\HLet\tcb at drawcolorbox\:tempa
 % overwrite other versions of box drawing macros
-\let\tcb at drawcolorbox@standalone\tcb at drawcolorbox
+\HLet\tcb at drawcolorbox@standalone\:tempa
 
+% we need to close tcolorbox environment here,
+% in the box. otherwise, last paragraph end 
+% would be ignored and we would get invalid XML
+\def\:tempb{\d:tcolorbox\o:tcb at endboxanddraw:}
+\HLet\tcb at endboxanddraw\:tempb
+
+
+
 \NewConfigure{tcolorbox}{4}
 \NewConfigure{tcolorlowerbox}{2}
 
@@ -26996,12 +27004,8 @@
 }
 \HLet\tcb at set@label\:tempa
 
+|<tcolorbox minipage|>
 
-% this is a trick to fix issues with paragraphs
-% spurious end </p> tags were inserted
-\def\tcb at minipage#1{\SaveEndP\vbox\bgroup\par}
-\def\endtcb at savebox{\EndP\egroup\RecallEndP}
-
 \Hinput{tcolorbox}
 \endinput
 
@@ -27009,6 +27013,17 @@
 
 >>> \AddFile{9}{tcolorbox}
 
+
+this is a trick to fix issues with paragraphs
+where spurious end \`'</p>' tags were inserted
+\<tcolorbox minipage\><<<
+\pend:def\tcb at minipage{\SaveEndP}
+\pend:def\tcb at minipage@top{\SaveEndP}
+\pend:def\tcb at minipage@bottom{\SaveEndP}
+\pend:def\tcb at minipage@center{\SaveEndP}
+
+>>>
+
 %%%%%%%%%%%%%%%%%%%%%%%
 \Section{dvipsnam}
 %%%%%%%%%%%%%%%%%%%%%%%