From dc5dafdd7c01d469b556bc5bef745a6f1c84a5cb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 14 Feb 2023 03:01:39 +0000 Subject: CTAN sync 202302140301 --- support/TeX4ht/source/ChangeLog | 11 +++++++++++ support/TeX4ht/source/Makefile | 9 ++++++--- support/TeX4ht/source/tex4ht-4ht.tex | 9 +++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) (limited to 'support/TeX4ht/source') diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index da38df4914..bb786652c4 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,14 @@ +2023-02-12 Karl Berry + + * tex4ht-4ht.tex: copyright 2023 + * Makefile (inst_dir_all): new variable. + (svnstatus st): new convenience targets. + +2023-02-12 Michal Hoftich + + * tex4ht-4ht.tex (tcolorbox.4ht): fixed unclosed paragraph with the + new version of Tcolorbox. + 2023-02-09 Michal Hoftich * tex4ht-fonts-stix2.tex: added support for Stix2 fonts. diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile index 4ec1683a33..0d330dd3d5 100644 --- a/support/TeX4ht/source/Makefile +++ b/support/TeX4ht/source/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/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index b26c68c2cf..97ba417850 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/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 (|version), generated from |jobname.tex -% Copyright 2020-2022 TeX Users Group +% Copyright 2020-2023 TeX Users Group | % 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 -- cgit v1.2.3