imakeidx (3apr16)

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

1 files changed, 26 insertions, 13 deletions

diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
index b5ac1a89501..96b076e286e 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>
-   [2013/07/11 v1.3a Package for typesetting indices in a synchronous mode]
+   [2016/04/03 v1.3b 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{797}
+% \CheckSum{803}
 %
 % \changes{v1.0}{2010/07/10}{First public version}
 % \changes{v1.0a}{2010/07/12}{Small bug correction}
@@ -90,8 +90,11 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \changes{v1.2c}{2012/10/02}{Fixed regression}
 % \changes{v1.2d}{2012/10/06}{Fixed bugs with index internal names}
 % \changes{v1.2e}{2012/10/22}{Fixed bug with showidx simulated by memoir}
-% \changes{v1.3}{2013/07/11 }{Added internal so as to cooperate in a better
+% \changes{v1.3}{2013/07/11}{Added internal so as to cooperate in a better
 % way with eledmac (by Maieul Roquette}
+% \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}}
 %
 % \begin{abstract}
 % This package exploits the |\write18| facility of modern \TeX\ system
@@ -105,6 +108,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 % \end{abstract}
 %
 % \section{Introduction}
+% This package wouldn't exist without the essential contribution of
+% Claudio Beccari, who withdrawn from authorship some years ago.
+%
 % It's been some years now that the typesetting engine of the \TeX\
 % system is just \prog{pdftex}; the original Knuthian \prog{tex} is
 % still corrected by D.\,E.~Knuth himself, but is frozen, according to
@@ -157,7 +163,11 @@ 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.\par}
+% 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}
 %
 %
 %\section{Package usage}
@@ -981,16 +991,14 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 \RequirePackage{ifxetex,ifluatex}
 \ifxetex\def\imki@engine{xelatex}\fi
 \ifluatex % luatex doesn't have \(pdf)shellescape
- \def\imki@engine{lualatex}
+  \def\imki@engine{lualatex}
   \ifnum\luatexversion<68
     \chardef\imki@shellescape\@ne % no way to know the value
   \else
-    \RequirePackage{pdftexcmds} % provides \pdf@shellescape
-    \chardef\imki@shellescape\pdf@shellescape
+    \chardef\imki@shellescape\directlua{tex.write(os.execute())}
+    \def\imki@exec#1{\directlua{os.execute("\luaescapestring{#1}")}}
   \fi
-  \let\imki@exec\pdf@system
 \fi
-\RequirePackage{xpatch}
 \edef\imki@splitindexoptions{-m \string"\string"}
 \def\splitindexoptions#1{\g@addto@macro\imki@splitindexoptions{ #1}}
 \@onlypreamble\splitindexoptions
@@ -1299,10 +1307,11 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 %    \begin{macrocode}
 \newif\ifimki@fancyhdr
 \AtBeginDocument{%
+  \@ifundefined{xpatchcmd}{\RequirePackage{xpatch}}{}%
   \@ifpackageloaded{fancyhdr}{\imki@fancyhdrtrue}{\imki@fancyhdrfalse}%
   \ifimki@fancyhdr
-    \patchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
-    \patchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}%
+    \xpatchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
+    \xpatchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}%
   \fi
 }
 %     
@@ -1466,8 +1475,10 @@ and the derived files imakeidx.sty and imakeidx.pdf.
 \def\imki@putindexsplit#1{%
   \ifimki@nonewpage\else
     \imki@clearpage
+    \ifimki@disableautomatic\else
+      \immediate\closeout\csname #1@idxfile\endcsname
+    \fi
   \fi
-  \immediate\closeout\csname #1@idxfile\endcsname
   \let\imki@indexname\indexname % keep \indexname
   \@nameuse{imki@set@#1}\imki@decide
   \if@tempswa % we can call the external program
@@ -1497,7 +1508,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
   \@nameuse{imki@set@#1}\imki@decide
   \if@tempswa % we can call the external program
     \ifimki@splitdone\else
-      \immediate\closeout\@indexfile
+      \ifimki@disableautomatic\else
+        \immediate\closeout\@indexfile
+      \fi
       \imki@exec{splitindex \imki@splitindexoptions\space\imki@jobname.idx}%
       \global\imki@splitdonetrue
     \fi