From 385911a89479e9d6a11523371ffd92fd52616494 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Mon, 8 Oct 2012 09:23:01 +0000 Subject: imakeidx update git-svn-id: svn://tug.org/texlive/trunk@27920 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/imakeidx/README | 4 +-- Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf | Bin 504100 -> 504387 bytes .../texmf-dist/source/latex/imakeidx/imakeidx.dtx | 29 ++++++++++++--------- Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty | 27 ++++++++++--------- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Master/texmf-dist/doc/latex/imakeidx/README b/Master/texmf-dist/doc/latex/imakeidx/README index 66ba3df1314..98449796ad0 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.2c -dated 2012/10/02 +This is the README file relative to package imakeidx version 1.2d +dated 2012/10/05 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 c0b5764550b..3fd16297c13 100644 Binary files a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf and b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf differ diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx index f75f557dba0..ecf7dfdc43f 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. %\NeedsTeXFormat{LaTeX2e}[2005/12/01] %\ProvidesPackage{imakeidx}% %<*package> - [2012/10/02 v1.2c Package for typesetting indices in a synchronous mode] + [2012/10/05 v1.2d Package for typesetting indices in a synchronous mode] % %<*driver> \documentclass{ltxdoc} @@ -87,6 +87,8 @@ and the derived files imakeidx.sty and imakeidx.pdf. % \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} +% \changes{v1.2c}{2012/10/02}{Fixed regression} +% \changes{v1.2d}{2012/10/06}{Fixed bugs with index internal names} % % \begin{abstract} % This package exploits the |\write18| facility of modern \TeX\ system @@ -911,6 +913,7 @@ and the derived files imakeidx.sty and imakeidx.pdf. % \begin{macrocode} \def\imki@makeindex#1{% \edef\imki@name{\jobname}% + \edef\imki@jobname{\jobname}% \def\imki@title{\indexname}% \edef\imki@program{\imki@progdefault}% \let\imki@options\space @@ -1003,7 +1006,7 @@ and the derived files imakeidx.sty and imakeidx.pdf. \def\imki@startidxsplit#1{% \if@filesw \def\index{\@bsphack - \@ifnextchar [{\@index}{\@index[\imki@name]}} + \@ifnextchar [{\@index}{\@index[\imki@jobname]}} \expandafter\newwrite\csname #1@idxfile\endcsname \immediate\openout \csname #1@idxfile\endcsname #1.idx\relax \typeout{Writing index file #1.idx}% @@ -1017,11 +1020,11 @@ and the derived files imakeidx.sty and imakeidx.pdf. \if@filesw \ifimki@startedidx\else \newwrite\@indexfile - \immediate\openout\@indexfile\imki@name.idx% + \immediate\openout\@indexfile\imki@jobname.idx% \global\imki@startedidxtrue \fi \def\index{\@bsphack - \@ifnextchar [{\@index}{\@index[\imki@name]}} + \@ifnextchar [{\@index}{\@index[\imki@jobname]}} \expandafter\let\csname #1@idxfile\endcsname\@empty \typeout{Started index file #1}% \fi} @@ -1058,10 +1061,10 @@ and the derived files imakeidx.sty and imakeidx.pdf. % \begin{macrocode} \newif\ifimki@showidx \@ifpackageloaded{showidx}{\imki@showidxtrue}{\imki@showidxfalse} -\edef\imki@jobname{\jobname} -\newcommand\imki@showidxentry[2]{\ifimki@showidx -\@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}% -\fi} +\newcommand\imki@showidxentry[2]{% + \ifimki@showidx + \@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}% + \fi} \def\imki@wrindexsplit#1#2{% \expandafter\protected@write\csname#1@idxfile\endcsname{}% {\string\indexentry{#2}{\thepage}}% @@ -1201,11 +1204,11 @@ and the derived files imakeidx.sty and imakeidx.pdf. % checks and messages. % \begin{macrocode} \providecommand*{\printindex}{} -\renewcommand*{\printindex}[1][\imki@name]{% +\renewcommand*{\printindex}[1][\imki@jobname]{% \@ifundefined{#1@idxfile}{\imki@error{#1}}{\imki@putindex{#1}}} \def\imki@error#1{% - \def\@tempa{#1}\def\@tempb{\imki@name}% + \def\@tempa{#1}\def\@tempb{\imki@jobname}% \ifx\@tempa\@tempb \let\imki@optarg\@empty \else @@ -1327,7 +1330,7 @@ and the derived files imakeidx.sty and imakeidx.pdf. \if@tempswa % we can call the external program \ifimki@splitdone\else \immediate\closeout\@indexfile - \imki@exec{splitindex \imki@splitindexoptions\space\imki@name.idx}% + \imki@exec{splitindex \imki@splitindexoptions\space\imki@jobname.idx}% \global\imki@splitdonetrue \fi \else @@ -1336,7 +1339,7 @@ and the derived files imakeidx.sty and imakeidx.pdf. \fi \fi \if@tempswa % we can call the external program - \imki@exec{\imki@program\imki@options\imki@name-#1.idx}% + \imki@exec{\imki@program\imki@options\imki@jobname-#1.idx}% \fi \ifKV@imki@intoc \def\imki@maybeaddtotoc{\@nameuse{phantomsection}% @@ -1347,7 +1350,7 @@ and the derived files imakeidx.sty and imakeidx.pdf. \ifx\imki@title\imki@check@indexname\else \def\indexname{\imki@title}% \fi - \@input@{\imki@name-#1.ind} + \@input@{\imki@jobname-#1.ind} \let\indexname\imki@indexname % restore \indexname } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty index 5ea32e6666f..7eba70c2b07 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/10/02 v1.2c Package for typesetting indices in a synchronous mode] + [2012/10/05 v1.2d Package for typesetting indices in a synchronous mode] @@ -72,6 +72,7 @@ \renewcommand{\makeindex}[1][]{\imki@makeindex{#1}} \def\imki@makeindex#1{% \edef\imki@name{\jobname}% + \edef\imki@jobname{\jobname}% \def\imki@title{\indexname}% \edef\imki@program{\imki@progdefault}% \let\imki@options\space @@ -137,7 +138,7 @@ \def\imki@startidxsplit#1{% \if@filesw \def\index{\@bsphack - \@ifnextchar [{\@index}{\@index[\imki@name]}} + \@ifnextchar [{\@index}{\@index[\imki@jobname]}} \expandafter\newwrite\csname #1@idxfile\endcsname \immediate\openout \csname #1@idxfile\endcsname #1.idx\relax \typeout{Writing index file #1.idx}% @@ -147,11 +148,11 @@ \if@filesw \ifimki@startedidx\else \newwrite\@indexfile - \immediate\openout\@indexfile\imki@name.idx% + \immediate\openout\@indexfile\imki@jobname.idx% \global\imki@startedidxtrue \fi \def\index{\@bsphack - \@ifnextchar [{\@index}{\@index[\imki@name]}} + \@ifnextchar [{\@index}{\@index[\imki@jobname]}} \expandafter\let\csname #1@idxfile\endcsname\@empty \typeout{Started index file #1}% \fi} @@ -169,10 +170,10 @@ \def\imki@nowrindex#1{\endgroup\@esphack} \newif\ifimki@showidx \@ifpackageloaded{showidx}{\imki@showidxtrue}{\imki@showidxfalse} -\edef\imki@jobname{\jobname} -\newcommand\imki@showidxentry[2]{\ifimki@showidx -\@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}% -\fi} +\newcommand\imki@showidxentry[2]{% + \ifimki@showidx + \@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}% + \fi} \def\imki@wrindexsplit#1#2{% \expandafter\protected@write\csname#1@idxfile\endcsname{}% {\string\indexentry{#2}{\thepage}}% @@ -258,11 +259,11 @@ \newcommand{\indexprologue}[2][\bigskip]{% \long\gdef\imki@idxprologue{{#2\par}#1}} \providecommand*{\printindex}{} -\renewcommand*{\printindex}[1][\imki@name]{% +\renewcommand*{\printindex}[1][\imki@jobname]{% \@ifundefined{#1@idxfile}{\imki@error{#1}}{\imki@putindex{#1}}} \def\imki@error#1{% - \def\@tempa{#1}\def\@tempb{\imki@name}% + \def\@tempa{#1}\def\@tempb{\imki@jobname}% \ifx\@tempa\@tempb \let\imki@optarg\@empty \else @@ -345,7 +346,7 @@ \if@tempswa % we can call the external program \ifimki@splitdone\else \immediate\closeout\@indexfile - \imki@exec{splitindex \imki@splitindexoptions\space\imki@name.idx}% + \imki@exec{splitindex \imki@splitindexoptions\space\imki@jobname.idx}% \global\imki@splitdonetrue \fi \else @@ -354,7 +355,7 @@ \fi \fi \if@tempswa % we can call the external program - \imki@exec{\imki@program\imki@options\imki@name-#1.idx}% + \imki@exec{\imki@program\imki@options\imki@jobname-#1.idx}% \fi \ifKV@imki@intoc \def\imki@maybeaddtotoc{\@nameuse{phantomsection}% @@ -365,7 +366,7 @@ \ifx\imki@title\imki@check@indexname\else \def\indexname{\imki@title}% \fi - \@input@{\imki@name-#1.ind} + \@input@{\imki@jobname-#1.ind} \let\indexname\imki@indexname % restore \indexname } \ifimki@splitindex -- cgit v1.2.3