summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/imakeidx
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-06 17:09:54 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-06 17:09:54 +0000
commit1d80b24b10b0f2598cc5dbab7057e9e61626ce05 (patch)
treeb0ce1ce1cfd11d0d40657de408bee0e0c6d53c3c /Master/texmf-dist/source/latex/imakeidx
parentd0c4e8ba040085b627fe0990e8409150e5de98f0 (diff)
imakeidx update
git-svn-id: svn://tug.org/texlive/trunk@27906 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/imakeidx')
-rw-r--r--Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx32
1 files changed, 19 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
index ce0dee8f868..f75f557dba0 100644
--- a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
+++ b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
@@ -1,5 +1,4 @@
% \iffalse
-% !TEX encoding = UTF-8 Unicode
%<*internal>
\begingroup
\input docstrip.tex
@@ -44,7 +43,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{imakeidx}%
%<*package>
- [2012/09/22 v1.2b Package for typesetting indices in a synchronous mode]
+ [2012/10/02 v1.2c Package for typesetting indices in a synchronous mode]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -78,15 +77,16 @@ and the derived files imakeidx.sty and imakeidx.pdf.
\end{document}
%</driver>
% \fi
-% \CheckSum{783}
+% \CheckSum{782}
%
% \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.2}{2012/0831}{made package compatible with showidx}
-% \changes{v1.2}{2012/0831}{made package compatible with fancyhdr}
-% \changes{v1.2}{2012/0831}{added index processing engine option truexindy}
+% \changes{v1.1a}{2012/09/07}{Fixed bug with possibly defined \cs{directlua}}
+% \changes{v1.2}{2012/08/31}{made package compatible with showidx}
+% \changes{v1.2}{2012/08/31}{made package compatible with fancyhdr}
+% \changes{v1.2}{2012/08/31}{added index processing engine option truexindy}
%
% \begin{abstract}
% This package exploits the |\write18| facility of modern \TeX\ system
@@ -225,7 +225,6 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% during the \LaTeX{} run with or without the option.
%
% \section{Specific package commands}
-% \addtocontents{toc}{\protect\columnbreak\protect\vspace*{.4ex}}
% As it is customary when just one index is produced, the standard
% \LaTeX\ facilities, i.e.\ the commands \cs{makeindex}, \cs{index},
% and \cs{printindex} must be used. This package redefines them so as
@@ -808,6 +807,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% 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}.
+% \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}}
@@ -832,8 +834,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
@@ -1124,10 +1127,13 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% easier to understand it's operation.
% \begin{macrocode}
\newif\ifimki@fancyhdr
-\AtBeginDocument{\@ifpackageloaded{fancyhdr}{\imki@fancyhdrtrue}{\imki@fancyhdrfalse}%
-\ifimki@fancyhdr
- \patchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
- \patchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}\fi}
+\AtBeginDocument{%
+ \@ifpackageloaded{fancyhdr}{\imki@fancyhdrtrue}{\imki@fancyhdrfalse}%
+ \ifimki@fancyhdr
+ \patchcmd{\theindex}{\imki@indexheaders}{\relax}{}{}%
+ \patchcmd{\theindex}{\thispagestyle}{\@gobble}{}{}%
+ \fi
+}
%
\ifimki@original
\expandafter\def\expandafter\theindex\expandafter{\expandafter