summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/idxlayout
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-03 00:04:38 +0000
committerKarl Berry <karl@freefriends.org>2010-03-03 00:04:38 +0000
commit727529239a8ebcc7fb0f03433d941cd5ffb1ae54 (patch)
tree6e16be6f25a5ef9b5cc47f8ad2af56fa121951c0 /Master/texmf-dist/tex/latex/idxlayout
parente733cbfe3512600688e296c70149a128c63c6399 (diff)
idxlayout update (2mar10)
git-svn-id: svn://tug.org/texlive/trunk@17293 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/idxlayout')
-rw-r--r--Master/texmf-dist/tex/latex/idxlayout/idxlayout.sty47
1 files changed, 40 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/idxlayout/idxlayout.sty b/Master/texmf-dist/tex/latex/idxlayout/idxlayout.sty
index db68e56fe02..f84eca3d018 100644
--- a/Master/texmf-dist/tex/latex/idxlayout/idxlayout.sty
+++ b/Master/texmf-dist/tex/latex/idxlayout/idxlayout.sty
@@ -17,7 +17,7 @@
%% README and the derived files idxlayout.pdf and idxlayout.sty.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{idxlayout}[2010/01/24 v0.4a Configurable index layout]
+\ProvidesPackage{idxlayout}[2010/03/01 v0.4b Configurable index layout]
\RequirePackage{etoolbox,kvoptions,multicol}
\SetupKeyvalOptions{family=ila,prefix=ila@}
\newcommand*{\ila@defradiokey}[3][]{%
@@ -91,6 +91,7 @@
\DeclareStringOption[\ila@initsep]{notesep}
\DeclareStringOption[80\p@]{minspace}
\renewcommand{\indexspace}{\par\vspace{\ila@initsep}}
+\DeclareBoolOption{columnnote}
\newcommand*{\indexfont}{}
\def\ila@fo@current{\renewcommand*{\indexfont}{}}
\def\ila@fo@normalsize{\renewcommand*{\indexfont}{\normalsize}}
@@ -169,7 +170,6 @@
\idx@@heading{\indexname}%
\@mkboth{\indexname}{\indexname}%
\ifundef{\chapter}{%
- \index@preamble
}{%
\thispagestyle{\indexpagestyle}%
}%
@@ -192,6 +192,21 @@
\preindexhook
}
\fi
+\@ifpackageloaded{index}{%
+ \@ifpackagelater{index}{2004/01/21}{%
+ \let\ila@packindadjust\relax
+ }{%
+ \def\ila@packindadjust{%
+ \edef\indexname{\the\@nameuse{idxtitle@\@indextype}}%
+ \ifdefempty{\index@prologue}{%
+ }{%
+ \setindexprenote{\index@prologue}%
+ }%
+ }%
+ }%
+}{%
+ \let\ila@packindadjust\relax
+}
\ProcessKeyvalOptions*
\newcommand*{\idxlayout}[1]{\setkeys{ila}{#1}}
\renewenvironment{theindex}{%
@@ -204,19 +219,37 @@
\setlength{\multicolsep}{\z@}%
\setlength{\columnsep}{\indexcolsep}%
\setlength{\columnseprule}{\indexrule}%
+ \ila@packindadjust
+ \def\ila@prologueplus{%
+ \ila@prologue
+ \indexfont
+ \ifbool{ila@columnnote}{%
+ }{%
+ \ila@prenote
+ }%
+ }%
\ifnumcomp{\theidxcols}{<}{\tw@}{%
- \ila@prologue\indexfont\ila@prenote
+ \ila@prologueplus
}{%
\ifbool{ila@unbalanced}{%
- \begin{multicols*}{\theidxcols}%
- [\ila@prologue\indexfont\ila@prenote][\ila@minspace]%
+ \begin{multicols*}{\theidxcols}[\ila@prologueplus][\ila@minspace]%
}{%
- \begin{multicols}{\theidxcols}%
- [\ila@prologue\indexfont\ila@prenote][\ila@minspace]%
+ \begin{multicols}{\theidxcols}[\ila@prologueplus][\ila@minspace]%
}%
}%
\setlength{\parskip}{\z@ \@plus 0.3\p@}%
\indexjustific
+ \ifundef{\chapter}{%
+ \ifundef{\index@preamble}{%
+ }{%
+ \index@preamble\par\nobreak
+ }%
+ }{%
+ }%
+ \ifbool{ila@columnnote}{%
+ \ila@prenote
+ }{%
+ }%
\let\item\@idxitem
}{%
\ifnumcomp{\theidxcols}{<}{\tw@}{%