From 60e9a31bad8271499f6b5f9280174e76bd62814f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 19 Dec 2023 03:00:50 +0000 Subject: CTAN sync 202312190300 --- support/TeX4ht/source/ChangeLog | 6 ++++ support/TeX4ht/source/tex4ht-4ht.tex | 14 ++++++++- support/TeX4ht/source/tex4ht-env.tex | 55 +++++++++++++++++++----------------- 3 files changed, 48 insertions(+), 27 deletions(-) (limited to 'support/TeX4ht') diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index f9dbdfcfd5..fb58c85cb6 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,9 @@ +2023-12-17 Michal Hoftich + + * tex4ht-4ht.tex (enumitem.4ht): prevent errors with redefined + description list styles. + https://github.com/hendricius/the-sourdough-framework/pull/312 + 2023-12-14 Michal Hoftich * tex4ht-sty.tex (tex4ht.sty): don't redefine \tabacckludge with diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index e896969c1e..afd202c002 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1420 2023-12-12 15:53:16Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1425 2023-12-17 20:54:22Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -29802,6 +29802,18 @@ what can go wrong\EndLink. \fi} >>> +This should prevent enumitem from changing of items in description lists, +because this can lead to errors. + +See \Link[https://github.com/hendricius/the-sourdough-framework/pull/312]{}{}for an example\EndLink. + + + +\<<< +\def\enit@postlabel{} +>>> + + %%%%%%%%%%%%% \Section{esperanto.sty} %%%%%%%%%%%%% diff --git a/support/TeX4ht/source/tex4ht-env.tex b/support/TeX4ht/source/tex4ht-env.tex index 9b175890b3..5d66aa43d0 100644 --- a/support/TeX4ht/source/tex4ht-env.tex +++ b/support/TeX4ht/source/tex4ht-env.tex @@ -1,8 +1,8 @@ -% $Id: tex4ht-env.tex 418 2018-07-03 17:37:07Z karl $ +% $Id: tex4ht-env.tex 1419 2023-12-11 23:23:52Z karl $ % latex tex4ht-env % or htlatex tex4ht-env "xhtml,3" % -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -112,29 +112,32 @@ before validations. %%%%%%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Notes: % -% 1. Empty lines might be harmful % -% 2. Tagged script segments ... are scanned only if % -% their names are specified within -ctag switches of tex4ht.c % -% and t4ht.c. When -c switches are not supplied, a -cdefault % -% is implicitly assumed. % -% The tags and , but not their bodies, are % -% ignored if they are not located at the start of their lines. % -% 3. Place this file in your work directory and/or root directory % -% and/or in directory `xxx' of your choice. In the latest case, % -% compile tex4ht.c and t4ht.c with `#define ENVFILE xxx', or % -% provide the address of the file to tex4ht and t4ht throught % -% the -e switch % -% 4. Under kpathsea, the substring `%%~' may be employed in % -% commands to obtain the value of ${TEXMFDIST}. % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Notes: +% 1. Empty lines might be harmful. +% +% 2. Tagged script segments ... are scanned only if +% their names are specified within -ctag switches of tex4ht.c +% and t4ht.c. When -c switches are not supplied, a -cdefault +% is implicitly assumed. +% The tags and , but not their bodies, are +% ignored if they are not located at the start of their lines. +% +% 3. Place this file in your work directory and/or root directory +% and/or in directory `xxx' of your choice. In the latest case, +% compile tex4ht.c and t4ht.c with `#define ENVFILE xxx', or +% provide the location of the file to tex4ht and t4ht with +% the -e switch. +% +% 4. Under kpathsea, the substring `%%~' may be employed in +% commands to obtain the value of ${TEXMFDIST}. +% >>> \<<< -% See comments in the Unix tex4ht.env for how this file gets found, -% except on Windows, we also look in the directory of tex4ht.exe/t4ht.exe. +% See comments in the Unix tex4ht.env for how this file gets found -- +% except that on Windows, we also look in the directory of tex4ht.exe/t4ht.exe. >>> @@ -682,12 +685,12 @@ Gdvipng -T tight -D 144 -bg Transparent -pp %%2:%%2 %%1 -o %%3 \<<< G.svg -Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -s %%1 > %%3 >>> +Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -o %%3 %%1 >>> \<<< G.svg -Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -s %%1 > %%3 >>> +Gdvisvgm -n -p %%2 --exact -c 1.4,1.4 -o %%3 %%1 >>> dvisvgm is included with all \TeX\ distributions nowadays and the conversion is quite fast and efficient. @@ -1648,20 +1651,20 @@ Note: the permission option `S' takes into account also trailing spaces. \<<< % tex4ht.env-unix (@version), generated from @jobname.tex % (can be used as ~/.tex4ht) -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright @CopyYear.1997. Eitan M. Gurari @>>> \<<< % tex4ht.env (private) (@version), generated from @jobname.tex % (can be used as ~/.tex4ht) -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright @CopyYear.1997. Eitan M. Gurari @>>> \<<< % tex4ht.env-win32 (@version), generated from @jobname.tex -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2023 TeX Users Group % Copyright @CopyYear.1997. Eitan M. Gurari @>>> -- cgit v1.2.3