splitindex update (8mar06)

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

12 files changed, 187 insertions, 41 deletions

diff --git a/Master/texmf-dist/source/latex/splitindex/install.sh b/Master/texmf-dist/doc/latex/splitindex/install.sh
index 5d75fb85f7e..5d75fb85f7e 100644
--- a/Master/texmf-dist/source/latex/splitindex/install.sh
+++ b/Master/texmf-dist/doc/latex/splitindex/install.sh
diff --git a/Master/texmf-dist/doc/latex/splitindex/splitidx.pdf b/Master/texmf-dist/doc/latex/splitindex/splitidx.pdf
new file mode 100644
index 00000000000..c52c5d30486
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/splitindex/splitidx.pdf
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex-Linux-i386 b/Master/texmf-dist/doc/latex/splitindex/splitindex-Linux-i386
index 42566f25083..42566f25083 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex-Linux-i386
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex-Linux-i386
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex-OpenBSD-i386 b/Master/texmf-dist/doc/latex/splitindex/splitindex-OpenBSD-i386
index 17e865dd061..17e865dd061 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex-OpenBSD-i386
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex-OpenBSD-i386
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex.class b/Master/texmf-dist/doc/latex/splitindex/splitindex.class
index 288ad25d588..288ad25d588 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex.class
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex.class
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex.exe b/Master/texmf-dist/doc/latex/splitindex/splitindex.exe
index 08aa74d1291..08aa74d1291 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex.exe
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex.exe
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex.java b/Master/texmf-dist/doc/latex/splitindex/splitindex.java
index 9b52f9f7fdf..9b52f9f7fdf 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex.java
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex.java
diff --git a/Master/texmf-dist/source/latex/splitindex/splitindex.pl b/Master/texmf-dist/doc/latex/splitindex/splitindex.pl
index 378fb25e68c..378fb25e68c 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitindex.pl
+++ b/Master/texmf-dist/doc/latex/splitindex/splitindex.pl
diff --git a/Master/texmf-dist/source/latex/splitindex/splitidx.dtx b/Master/texmf-dist/source/latex/splitindex/splitidx.dtx
index 68f775c2c26..dc1dd2be757 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitidx.dtx
+++ b/Master/texmf-dist/source/latex/splitindex/splitidx.dtx
@@ -1,21 +1,24 @@
-% \CheckSum{487}
+% \CheckSum{551}
 % \iffalse
 % ======================================================================
 % splitindex.dtx
-% Copyright (c) Markus Kohm, 2002
+% Copyright (c) Markus Kohm, 2002-2006
 %
-% $Id: splitidx.dtx,v 1.14 2003/01/05 10:50:42 mjk Exp $
+% $Id: splitidx.dtx,v 1.2 2006/03/07 10:41:51 mjk Exp $
 %
 % This file is part of the `SplitIndex bundle'.
 % ---------------------------------------------
 %
 % This file can be redistributed and/or modified under the conditions
-% of the LaTeX Project Public License, either version 1.2 of this
+% of the LaTeX Project Public License, either version 1.3a of this
 % license or (at your option) any later version.
 % The latest version of this license is in
 %       http://www.latex-project.org/lppl.txt
-% and version 1.2 or later is part of all distributions of LaTeX
-% version 1999/12/01 or later.
+% and version 1.3a or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has status 'maintained'.
+% Maintainer is Markus Kohm <komascript@gmx.info>.
 %
 % You are not allowed to redistribute this file without all the
 % other files of the `SplitIndex bundle'. The list of all files
@@ -31,7 +34,7 @@
 %<driver>\ProvidesFile{splitidx.drv}[%
 %<package>\ProvidesPackage{splitidx}[%
 % \fi
- 2003/01/05 v0.2a multiple indices for LaTeX]
+ 2006/03/07 v0.9 multiple indices for LaTeX]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -236,6 +239,20 @@
 % \cs{sindex}\oarg{shortcut}\marg{indexentry} will result in
 % \cs{index}\marg{indexentry}.
 %
+% If you like, you may also declare that \cs{index} should be the same
+% like command \cs{sindex}. In this case, you may use package
+% option \texttt{useindex}, e.g.:
+% \begin{verbatim}
+%   \usepackage[useindex]{splitidx}
+% \end{verbatim}\vspace{-\baselineskip}
+% This may be usefull using packages like \textsf{jurabib} that expects
+% \cs{index} to be the index command.
+%
+% \emph{Note: Currently only one of the options \texttt{allatone} and
+%   \texttt{useindex} can be used at same time. If you are using both
+%   \texttt{useindex} will be disabled! This may result in many error
+%   messages!}
+%
 %
 % \subsection{Printing an index}
 %
@@ -272,6 +289,52 @@
 % command. And if you are using this option, the characters of the shortcuts
 % must be letters.
 %
+% \DescribeMacro{\newprotectedindex}
+% Using standard index package \textsf{makeidx} the \LaTeX{} kernel command
+% \cs{index} may expand the argument of \cs{index}. The kernel uses
+% \cs{@santize} to avoid this in some cases. But this fails, if the argument
+% was already read e.g. by another macro. So if you define a macro, that reads
+% an argument, does something with the argument and write it to the index this
+% may expand the argument. Try following:
+% \begin{verbatim}
+%  \documentclass{article}
+%  \usepackage{ngerman}
+%  \usepackage{makeidx}\makeindex
+%  \newcommand*{\Test}[1]{#1\index{#1}}
+%  \begin{document}
+%  \Test{"Anderung}
+%  "Anderung\index{"Anderung}
+%  \end{document}
+% \end{verbatim}\vspace{-\baselineskip}
+% This will result in two entries at the \texttt{.idx} file:
+% \begin{verbatim}
+%   \indexentry{\active@dq  \dq@prtct{A}nderung}{1}
+%   \indexentry{"Anderung}{1}
+% \end{verbatim}\vspace{-\baselineskip}
+% The first one is something expanded that is not wanted. Package
+% \textsf{splitindx} behaves same by default. But if you are using
+% \cs{newprotectedindex} to define a new index, it uses a trick so avoid
+% expansion. If all indices should behave like this, you may simply use
+% package option \texttt{protected}.
+% \begin{verbatim}
+%  \documentclass{article}
+%  \usepackage{ngerman}
+%  \usepackage[protected,useindex,makeindex]{makeidx}
+%  \newcommand*{\Test}[1]{#1\index{#1}}
+%  \begin{document}
+%  \Test{"Anderung}
+%  "Anderung\index{"Anderung}
+%  \end{document}
+% \end{verbatim}\vspace{-\baselineskip}
+% Will result in two entries at the \texttt{.idx} file:
+% \begin{verbatim}
+%   \indexentry{"Anderung}{1}
+%   \indexentry{"Anderung}{1}
+% \end{verbatim}\vspace{-\baselineskip}
+% If you want to know more about the trick, see command
+% \cs{@onelevel@sanitize} at the \LaTeX{} kernel documentation,
+% \texttt{source2e}.
+%
 %
 % \DescribeMacro{\printindex}
 % \changes{v0.2a}{2003/01/05}{fix of documentation bug}
@@ -932,10 +995,25 @@
 \DeclareOption{makeindex}{\AtEndOfPackage{\makeindex}}
 %    \end{macrocode}
 %
+% \changes{v0.9}{2006/05/07}{new option \texttt{useindex}}
+% With option \texttt{useindex} the original command \cs{index} behaves like
+% \cs{sindex}.
+%    \begin{macrocode}
+\DeclareOption{useindex}{%
+  \def\@se@nd@xc@d@{\let\index\sindex}%
+  \AtEndOfPackage{\@se@nd@xc@d@}%
+}
+\let\@se@nd@xc@d@\relax
+%    \end{macrocode}
+%
 % There is also an option to make \cs{sindex} ignores it optional argument and
 % behaves like \cs{index}.
 %    \begin{macrocode}
 \DeclareOption{allatone}{%
+  \ifx\@se@nd@xc@d@\relax\else
+    \PackageInfo{splitidx}{option `allatone' overwrites option `useindex'}%
+    \let\@se@nd@xc@d@\relax
+  \fi
   \AtEndOfPackage{%
     \renewcommand*{\sindex}[1][]{\index}%
     \g@addto@macro\makeindex{\renewcommand*{\sindex}[1][]{\index}}%
@@ -943,6 +1021,13 @@
 }
 %    \end{macrocode}
 %
+% \changes{v0.9}{2006/05/07}{new option \texttt{protected}}
+% Do not expand index arguments.
+%    \begin{macrocode}
+\newif\if@verbindex\@verbindexfalse
+\DeclareOption{protected}{\@verbindextrue}
+%    \end{macrocode}
+%
 % \changes{v0.2}{2002/11/15}{new option \texttt{idxcommands}}
 % With option \texttt{idxcommands} every \cs{newindex} also defines a new index
 % command.
@@ -987,6 +1072,7 @@
 %
 % \begin{macro}{\sindex}
 % \begin{macro}{\@wrsindex}
+%   \changes{v0.9}{2006/03/07}{optionally do not expand the index argument}
 % \begin{macro}{\@@wrsindex}
 % This works similar to original \cs{index} but uses a splitted index. So it
 % allows an optional argument.
@@ -1000,6 +1086,7 @@
     \@wrsindex
   }%
   \typeout{Using splitted index at \jobname.idx}%
+  \@se@nd@xc@d@
 }
 %    \end{macrocode}
 % At the following \cs{@@wrsindex} is used as a hook. If it is defines, it is
@@ -1012,13 +1099,17 @@
     \if@splitidx
       \@wrsindex[idx]{#2}%
     \else
-      \@wrindex{#2}%
+      \def\@tempa{#2}%
+      \if@verbindex\@onelevel@sanitize\@tempa\fi
+      \@wrindex{\@tempa}%
     \fi
   \else
+    \def\@tempa{#2}%
+    \csname index@#1@hook\endcsname
     \expandafter\ifx\csname @@wrsindex\endcsname\relax
-      \@@@wrsindex{#1}{{#2}{\thepage}}%
+      \@@@wrsindex{#1}{{\@tempa}{\thepage}}%
     \else
-      \@@wrsindex{#1}#2||\\%
+      \@@wrsindex{#1}\@tempa||\\%
     \fi
     \endgroup
     \@esphack
@@ -1208,6 +1299,13 @@
 %    \begin{macrocode}
 \newcommand*{\newindex}[2][\relax]{%
   \@ifundefined{index@#2@name}{%
+    \if@verbindex
+      \expandafter\gdef\csname index@#2@hook\endcsname{%
+        \@onelevel@sanitize\@tempa
+      }%
+    \else
+      \expandafter\gdef\csname index@#2@hook\endcsname{}%
+    \fi
     \ifx\@indices\@empty
       \xdef\@indices{#2}%
     \else
@@ -1219,14 +1317,15 @@
       \expandafter\xdef\csname index@#2@name\endcsname{#1}%
     \fi
     \if@newidxcmd
-      \expandafter\newcommand\expandafter*\csname #2\endcsname{%
+      \expandafter\newcommand\expandafter*\csname #2\endcsname{}%
+      \expandafter\gdef\csname #2\endcsname{%
         \sindex[#2]%
       }%
     \fi
     \if@splitidx
       \def\@tempa{#2}\def\@tempb{idx}%
       \ifx\@tempa\@tempb
-        \let\@indexfile@idx=\@indexfile
+        \global\let\@indexfile@idx=\@indexfile
       \else
         \expandafter\newwrite\csname @indexfile@#2\endcsname
         \expandafter\immediate\expandafter\openout
@@ -1246,13 +1345,23 @@
       The new definition will be ignored.%
     }%
   }%
-}   
+}
 \if@splitidx
   \@onlypreamble\newindex
 \fi
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\newprotectedindex}
+%   \changes{v0.9}{2006/07/03}{new command}
+% Same like \cs{newindex} but always define an index with protected arguments.
+%    \begin{macrocode}
+\newcommand*{\newprotectedindex}[2][\relax]{%
+  \begingroup\@verbindextrue\newindex[{#1}]{#2}\endgroup
+}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@indices}
 % This macro stores a list of the index shortcuts. This is needed by
 % e.g. \cs{printindices} and build by \cs{newindex}.
@@ -1388,6 +1497,6 @@
 %
 % end of file `splitindex.dtx'
 %%% Local Variables:
-%%% mode: latex
+%%% mode: doctex
 %%% TeX-master: t
 %%% End:
diff --git a/Master/texmf-dist/source/latex/splitindex/splitidx.ins b/Master/texmf-dist/source/latex/splitindex/splitidx.ins
index 529b3777771..a46c36533e2 100644
--- a/Master/texmf-dist/source/latex/splitindex/splitidx.ins
+++ b/Master/texmf-dist/source/latex/splitindex/splitidx.ins
@@ -2,18 +2,21 @@
 %% splitindex.ins
 %% Copyright (c) Markus Kohm, 2002
 %%
-%% $Id: splitidx.ins,v 1.1 2002/11/08 10:37:38 mjk Exp $
+%% $Id: splitidx.ins,v 1.2 2006/03/07 10:41:51 mjk Exp $
 %%
 %% This file is part of the `SplitIndex bundle'.
 %% ---------------------------------------------
 %%
 %% This file can be redistributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.2 of this
+%% of the LaTeX Project Public License, either version 1.3a of this
 %% license or (at your option) any later version.
 %% The latest version of this license is in
 %%       http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
+%% and version 1.3a or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has status 'maintained'.
+%% Maintainer is Markus Kohm <komascript@gmx.info>.
 %%
 %% In particular, NO PERMISSION is granted to modify the contents of this
 %% file since it contains the legal notices that are placed in the files
@@ -44,12 +47,15 @@ This file was generated from file(s) of the `SplitIndex bundle'.
 ----------------------------------------------------------------
 
 It may be distributed and/or modified under the conditions of 
-the LaTeX Project Public License, either version 1.2 of this
+the LaTeX Project Public License, either version 1.3a of this
 license or (at your option) any later version.
 The latest version of this license is in
    http://www.latex-project.org/lppl.txt
-and version 1.2 or later is part of all distributions of LaTeX
-version 1999/12/01 or later.
+and version 1.3a or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has status 'maintained'.
+Maintainer is Markus Kohm <komascript@gmx.info>.
 
 This file may only be distributed together with a copy of the
 `SplitIndex bundle'. You may however distribute the `SpitIndex
diff --git a/Master/texmf-dist/tex/latex/splitindex/splitidx.sty b/Master/texmf-dist/tex/latex/splitindex/splitidx.sty
index 4ea875ca961..8e12153f9e1 100644
--- a/Master/texmf-dist/tex/latex/splitindex/splitidx.sty
+++ b/Master/texmf-dist/tex/latex/splitindex/splitidx.sty
@@ -14,12 +14,15 @@
 %% ----------------------------------------------------------------
 %% 
 %% It may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 of this
+%% the LaTeX Project Public License, either version 1.3a of this
 %% license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
+%% and version 1.3a or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%% 
+%% This work has status 'maintained'.
+%% Maintainer is Markus Kohm <komascript@gmx.info>.
 %% 
 %% This file may only be distributed together with a copy of the
 %% `SplitIndex bundle'. You may however distribute the `SpitIndex
@@ -29,14 +32,25 @@
 %% given in the file `manifest.txt'.
 %% 
 \ProvidesPackage{splitidx}[%
- 2003/01/05 v0.2a multiple indices for LaTeX]
+ 2006/03/07 v0.9 multiple indices for LaTeX]
 \DeclareOption{makeindex}{\AtEndOfPackage{\makeindex}}
+\DeclareOption{useindex}{%
+  \def\@se@nd@xc@d@{\let\index\sindex}%
+  \AtEndOfPackage{\@se@nd@xc@d@}%
+}
+\let\@se@nd@xc@d@\relax
 \DeclareOption{allatone}{%
+  \ifx\@se@nd@xc@d@\relax\else
+    \PackageInfo{splitidx}{option `allatone' overwrites option `useindex'}%
+    \let\@se@nd@xc@d@\relax
+  \fi
   \AtEndOfPackage{%
     \renewcommand*{\sindex}[1][]{\index}%
     \g@addto@macro\makeindex{\renewcommand*{\sindex}[1][]{\index}}%
   }%
 }
+\newif\if@verbindex\@verbindexfalse
+\DeclareOption{protected}{\@verbindextrue}
 \newif\if@newidxcmd\@newidxcmdfalse
 \DeclareOption{idxcommands}{\@newidxcmdtrue}
 \newif\if@splitidx\@splitidxfalse
@@ -55,19 +69,24 @@
     \@wrsindex
   }%
   \typeout{Using splitted index at \jobname.idx}%
+  \@se@nd@xc@d@
 }
 \newcommand*{\@wrsindex}[2][]{%
   \ifx\relax#1\relax
     \if@splitidx
       \@wrsindex[idx]{#2}%
     \else
-      \@wrindex{#2}%
+      \def\@tempa{#2}%
+      \if@verbindex\@onelevel@sanitize\@tempa\fi
+      \@wrindex{\@tempa}%
     \fi
   \else
+    \def\@tempa{#2}%
+    \csname index@#1@hook\endcsname
     \expandafter\ifx\csname @@wrsindex\endcsname\relax
-      \@@@wrsindex{#1}{{#2}{\thepage}}%
+      \@@@wrsindex{#1}{{\@tempa}{\thepage}}%
     \else
-      \@@wrsindex{#1}#2||\\%
+      \@@wrsindex{#1}\@tempa||\\%
     \fi
     \endgroup
     \@esphack
@@ -180,6 +199,13 @@
 }
 \newcommand*{\newindex}[2][\relax]{%
   \@ifundefined{index@#2@name}{%
+    \if@verbindex
+      \expandafter\gdef\csname index@#2@hook\endcsname{%
+        \@onelevel@sanitize\@tempa
+      }%
+    \else
+      \expandafter\gdef\csname index@#2@hook\endcsname{}%
+    \fi
     \ifx\@indices\@empty
       \xdef\@indices{#2}%
     \else
@@ -191,14 +217,15 @@
       \expandafter\xdef\csname index@#2@name\endcsname{#1}%
     \fi
     \if@newidxcmd
-      \expandafter\newcommand\expandafter*\csname #2\endcsname{%
+      \expandafter\newcommand\expandafter*\csname #2\endcsname{}%
+      \expandafter\gdef\csname #2\endcsname{%
         \sindex[#2]%
       }%
     \fi
     \if@splitidx
       \def\@tempa{#2}\def\@tempb{idx}%
       \ifx\@tempa\@tempb
-        \let\@indexfile@idx=\@indexfile
+        \global\let\@indexfile@idx=\@indexfile
       \else
         \expandafter\newwrite\csname @indexfile@#2\endcsname
         \expandafter\immediate\expandafter\openout
@@ -219,6 +246,9 @@
 \if@splitidx
   \@onlypreamble\newindex
 \fi
+\newcommand*{\newprotectedindex}[2][\relax]{%
+  \begingroup\@verbindextrue\newindex[{#1}]{#2}\endgroup
+}
 \newcommand*{\@indices}{}
 \gdef\@indices{}
 \newcommand{\extendtheindex}[4]{%
diff --git a/Master/texmf-dist/tpm/splitindex.tpm b/Master/texmf-dist/tpm/splitindex.tpm
index 133b7f87118..4f46a58c0ff 100644
--- a/Master/texmf-dist/tpm/splitindex.tpm
+++ b/Master/texmf-dist/tpm/splitindex.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/splitindex.zip">
     <TPM:Name>splitindex</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:03:17</TPM:Date>
+    <TPM:Date>2006/03/07 10:56:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Unlimited number of indexes.</TPM:Title>
@@ -22,28 +22,29 @@ favorite index processor for each of the files.
     <TPM:Author>Markus Kohm</TPM:Author>
     <TPM:Size>170879</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="10489">
+    <TPM:RunFiles size="11445">
 texmf-dist/tex/latex/splitindex/splitidx.sty
 texmf-dist/tpm/splitindex.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="13484">
+    <TPM:DocFiles size="325887">
 texmf-dist/doc/latex/splitindex/README
+texmf-dist/doc/latex/splitindex/install.sh
 texmf-dist/doc/latex/splitindex/install.txt
 texmf-dist/doc/latex/splitindex/manifest.txt
+texmf-dist/doc/latex/splitindex/splitidx.pdf
+texmf-dist/doc/latex/splitindex/splitindex-Linux-i386
+texmf-dist/doc/latex/splitindex/splitindex-OpenBSD-i386
 texmf-dist/doc/latex/splitindex/splitindex.1
+texmf-dist/doc/latex/splitindex/splitindex.class
+texmf-dist/doc/latex/splitindex/splitindex.exe
+texmf-dist/doc/latex/splitindex/splitindex.java
+texmf-dist/doc/latex/splitindex/splitindex.pl
 texmf-dist/doc/latex/splitindex/splitindex.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="146906">
-texmf-dist/source/latex/splitindex/install.sh
+    <TPM:SourceFiles size="75209">
 texmf-dist/source/latex/splitindex/splitidx.dtx
 texmf-dist/source/latex/splitindex/splitidx.ins
-texmf-dist/source/latex/splitindex/splitindex-Linux-i386
-texmf-dist/source/latex/splitindex/splitindex-OpenBSD-i386
 texmf-dist/source/latex/splitindex/splitindex.c
-texmf-dist/source/latex/splitindex/splitindex.class
-texmf-dist/source/latex/splitindex/splitindex.exe
-texmf-dist/source/latex/splitindex/splitindex.java
-texmf-dist/source/latex/splitindex/splitindex.pl
     </TPM:SourceFiles>
     <TPM:Provides>Package/splitindex</TPM:Provides>
   </rdf:Description>