summaryrefslogtreecommitdiff
path: root/support/TeX4ht/source/tex4ht-4ht.tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-01-07 03:01:08 +0000
committerNorbert Preining <norbert@preining.info>2022-01-07 03:01:08 +0000
commitf69513397ac0e1f02c6b4a5f50588d411413271a (patch)
treebfc0fc24255cb74e53aab1a6e7ac644f2952b9af /support/TeX4ht/source/tex4ht-4ht.tex
parent55032f1ad7128dcf6493e798424f4ade02c923a7 (diff)
CTAN sync 202201070301
Diffstat (limited to 'support/TeX4ht/source/tex4ht-4ht.tex')
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex59
1 files changed, 44 insertions, 15 deletions
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index be25eb0663..8255feab2f 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1046 2022-01-02 22:32:28Z karl $
+% $Id: tex4ht-4ht.tex 1048 2022-01-05 13:16:37Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -26949,7 +26949,7 @@ We need to use dvips driver with XeLaTeX
% use custom counter that increments for every \tcolorbox
\newcounter{:tcbcolcount}
-\def\tcb@drawcolorbox{%
+\def\:tempa{%
\stepcounter{:tcbcolcount}%
% save text and background colors for use in CSS
\get:xcolorcss{tcbcolbacktitle}\:tcbcolbacktitle%
@@ -26979,12 +26979,20 @@ We need to use dvips driver with XeLaTeX
\box\tcb@lowerbox%
\b:tcolorlowerbox%
\fi%
- % close box
- \d:tcolorbox%
+ % We need to close box in \tcb@endboxanddraw
}
+\HLet\tcb@drawcolorbox\:tempa
% overwrite other versions of box drawing macros
-\let\tcb@drawcolorbox@standalone\tcb@drawcolorbox
+\HLet\tcb@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@endboxanddraw:}
+\HLet\tcb@endboxanddraw\:tempb
+
+
\NewConfigure{tcolorbox}{4}
\NewConfigure{tcolorlowerbox}{2}
@@ -26996,11 +27004,7 @@ We need to use dvips driver with XeLaTeX
}
\HLet\tcb@set@label\:tempa
-
-% this is a trick to fix issues with paragraphs
-% spurious end </p> tags were inserted
-\def\tcb@minipage#1{\SaveEndP\vbox\bgroup\par}
-\def\endtcb@savebox{\EndP\egroup\RecallEndP}
+|<tcolorbox minipage|>
\Hinput{tcolorbox}
\endinput
@@ -27009,6 +27013,17 @@ We need to use dvips driver with XeLaTeX
>>> \AddFile{9}{tcolorbox}
+
+this is a trick to fix issues with paragraphs
+where spurious end \`'</p>' tags were inserted
+\<tcolorbox minipage\><<<
+\pend:def\tcb@minipage{\SaveEndP}
+\pend:def\tcb@minipage@top{\SaveEndP}
+\pend:def\tcb@minipage@bottom{\SaveEndP}
+\pend:def\tcb@minipage@center{\SaveEndP}
+
+>>>
+
%%%%%%%%%%%%%%%%%%%%%%%
\Section{dvipsnam}
%%%%%%%%%%%%%%%%%%%%%%%
@@ -31245,7 +31260,9 @@ The following might be problematic with a caption
\def\update:adjustbox:id{\stepcounter{adjustbox@4ht}\def\AdjustboxId{adjustbox-\arabic{adjustbox@4ht}}}
\NewConfigure{Adjustbox}{2}
-\def\:tempa#1#2#3#4{\update:adjustbox:id\a:Adjustbox\o:adjbox@@frame:{#1}{#2}{#3}{#4}\b:Adjustbox}
+
+\def\:tempa#1#2#3#4{\update:adjustbox:id\a:Adjustbox\o:adjbox@@frame:{#1}{#2}{#3}{#4}\b:Adjustbox
+}
\HLet\adjbox@@frame\:tempa
% suppress trying to draw the frame
@@ -31254,15 +31271,27 @@ The following might be problematic with a caption
% patch macro that collects adjustbox contents and draw box. we disable this functionality, as all
% of this should be handled by CSS
% keys are set, so it should be possible to extract colors or frame size in theory
-\long\def\:temp#1#2{\update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox #2\b:Adjustbox\endgroup}
+\long\def\:temp#1#2{%
+ % copy of definitions from \@adjustbox, to prevent compilation errors
+ \edef\adjbox@line{\the\inputlineno}%
+ \let\collectbox@mode\relax
+ \let\collectbox@noindent\relax
+ \let\adjbox@collectbox\@collectbox
+ \let\adjbox@begininnercode\@empty
+ \let\adjbox@endinnercode\@empty
+ \chardef\adjbox@innerlevel\z@
+ \update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox #2\b:Adjustbox\endgroup}
\HLet\@adjustbox\:temp
% definitions for macros
% we don't save any colors and just use one configuration for all box types.
-\def\@bgcolorbox#1{\update:adjustbox:id\a:Adjustbox\BOXCONTENT\b:Adjustbox}
-\def\@foregroundbox#1#2#3{\update:adjustbox:id\leavevmode\a:Adjustbox\BOXCONTENT\b:Adjustbox}
-\def\@backgroundbox#1#2#3{\update:adjustbox:id\leavevmode\a:Adjustbox\BOXCONTENT\b:Adjustbox}
+\def\:tempa#1{\update:adjustbox:id\a:Adjustbox\BOXCONTENT\b:Adjustbox}
+\HLet\@bgcolorbox\:tempa
+\def\:tempa#1#2#3{\update:adjustbox:id\leavevmode\a:Adjustbox\BOXCONTENT\b:Adjustbox}
+\HLet\@foregroundbox\:tempa
+\def\:tempa#1#2#3{\update:adjustbox:id\leavevmode\a:Adjustbox\BOXCONTENT\b:Adjustbox}
+\HLet\@backgroundbox\:tempa
\Hinput{adjustbox}
\endinput