summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-12-17 21:18:12 +0000
committerKarl Berry <karl@freefriends.org>2023-12-17 21:18:12 +0000
commit293605208760e445a1a60bf4195fca77061b0028 (patch)
tree3ba1f186237521a88bf16266db03bdfc8aabdd45
parenteb15538930ea09414bcaf27957c9a2c27818c09b (diff)
prevent errors with redefined description list styles, tex4ht r1424
git-svn-id: svn://tug.org/texlive/trunk@69156 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex14
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex55
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht7
4 files changed, 52 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index f9dbdfcfd56..fb58c85cb62 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2023-12-17 Michal Hoftich <michal.h21@gmail.com>
+
+ * 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 <michal.h21@gmail.com>
* tex4ht-sty.tex (tex4ht.sty): don't redefine \tabacckludge with
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index e896969c1e6..afd202c002c 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 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.
+
+
+
+\<enumitem config\><<<
+\def\enit@postlabel{}
+>>>
+
+
%%%%%%%%%%%%%
\Section{esperanto.sty}
%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex
index 9b175890b32..5d66aa43d02 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-env.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/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.
%%%%%%%%%%%%%%%%%%%
\<unix opening comment\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Notes: %
-% 1. Empty lines might be harmful %
-% 2. Tagged script segments <tag>...</tag> 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 <tag> and </tag>, 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 <tag>...</tag> 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 <tag> and </tag>, 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}.
+%
>>>
\<win32 opening comment\><<<
-% 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
\<unix svg\><<<
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 >>>
\<win32 svg\><<<
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.
\<unix copyright\><<<
% 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 copyright@>>>>
\<private copyright\><<<
% 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 copyright@>>>>
\<win32 copyright\><<<
% 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
@<TeX4ht copyright@>>>>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht b/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht
index 52e78e780df..acabf869b27 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/enumitem.4ht
@@ -1,6 +1,6 @@
-% enumitem.4ht (2022-05-01-08:25), generated from tex4ht-4ht.tex
+% enumitem.4ht (2023-12-17-13:16), generated from tex4ht-4ht.tex
% Copyright 2009-2009 Eitan M. Gurari
-% Copyright 2009-2022 TeX Users Group
+% Copyright 2009-2023 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-05-01-08:25}
+\immediate\write-1{version 2023-12-17-13:16}
\AddToHook{env/enumerate/end}{\ifx\enit@after\@empty\else%
\let\enit:after\enit@after
@@ -25,6 +25,7 @@
\let\enumerate:executed\@empty
\append:def\end:DL{\enit:after}
\fi}
+\def\enit@postlabel{}
\Hinput{enumitem}
\endinput