imakeidx (8sep12)

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

4 files changed, 15 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/imakeidx/README b/Master/texmf-dist/doc/latex/imakeidx/README
index 6def34aa103..4a32d0fe090 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.1
-dated 2012/05/09
+This is the README file relative to package imakeidx version 1.1a
+dated 2012/09/07
 
 Copyright 2010--2012 Claudio Beccari and Enrico Gregorio
 
diff --git a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
index 81ad297c9fb..cfac3bda5a4 100644
--- a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
+++ b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
index e6e31e5ec98..9e2b1b62529 100644
--- a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
+++ b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
@@ -43,7 +43,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
 %<package>\ProvidesPackage{imakeidx}%
 %<*package>
-   [2012/05/09 v1.1 Package for typesetting indices in a synchronous mode]
+   [2012/09/07 v1.1a Package for typesetting indices in a synchronous mode]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -75,12 +75,13 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{743}
+% \CheckSum{742}
 %
 % \changes{v1.0}{2010/07/10}{First public version}
 % \changes{v1.0a}{2010/07/12}{Small bug correction}
 % \changes{v1.1}{2012/05/09}{Fixed compatibility with \pack{memoir}}
 % \changes{v1.1}{2012/05/09}{Modified interaction with Lua\TeX}
+% \changes{v1.1a}{2012/09/07}{Fixed bug with possibly defined \cs{directlua}}
 %
 % \begin{abstract}
 % This package exploits the |\write18| facility of modern \TeX\ system
@@ -639,6 +640,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % internal alias for |\immediate\write18|, a rudimentary check for the
 % typesetting engine and a macro for modifying the command line call
 % to \prog{splitindex}.
+% \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.}
 %    \begin{macrocode}
 \DeclareOption{xindy}{\def\imki@progdefault{texindy}}
 \DeclareOption{texindy}{\def\imki@progdefault{texindy}}
@@ -662,8 +666,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 \if@twocolumn\imki@originaltrue\fi
 \def\imki@exec{\immediate\write18}
 \def\imki@engine{(pdf)latex}
-\ifdefined\XeTeXversion\def\imki@engine{xelatex}\fi
-\ifdefined\directlua % luatex doesn't have \(pdf)shellescape
+\RequirePackage{ifxetex,ifluatex}
+\ifxetex\def\imki@engine{xelatex}\fi
+\ifluatex % luatex doesn't have \(pdf)shellescape
  \def\imki@engine{lualatex}
   \ifnum\luatexversion<68
     \chardef\imki@shellescape\@ne % no way to know the value
diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
index 686d541318f..380450ed537 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}%
-   [2012/05/09 v1.1 Package for typesetting indices in a synchronous mode]
+   [2012/09/07 v1.1a Package for typesetting indices in a synchronous mode]
 \RequirePackage{xkeyval}
 \DeclareOption{xindy}{\def\imki@progdefault{texindy}}
 \DeclareOption{texindy}{\def\imki@progdefault{texindy}}
@@ -38,8 +38,9 @@
 \if@twocolumn\imki@originaltrue\fi
 \def\imki@exec{\immediate\write18}
 \def\imki@engine{(pdf)latex}
-\ifdefined\XeTeXversion\def\imki@engine{xelatex}\fi
-\ifdefined\directlua % luatex doesn't have \(pdf)shellescape
+\RequirePackage{ifxetex,ifluatex}
+\ifxetex\def\imki@engine{xelatex}\fi
+\ifluatex % luatex doesn't have \(pdf)shellescape
  \def\imki@engine{lualatex}
   \ifnum\luatexversion<68
     \chardef\imki@shellescape\@ne % no way to know the value