texlive[65804] Master/texmf-dist: tcolorbox, tex4ht r1295
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 12 23:25:14 CET 2023
Revision: 65804
http://tug.org/svn/texlive?view=revision&revision=65804
Author: karl
Date: 2023-02-12 23:25:13 +0100 (Sun, 12 Feb 2023)
Log Message:
-----------
tcolorbox, tex4ht r1295
Revision Links:
--------------
http://tug.org/svn/texlive?view=revision&revision=1295
Modified Paths:
--------------
trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
trunk/Master/texmf-dist/source/generic/tex4ht/Makefile
trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-02-12 21:02:16 UTC (rev 65803)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog 2023-02-12 22:25:13 UTC (rev 65804)
@@ -1,3 +1,14 @@
+2023-02-12 Karl Berry <karl at freefriends.org>
+
+ * tex4ht-4ht.tex: copyright 2023
+ * Makefile (inst_dir_all): new variable.
+ (svnstatus st): new convenience targets.
+
+2023-02-12 Michal Hoftich <michal.h21 at gmail.com>
+
+ * tex4ht-4ht.tex (tcolorbox.4ht): fixed unclosed paragraph with the
+ new version of Tcolorbox.
+
2023-02-09 Michal Hoftich <michal.h21 at gmail.com>
* tex4ht-fonts-stix2.tex: added support for Stix2 fonts.
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/Makefile
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/Makefile 2023-02-12 21:02:16 UTC (rev 65803)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/Makefile 2023-02-12 22:25:13 UTC (rev 65804)
@@ -1,4 +1,4 @@
-# $Id: Makefile 1293 2023-02-09 16:22:17Z michal_h21 $
+# $Id: Makefile 1296 2023-02-12 22:24:09Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
@@ -750,6 +750,9 @@
inst_dir_top = $(texmf)/tex4ht
inst_dir_scripts = $(texmf)/scripts/tex4ht
inst_dir_source = $(texmf)/source/generic/tex4ht
+#
+inst_dir_all = $(inst_dir_4ht) $(inst_dir_top) $(inst_dir_scripts) \
+ $(inst_dir_source)
# Simple command to "install" from dev to TL.
# (Other methods are also used.)
@@ -816,8 +819,8 @@
# svn status of results.
svnstatus st:
- svn status $(inst_dir_4ht) $(inst_dir_top) $(inst_dir_scripts) \
- $(inst_dir_source) | sed s,$(texmf),, # reduce output
+ svn status $(inst_dir_all) | sed s,$(texmf),, # reduce output
+ @echo $(inst_dir_all)
#
# diff all files in the main TeX Live installation directory against
Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-02-12 21:02:16 UTC (rev 65803)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex 2023-02-12 22:25:13 UTC (rev 65804)
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1286 2023-01-12 21:20:42Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1297 2023-02-12 22:24:36Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -28100,7 +28100,7 @@
%%%%%%%%%%%%%%%%%%%%%%%
\<tcolorbox.4ht\><<<
% tcolorbox.4ht (|version), generated from |jobname.tex
-% Copyright 2020-2022 TeX Users Group
+% Copyright 2020-2023 TeX Users Group
|<TeX4ht license text|>
% use custom counter that increments for every \tcolorbox
@@ -28131,6 +28131,8 @@
% close title and open main box
\c:tcolorbox%
\box\tcb at upperbox%
+ % the paragraph opened in the upper box can be unclosed
+ \RecallEndP
% deal with lower box, if it is set
\iftcb at hasLower%
\a:tcolorlowerbox%
@@ -28144,6 +28146,9 @@
% overwrite other versions of box drawing macros
\HLet\tcb at drawcolorbox@standalone\:tempa
+% save the state of paragraph before opening the content box
+\pend:def\tcb at set@@upper at and@lower{\SaveEndP}
+
% we need to close tcolorbox environment here,
% in the box. otherwise, last paragraph end
% would be ignored and we would get invalid XML
Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht 2023-02-12 21:02:16 UTC (rev 65803)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht 2023-02-12 22:25:13 UTC (rev 65804)
@@ -1,5 +1,5 @@
-% tcolorbox.4ht (2022-05-05-13:42), generated from tex4ht-4ht.tex
-% Copyright 2020-2022 TeX Users Group
+% tcolorbox.4ht (2023-02-12-14:24), generated from tex4ht-4ht.tex
+% Copyright 2020-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-05-05-13:42}
+\immediate\write-1{version 2023-02-12-14:24}
% use custom counter that increments for every \tcolorbox
@@ -47,6 +47,8 @@
% close title and open main box
\c:tcolorbox%
\box\tcb at upperbox%
+ % the paragraph opened in the upper box can be unclosed
+ \RecallEndP
% deal with lower box, if it is set
\iftcb at hasLower%
\a:tcolorlowerbox%
@@ -60,6 +62,9 @@
% overwrite other versions of box drawing macros
\HLet\tcb at drawcolorbox@standalone\:tempa
+% save the state of paragraph before opening the content box
+\pend:def\tcb at set@@upper at and@lower{\SaveEndP}
+
% we need to close tcolorbox environment here,
% in the box. otherwise, last paragraph end
% would be ignored and we would get invalid XML
More information about the tex-live-commits
mailing list.