summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-20 16:24:27 +0000
committerKarl Berry <karl@freefriends.org>2023-10-20 16:24:27 +0000
commit5fdf6880a6b1a5d504f855f2508e631acc6673dc (patch)
tree51d4d438e0aa6191eed2e1f9247bb1a679af51a6 /Master/texmf-dist/source/generic
parentdb3e63dc3a5742116cfa46defde9c6a046394d88 (diff)
listings, tcolorbox updates, tex4ht r1396
git-svn-id: svn://tug.org/texlive/trunk@68600 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog7
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex13
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex6
3 files changed, 23 insertions, 3 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 310051b5894..835982e89e3 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,10 @@
+2023-10-20 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (tcolorbox.4ht),
+ * tex4ht-html4.tex (html4.4ht): added support for the Listings
+ library of the Tcolobox package
+ https://puszcza.gnu.org.ua/bugs/?312
+
2023-10-18 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (cprotect.4ht): remove spurious characters from the
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index d9c2de66c3b..577a1f2e9b8 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1395 2023-10-18 20:38:31Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1396 2023-10-20 16:07:23Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -28490,7 +28490,7 @@ We need to use dvips driver with XeLaTeX
\get:xcolorcss{tcbcolframe}\:tcbcolframe%
\get:xcolorcss{tcbcolupper}\:tcbcolupper%
% make unique ID for this box
- \def\:tcbcolid{tcolobox-\arabic{:tcbcolcount}}
+ \gdef\:tcbcolid{tcolobox-\arabic{:tcbcolcount}}
% Open box
\a:tcolorbox%
% set label if it exists
@@ -28530,6 +28530,15 @@ We need to use dvips driver with XeLaTeX
\def\:tempb{\d:tcolorbox\o:tcb@endboxanddraw:}
\HLet\tcb@endboxanddraw\:tempb
+% tcolorbox supports libraries, but it loads them
+% in a way that doesn't register them for the use
+% with .4ht files.
+% this fix is for tcblistingscore.code.tex
+\NewConfigure{tcblisting}{1}
+\def\:tempb{\o:endtcblisting:\d:tcolorbox\a:tcblisting}
+\HLet\endtcblisting\:tempb
+
+
% this code prevents emptying of the box title when
% some Tcolorbox options are used
\def\:tempb{}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
index 5d5e52f60d2..0d10aaf33ea 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1393 2023-10-16 12:00:17Z michal_h21 $
+% $Id: tex4ht-html4.tex 1396 2023-10-20 16:07:23Z michal_h21 $
% Compile 4 times: latex tex4ht-html4
% Copy html4.4ht into the work directory before all but the last compilation.
%
@@ -16458,6 +16458,10 @@ Blue = 1-minimum(1,Yellow *(1-Black)+Black)
% there is rule p + div elsewhere in TeX4ht. we want to nullify it.
\Css{.tcolorbox .lowerbox{margin-top:0pt;}}
+
+% remove unwanted margins and border from listings inside tcolorbox
+% https://puszcza.gnu.org.ua/bugs/?312
+\Configure{tcblisting}{\Css{\#\:tcbcolid\space.lstinputlisting{margin-bottom:0em;margin-top:0em;border: none;}}}
>>>
%%%%%%%%%%%%%%%%