summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-12 22:25:13 +0000
committerKarl Berry <karl@freefriends.org>2023-02-12 22:25:13 +0000
commit4dea12a2bd6d7b14874b9f8f24c4cc2c93e29a0b (patch)
tree07d626580c4c19841c3a672907593a1201993667 /Master
parent0ce0104a55f50d8e88ca5b8a83b8ece57fdf0368 (diff)
tcolorbox, tex4ht r1295
git-svn-id: svn://tug.org/texlive/trunk@65804 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog11
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/Makefile9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex9
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht11
4 files changed, 32 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index da38df49142..bb786652c48 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,14 @@
+2023-02-12 Karl Berry <karl@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@gmail.com>
+
+ * tex4ht-4ht.tex (tcolorbox.4ht): fixed unclosed paragraph with the
+ new version of Tcolorbox.
+
2023-02-09 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-fonts-stix2.tex: added support for Stix2 fonts.
diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile
index 4ec1683a339..0d330dd3d55 100644
--- a/Master/texmf-dist/source/generic/tex4ht/Makefile
+++ b/Master/texmf-dist/source/generic/tex4ht/Makefile
@@ -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_4ht = $(texmf)/tex/generic/tex4ht
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 @@ update-htfonts:
# 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
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index b26c68c2cf7..97ba417850e 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 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 @@ We need to use dvips driver with XeLaTeX
%%%%%%%%%%%%%%%%%%%%%%%
\<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 @@ We need to use dvips driver with XeLaTeX
% close title and open main box
\c:tcolorbox%
\box\tcb@upperbox%
+ % the paragraph opened in the upper box can be unclosed
+ \RecallEndP
% deal with lower box, if it is set
\iftcb@hasLower%
\a:tcolorlowerbox%
@@ -28144,6 +28146,9 @@ We need to use dvips driver with XeLaTeX
% overwrite other versions of box drawing macros
\HLet\tcb@drawcolorbox@standalone\:tempa
+% save the state of paragraph before opening the content box
+\pend:def\tcb@set@@upper@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
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
index 148c4305cdd..e8ebe22624b 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tcolorbox.4ht
@@ -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@upperbox%
+ % the paragraph opened in the upper box can be unclosed
+ \RecallEndP
% deal with lower box, if it is set
\iftcb@hasLower%
\a:tcolorlowerbox%
@@ -60,6 +62,9 @@
% overwrite other versions of box drawing macros
\HLet\tcb@drawcolorbox@standalone\:tempa
+% save the state of paragraph before opening the content box
+\pend:def\tcb@set@@upper@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