summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-03-31 20:53:23 +0000
committerKarl Berry <karl@freefriends.org>2024-03-31 20:53:23 +0000
commit613e8f7732faf711a8c7eee134c7afd6481e0eff (patch)
tree9e181c423e2c7d848480bdeaf73bd3010a3b4d0e /Master/texmf-dist/source/generic
parent1d187732c0f4ba2534d6cf2b2622f8fd0b52b6ed (diff)
imakeidx vs. index clash, tex4ht r1497
git-svn-id: svn://tug.org/texlive/trunk@70827 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex9
2 files changed, 14 insertions, 1 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
>>>