diff options
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/ChangeLog | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/index.4ht | 53 |
3 files changed, 40 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 639d6f21d8b..9a2451b6f19 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2024-03-31 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (index.4ht): fixed clash between Imakeidx and Index + packages. + https://tex.stackexchange.com/q/714247/2891 + 2024-03-27 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (fancyvrb.4ht): changed non-existent \glet command diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index f10339a4924..6f4a6b5cbf7 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 1496 2024-03-27 08:37:14Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1497 2024-03-31 14:24:29Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -32300,6 +32300,7 @@ not necessary in MathML anyway. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % index.4ht |version % % Copyright (C) |CopyYear.1999. Eitan M. Gurari % +% Copyright 2024 TeX Users Group |<TeX4ht copyright|> |<index shared|> \expandafter\ifx \csname @vwritefile\endcsname\relax @@ -32338,9 +32339,15 @@ index.sty\EndLink \<index 4.1beta warning\><<< \bgroup +\@ifpackageloaded{imakeidx}{ + \expandafter\gdef\csname idx:extI\endcsname#1{#1} + \expandafter\gdef\csname idx:extII\endcsname#1{#1} +}{ \catcode`\:=12 \expandafter\gdef\csname idx:extI\endcsname#1:#2//{#1} \expandafter\gdef\csname idx:extII\endcsname#1:#2:#3//{#2} +} + \egroup >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/index.4ht b/Master/texmf-dist/tex/generic/tex4ht/index.4ht index 0962a1326a6..21845fecc8c 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/index.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/index.4ht @@ -1,31 +1,24 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% index.4ht 2009-05-21-09:32 % -% Copyright (C) 1999--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} - +% index.4ht 2024-03-31-13:42 % +% Copyright (C) 1999-2009 Eitan M. Gurari % +% Copyright 2024 TeX Users Group +% Copyright 2009-2024 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project <http://tug.org/tex4ht>. +% +% If you modify this program, changing the +% version identification would be appreciated. \ifx \a:makeindex\:UnDef \NewConfigure{makeindex}{1} \Configure{makeindex}{} \fi @@ -70,9 +63,15 @@ {\Configure{Needs}{File: #1.4idx}\Needs{}}% \fi} \bgroup +\@ifpackageloaded{imakeidx}{ + \expandafter\gdef\csname idx:extI\endcsname#1{#1} + \expandafter\gdef\csname idx:extII\endcsname#1{#1} +}{ \catcode`\:=12 \expandafter\gdef\csname idx:extI\endcsname#1:#2//{#1} \expandafter\gdef\csname idx:extII\endcsname#1:#2:#3//{#2} +} + \egroup |