summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty31
1 files changed, 18 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
index 28cfc0538ef..686d541318f 100644
--- a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
+++ b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
@@ -5,16 +5,16 @@
%% The original source files were:
%%
%% imakeidx.dtx (with options: `package')
-%% ______________________________________________________
+%% ___________________________________________________________
%% The imakeidx package for LaTeX
-%% Copyright (C) 2010 Claudio Beccari and Enrico Gregorio
+%% Copyright (C) 2010-2012 Claudio Beccari and Enrico Gregorio
%% All rights reserved
%%
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{imakeidx}%
- [2010/07/12 v.1.0a Package for typesetting indices in a synchronous mode]
+ [2012/05/09 v1.1 Package for typesetting indices in a synchronous mode]
\RequirePackage{xkeyval}
\DeclareOption{xindy}{\def\imki@progdefault{texindy}}
\DeclareOption{texindy}{\def\imki@progdefault{texindy}}
@@ -40,14 +40,18 @@
\def\imki@engine{(pdf)latex}
\ifdefined\XeTeXversion\def\imki@engine{xelatex}\fi
\ifdefined\directlua % luatex doesn't have \(pdf)shellescape
- \def\imki@engine{lualatex}\chardef\imki@shellescape\@cclv
+ \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
+ \fi
+ \let\imki@exec\pdf@system
\fi
\edef\imki@splitindexoptions{-m \string"\string"}
\def\splitindexoptions#1{\g@addto@macro\imki@splitindexoptions{ #1}}
\@onlypreamble\splitindexoptions
-\@ifclassloaded{memoir}{%
- \PackageError{imakeidx}{Incompatible package won't be loaded}
- {This package is incompatible with memoir, sorry}\endinput}{}
\@namedef{ver@makeidx.sty}{3000/12/31}
\@ifpackageloaded{multind}
{\PackageError{imakeidx}{Incompatible package `multind' loaded}
@@ -166,12 +170,11 @@
\endgroup
\@esphack}
\def\imki@shellwarn{}
-\ifdefined\imki@shellescape % luatex >= 0.60
- \chardef\imki@shellescape=\@ne
+\ifdefined\imki@shellescape % luatex
\else
\@ifundefined{shellescape}
- {\let\imki@shellescape\pdfshellescape}
- {\let\imki@shellescape\shellescape}
+ {\let\imki@shellescape\pdfshellescape} % pdftex
+ {\let\imki@shellescape\shellescape} % xetex
\fi
\ifnum\imki@shellescape=\z@
\let\KV@imki@noautomaticfalse\KV@imki@noautomatictrue
@@ -358,9 +361,11 @@
\let\imki@wrindexunique\@undefined
\let\imki@putindexunique\@undefined
\fi
+\@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex}{}
+
%%
-%% Copyright 2010 Claudio Beccari <claudio dot beccari at gmail dot it>
-%% Copyright 2010 Enrico Gregorio <Enrico dot Gregorio at univr dot it>
+%% Copyright 2010--2012 Claudio Beccari <claudio dot beccari at gmail dot it>
+%% Copyright 2010--2012 Enrico Gregorio <Enrico dot Gregorio at univr dot it>
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of