imakeidx (18may16)

git-svn-id: svn://tug.org/texlive/trunk@41241 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 11 insertions, 42 deletions

diff --git a/Master/texmf-dist/doc/latex/imakeidx/README b/Master/texmf-dist/doc/latex/imakeidx/README
index 9ddab8aa411..05ffd6f20cd 100644
--- a/Master/texmf-dist/doc/latex/imakeidx/README
+++ b/Master/texmf-dist/doc/latex/imakeidx/README
@@ -1,5 +1,5 @@
-This is the README file relative to package imakeidx version 1.3b
-dated 4 April 2016.
+This is the README file relative to package imakeidx version 1.3c
+dated 16 May 2016.
 
 Copyright 2010-2016 by Enrico Gregorio
 
@@ -47,8 +47,7 @@ conflicts  with other  packages  have been  reported  and have been
 resolved,  or  at  least  advice is given  so as  to overcome  such 
 conflicts.
 
-This 1.3b version fixes an untimely closing of the index file
-when the `nonewpage' or `noautomatic' options are in force.
-It also changes the call to \write18 when LuaTeX is being used.
+This version 1.3c fixes a problem whereby fancyhdr would not produce
+the correct headers; as a consequence, xpatch is not loaded any more.
 
 Enrico Gregorio       enrico dot gregorio at univr.it
diff --git a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
deleted file mode 100644
index 60b79309f80..00000000000
--- a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/imakeidx/manifest.txt b/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
index a7df269ff1e..c7389c3d238 100644
--- a/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
+++ b/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
@@ -1,5 +1,5 @@
                    The imakeidx extension package
-                    version 1.3b of 4 April 2016
+                    version 1.3c of 16 May 2016
 
 Copyright 2010-2016 by Enrico Gregorio
 
diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
index 96b076e286e..e892585e296 100644
--- a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
+++ b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
@@ -42,7 +42,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{imakeidx}%
 %<*package>
-   [2016/04/03 v1.3b Package for typesetting indices in a synchronous mode]
+   [2016/05/16 v1.3c Package for typesetting indices in a synchronous mode]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -77,7 +77,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{803}
+% \CheckSum{785}
 %
 % \changes{v1.0}{2010/07/10}{First public version}
 % \changes{v1.0a}{2010/07/12}{Small bug correction}
@@ -95,6 +95,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \changes{v1.3b}{2016/04/03}{Fixed untimely closing of the files with
 % the `nonewpage' option and the `noautomatic' option}
 % \changes{v1.3b}{2016/04/03}{LuaTeX 0.90 doesn't support \texttt{\char92 write18}}
+% \changes{v1.3c}{2016/05/16}{\pack{xpatch} is not loaded any more}
 %
 % \begin{abstract}
 % This package exploits the |\write18| facility of modern \TeX\ system
@@ -956,11 +957,8 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % which is incompatible with \pack{multicol}. We define also an
 % internal alias for |\immediate\write18|, a rudimentary check for the
 % typesetting engine and a macro for modifying the command line call
-% to \prog{splitindex}. The \pack{xpatch} is requested; at the moment
-% none if its features are used, but it calls \pack{etoolbox}, whose
-% facilities are used here; while future extensions will benefit from
-% the extended patched commands, that strongly enrich the performances
-% of the main package \pack{etoolbox}.
+% to \prog{splitindex}.
+% \changes{v1.3c}{2016/05/16}{\pack{xpatch} is not loaded any more}
 % \changes{v1.1a}{2012/09/07}{Fixed bug with possibly defined
 % \cs{directlua}; now we leave the check to \pack{ifluatex}; using
 % also \pack{ifxetex} for symmetry.}
@@ -1295,26 +1293,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % environment, based on the standard, but using, if the number of
 % columns is greater than one, the \texttt{multicols} environment.
 % Users needing a different setup can use the \cs{indexsetup} command.
-% Before doing so, though, we need to disable certain features if the
-% package \pack{fancyhdr} is loaded sometimes before the
-% |\begin{document| statement, be it before or after loading
-% \pack{imakeidx}. If that package is loaded we have to patch the
-% definition of the environment |theindex|, because its default
-% commands interfere with those defined here that work perfectly
-% when \pack{fancyhdr} is not loaded. This patching could be defined
-% further on, but if it stay close to what has to be patched, it's
-% easier to understand it's operation.
 %    \begin{macrocode}
-\newif\ifimki@fancyhdr
-\AtBeginDocument{%
-  \@ifundefined{xpatchcmd}{\RequirePackage{xpatch}}{}%
-  \@ifpackageloaded{fancyhdr}{\imki@fancyhdrtrue}{\imki@fancyhdrfalse}%
-  \ifimki@fancyhdr
-    \xpatchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
-    \xpatchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}%
-  \fi
-}
-%     
 \ifimki@original
  \expandafter\def\expandafter\theindex\expandafter{\expandafter
     \imki@maybeaddtotoc\theindex}
diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
index a9de7bad7e7..933b076d4e9 100644
--- a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
+++ b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
@@ -14,7 +14,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2005/12/01]
 \ProvidesPackage{imakeidx}%
-   [2016/04/03 v1.3b Package for typesetting indices in a synchronous mode]
+   [2016/05/16 v1.3c Package for typesetting indices in a synchronous mode]
 
 
 
@@ -209,15 +209,6 @@
   \let\KV@imki@noautomaticfalse\KV@imki@noautomatictrue
   \KV@imki@noautomatictrue
 \fi
-\newif\ifimki@fancyhdr
-\AtBeginDocument{%
-  \@ifundefined{xpatchcmd}{\RequirePackage{xpatch}}{}%
-  \@ifpackageloaded{fancyhdr}{\imki@fancyhdrtrue}{\imki@fancyhdrfalse}%
-  \ifimki@fancyhdr
-    \xpatchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
-    \xpatchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}%
-  \fi
-}
 \ifimki@original
  \expandafter\def\expandafter\theindex\expandafter{\expandafter
     \imki@maybeaddtotoc\theindex}