sync

git-svn-id: svn://tug.org/texlive/trunk@57077 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 46 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht
index 7751f0854e5..aa13b45334d 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 (2020-11-27-15:09), generated from tex4ht-html4.tex
+% html4.4ht (2020-12-03-13:56), generated from tex4ht-html4.tex
 % Copyright 2009-2020 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 2020-11-27-15:09}
+\immediate\write-1{version 2020-12-03-13:56}
 
 \exit:ifnot{8859-6,% 
 CJK,% 
@@ -225,6 +225,7 @@ syntax,%
 t2benc,% 
 tabulary,% 
 tcilatex,% 
+tcolorbox,% 
 tex4ht,% 
 tex4ht2,% 
 texinfo,% 
@@ -39901,6 +39902,34 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+                \ConfigureHinput{tcolorbox}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    \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;}}
+}
+{\HCode{\Hnewline<div class="tcolorbox-title">}\par}
+{\ifvmode\IgnorePar\fi\EndP\HCode{</div>\Hnewline<div class="tcolorbox-content">}}
+{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>\Hnewline</div>}\par}
+
+\Css{.tcolorbox{margin-top:0.5em;margin-bottom: 0.5em;}}
+
+\Configure{tcolorlowerbox}{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline<div class="lowerbox">}
+  \Css{\#\:tcbcolid\space .lowerbox{border-top: 1px dashed \:tcbcolframe;}}
+}
+{\ifvmode\IgnorePar\fi\EndP\HCode{\Hnewline</div>}}
+
+% there is rule p + div elsewhere in TeX4ht. we want to nullify it.
+\Css{.tcolorbox .lowerbox{margin-top:0pt;}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+  
+\endinput\empty\empty\empty\empty\empty\empty
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
                 \ConfigureHinput{skak}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     \Configure{SkakBoard}{\Picture+{}}{\EndPicture}
@@ -39943,5 +39972,6 @@ y{\ht:special{t4ht@+\string&{35}x00FD{59}}y}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+
 \endinput
 
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
index b047bf473fe..0e68e3e3b9e 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mktex4ht.4ht
@@ -11,7 +11,7 @@
 %  are strongly advised not to look at the code which follows
 %  the copyright notice.
 %
-% mktex4ht.4ht (2020-10-16-13:47), generated from cond4ht.4ht
+% mktex4ht.4ht (2020-12-03-13:56), generated from cond4ht.4ht
 % Copyright 2009-2019 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
@@ -30,7 +30,7 @@
 %
 % If you modify this program, changing the
 % version identification would be appreciated.
-\immediate\write-1{version 2020-10-16-13:47}
+\immediate\write-1{version 2020-12-03-13:56}
 
 
 \def\infofiles{infoht4,infomml}
@@ -170,7 +170,8 @@
 \lit{magyar}\lit{exam}\lit{ctex}\lit{polyglossia}
 \lit{fontspec}\lit{fontspec-xetex}\lit{fontspec-luatex}\lit{tuenc-xetex}
 \lit{tuenc-xetex-input}\lit{tuenc-luatex}\lit{framed}\lit{mdframed}
-\lit{skak}\lit{animate}\lit{sectionbreak}
+\lit{tcolorbox}\lit{skak}\lit{animate}\lit{sectionbreak}
+
    \ifx \EXIST\UnDef\else \expandafter\moreLit\EXIST,,//\fi
    \string\endinput
  >>>  \LitFile  \fi \GetLit}
@@ -345,16 +346,16 @@
 \LitRow{subscript}\LitRow{supertabular}\LitRow{sverb}\LitRow{svg}
 \LitRow{svgnam}\LitRow{swedish}\LitRow{syntax}\LitRow{t2benc}
 \LitRow{tabu}\LitRow{tabularx}\LitRow{tabulary}\LitRow{tabulary-a}
-\LitRow{tcilatex}\LitRow{tex4ht}\LitRow{tex4ht2}\LitRow{texinfo}
-\LitRow{texpower}\LitRow{textures}\LitRow{th4}\LitRow{theorem}
-\LitRow{titlesec}\LitRow{titling}\LitRow{tocloft}\LitRow{tuenc-luatex}
-\LitRow{tuenc-xetex}\LitRow{tuenc-xetex-input}\LitRow{tugboat}\LitRow{turkish}
-\LitRow{ucs}\LitRow{ukraineb}\LitRow{ulem}\LitRow{url}
-\LitRow{ushort}\LitRow{usorbian}\LitRow{utf8}\LitRow{utf8x}
-\LitRow{vanilla}\LitRow{varioref}\LitRow{verbatim}\LitRow{verbatimfiles}
-\LitRow{verse}\LitRow{vowel}\LitRow{web}\LitRow{welsh}
-\LitRow{wrapfig}\LitRow{writer}\LitRow{xcolor}\LitRow{xr}
-\LitRow{xr-hyper}\LitRow{xy}
+\LitRow{tcilatex}\LitRow{tcolorbox}\LitRow{tex4ht}\LitRow{tex4ht2}
+\LitRow{texinfo}\LitRow{texpower}\LitRow{textures}\LitRow{th4}
+\LitRow{theorem}\LitRow{titlesec}\LitRow{titling}\LitRow{tocloft}
+\LitRow{tuenc-luatex}\LitRow{tuenc-xetex}\LitRow{tuenc-xetex-input}\LitRow{tugboat}
+\LitRow{turkish}\LitRow{ucs}\LitRow{ukraineb}\LitRow{ulem}
+\LitRow{url}\LitRow{ushort}\LitRow{usorbian}\LitRow{utf8}
+\LitRow{utf8x}\LitRow{vanilla}\LitRow{varioref}\LitRow{verbatim}
+\LitRow{verbatimfiles}\LitRow{verse}\LitRow{vowel}\LitRow{web}
+\LitRow{welsh}\LitRow{wrapfig}\LitRow{writer}\LitRow{xcolor}
+\LitRow{xr}\LitRow{xr-hyper}\LitRow{xy}
 \ifx \EXIST\UnDef\else \expandafter\moreLitRow\EXIST,,//\fi
 \ifvmode \IgnorePar\fi\EndP \HCode{</table>}
 \IgnoreIndent\par\rightline{[\ExitHPage{}]} \EndHPage{}]