imakeidx (16oct16)

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

5 files changed, 53 insertions, 47 deletions

diff --git a/Master/texmf-dist/doc/latex/imakeidx/README b/Master/texmf-dist/doc/latex/imakeidx/README
index 369bc48e96c..5ca53285d6e 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.3d
-dated 28 June 2016.
+This is the README file relative to package imakeidx version 1.3e
+dated 15 October 2016.
 
 Copyright 2010-2016 by Enrico Gregorio
 
@@ -17,37 +17,37 @@ imakeidx.pdf        the documentation file in PDF format
 
 are SIMULTANEOUSLY produced while running pdflatex on imakeidx.dtx.
 
-The bundle  is distributed  under the LPPL license  version 1.3c or 
+The bundle  is distributed  under the LPPL license  version 1.3c or
 any later version.
 
 The bundle has the status of author maintained.
 
 The various files should be moved to the TDS folders as such:
 in source/latex/imakeidx/  file: imakeidx.dtx
-in doc/latex/imakeidx/     files: README, manifest.txt, imakeidx.pdf 
+in doc/latex/imakeidx/     files: README, manifest.txt, imakeidx.pdf
 in tex/latex/imakeidx/    file: imakeidx.sty
 
-The main  purpose of this bundle  is to exploit  the possibility of 
-running  an  index  formatting   program  from  within  a  document 
-typesetting task (tested with the engines pdftex, xetex, and luatex 
-in their  incarnation  set up to process  the LaTeX  markup) at the 
-\printindex  level, so that one  or more indices  can be typeset in 
-such a way that they are always synchronous  with the document they 
+The main  purpose of this bundle  is to exploit  the possibility of
+running  an  index  formatting   program  from  within  a  document
+typesetting task (tested with the engines pdftex, xetex, and luatex
+in their  incarnation  set up to process  the LaTeX  markup) at the
+\printindex  level, so that one  or more indices  can be typeset in
+such a way that they are always synchronous  with the document they
 belong to.
 
-With the TeXlive 2010 release  the makeindex  program can be safely 
-run within a TeX run;  with previous distributions the shell escape 
-feature  had to be  explicitly  enabled.   With the 2010  and later 
-distributions the makeindex program is directly accessible.  If the 
-xindy program  is used  to sort index entries  and format the index 
+With the TeXlive 2010 release  the makeindex  program can be safely
+run within a TeX run;  with previous distributions the shell escape
+feature  had to be  explicitly  enabled.   With the 2010  and later
+distributions the makeindex program is directly accessible.  If the
+xindy program  is used  to sort index entries  and format the index
 files, it is still necessary to use the full shell escape option.
 
-This  bundle  is compatible  with  most  existing  classes;    some 
-conflicts  with other  packages  have been  reported  and have been 
-resolved,  or  at  least  advice is given  so as  to overcome  such 
+This  bundle  is compatible  with  most  existing  classes;    some
+conflicts  with other  packages  have been  reported  and have been
+resolved,  or  at  least  advice is given  so as  to overcome  such
 conflicts.
 
-This version 1.3d is a maintenance release for solving an issue
+This version 1.3e is a maintenance release for solving an issue
 with the CTAN upload.
 
 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
index cc4bfe7a435..261685290a4 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/doc/latex/imakeidx/manifest.txt b/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
index f561d44f9cf..8866dd7dd74 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.3d of 28 June 2016
+                    version 1.3e of 15 October 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 4c016e27b84..0a97c54d4f1 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/05/16 v1.3d Package for typesetting indices in a synchronous mode]
+   [2016/10/15 v1.3e 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{785}
+% \CheckSum{788}
 %
 % \changes{v1.0}{2010/07/10}{First public version}
 % \changes{v1.0a}{2010/07/12}{Small bug correction}
@@ -96,7 +96,8 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % 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}
-% \changes{v1.3c}{2016/06/28}{No change, bumped version number}
+% \changes{v1.3d}{2016/06/28}{No change, bumped version number}
+% \changes{v1.3e}{2016/10/15}{Don't leave \texttt{\char92 shellescape} defined}
 %
 % \begin{abstract}
 % This package exploits the |\write18| facility of modern \TeX\ system
@@ -128,7 +129,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % incorporates the extensions of \eTeX\ and has the ability to open a
 % shell so as to call system commands with their arguments. The same
 % is true for \prog{xetex} and \prog{luatex}.
-% 
+%
 % This facility, since the \TeX~Live 2010 distribution, is official,
 % but is sort of restricted, in the sense that the \TeX\ system
 % configuration file contains a list of ``safe'' system commands that
@@ -165,10 +166,10 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % restricted shell escape is active or not, so the automatic procedure
 % will be tried anyway, unless disabled with the \texttt{noautomatic}
 % package option. With version 0.68 or later, the behavior is the same
-% as with the other engines. Note that, starting from version 1.3b of 
-% this package, the automatic call of MakeIndex is done through 
-% \texttt{os.execute} which might not work with older versions of 
-% Lua\TeX{}. It has been tested with \TeX~Live from the 2012 
+% as with the other engines. Note that, starting from version 1.3b of
+% this package, the automatic call of MakeIndex is done through
+% \texttt{os.execute} which might not work with older versions of
+% Lua\TeX{}. It has been tested with \TeX~Live from the 2012
 % release.\par}
 %
 %
@@ -331,7 +332,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \texttt{plain}. You might want to set it to \texttt{empty} or some
 % other page style defined by the class or by yourselves. This keyword
 % is disabled when the package \pack{fancyhdr} is loaded; any definition
-% or choice of page styles must be done before typesetting the indices. 
+% or choice of page styles must be done before typesetting the indices.
 % \Item[headers] which takes two values: the left and right marks. You
 % might want to use this for disabling automatic uppercasing, by
 % saying, for example, |headers={\indexname}{\indexname}|; notice that
@@ -429,7 +430,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \texttt{-shell-escape} (which is \texttt{--enable-write18} for
 % MiK\TeX) typesetting program  option or the \texttt{noautomatic}
 % option should be specified when loading \pack{imakeidx}.
-% 
+%
 % Let's look at a couple of examples. In both we suppose that the
 % document \texttt{mybook.tex} defines two indices through
 %\begin{verbatim}
@@ -569,7 +570,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % |\indexprologue| to write some text before the index proper gets typeset;
 % an optional space may be used in place of the default one-line spacing
 % between the index title, the prologue and the index body.
-% 
+%
 % This facility relies on a particular feature of the |multicols|
 % environment, that \pack{imakeidx} uses to instruct the typesetting
 % program to typeset the index with a specified number of balanced columns.
@@ -673,14 +674,14 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % an interaction between \pack{memoir} and \pack{showidx} that required
 % special attention. See below about using \pack{showidx}.
 %
-% \subsubsection{Package \pack{showidx}} 
+% \subsubsection{Package \pack{showidx}}
 %
 % Up to version 1.1 this package did not allow to use it together with the \pack{showidx}
 % package; now it is, provided that \pack{showidx} is loaded \emph{before} \pack{imakeidx}.
 % See below more information on using \pack{showidx}.
 %
 % \subsubsection{Package \pack{fancyhdr}}
-% 
+%
 % When using package \pack{fancyhdr} some inconveniences did show up; now we believe
 % we have detected the causes and we implemented the necessary corrections\footnote{Thanks
 % to Maïeul Rouquette, who spotted the problems and also suggested some patches.}.
@@ -710,7 +711,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %\newcommand\nindex[1]{\orig@@index{#1|innote}}
 %\newcommand\innote[1]{#1\textit{n}}
 %...
-%\makeindex[...] 
+%\makeindex[...]
 %...
 %\AtBeginDocument{%
 %    \pretocommand{\@footnotetext}{\let\index\nindex}{}{}
@@ -818,7 +819,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %
 % Therefore if by chance you get double entries into the table of contents,
 % eliminate the \Kvalue{intoc} option from your calls; your class,
-% packages, and settings are already taking care of it. 
+% packages, and settings are already taking care of it.
 
 % The package \pack{tocbibind} should be loaded with the \Kvalue{noindex}
 % option, otherwise it would interfere with our redefinition of
@@ -837,8 +838,8 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %
 % \subsection{Index location customization}
 %
-% Some packages might want to use the facilities of \emph{imakeidx} to offer customized 
-% index commands, where the entry location is not expressed by a page number, 
+% Some packages might want to use the facilities of \emph{imakeidx} to offer customized
+% index commands, where the entry location is not expressed by a page number,
 % but by an other reference value (for example: line number, entry number, etc.).
 %
 % These packages may use the low-level command \cs{imki@wrindexentry} which takes three arguments:
@@ -1048,7 +1049,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %
 % From here on, some commands are duplicated; this depends on the
 % fact that the behavior must be different when using \prog{splitindex} or
-% not. The memory occupied by the useless commands will be cleared at the 
+% not. The memory occupied by the useless commands will be cleared at the
 % end of package.
 %    \begin{macrocode}
 \providecommand*\makeindex{} % to use \renewcommand safely
@@ -1179,7 +1180,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
  \fi}
 %    \end{macrocode}
 %
-% ^^A D - \index 
+% ^^A D - \index
 %
 % Provide a default definition for \cs{index}; when a \cs{makeindex}
 % command is given and \LaTeX\ is writing on auxiliary files,
@@ -1222,7 +1223,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % Therefore we use the same boolean used by \pack{memoir}, testing in advance so as not
 % defining it twice; then we use it to let the \pack{showidx} true or simulated macros do
 % their job, but we also take care of resetting the switch default value to
-% false at begin document time if the \pack{memoir} class is being used. 
+% false at begin document time if the \pack{memoir} class is being used.
 %
 %
 %    \begin{macrocode}
@@ -1263,14 +1264,17 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \prog{luatex} we can't emit the proper messages if \prog{luatex} is
 % not version 0.68 or later. The conditional
 % \cs{ifKV@imki@noautomatic} is defined by \cs{define@boolkey} above.
+% \changes{v1.3e}{2016/10/15}{Don't leave \texttt{\char92 shellescape} defined}
 %
 %    \begin{macrocode}
 \def\imki@shellwarn{}
 \ifdefined\imki@shellescape % luatex
 \else
-  \@ifundefined{shellescape}
-    {\let\imki@shellescape\pdfshellescape} % pdftex
-    {\let\imki@shellescape\shellescape} % xetex
+  \ifdefined\shellescape
+    \let\imki@shellescape\shellescape % xetex
+  \else
+    \let\imki@shellescape\pdfshellescape % pdftex
+  \fi
 \fi
 \ifnum\imki@shellescape=\z@
   \let\KV@imki@noautomaticfalse\KV@imki@noautomatictrue
diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
index 648751b7ebf..4e9190ad722 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/05/16 v1.3d Package for typesetting indices in a synchronous mode]
+   [2016/10/15 v1.3e Package for typesetting indices in a synchronous mode]
 
 
 
@@ -195,9 +195,11 @@
 \def\imki@shellwarn{}
 \ifdefined\imki@shellescape % luatex
 \else
-  \@ifundefined{shellescape}
-    {\let\imki@shellescape\pdfshellescape} % pdftex
-    {\let\imki@shellescape\shellescape} % xetex
+  \ifdefined\shellescape
+    \let\imki@shellescape\shellescape % xetex
+  \else
+    \let\imki@shellescape\pdfshellescape % pdftex
+  \fi
 \fi
 \ifnum\imki@shellescape=\z@
   \let\KV@imki@noautomaticfalse\KV@imki@noautomatictrue