ltxindex update (6jun08)

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

2 files changed, 99 insertions, 76 deletions

diff --git a/Master/texmf-dist/source/latex/ltxindex/ltxindex.dtx b/Master/texmf-dist/source/latex/ltxindex/ltxindex.dtx
index aa3fa836565..b82a959c3cf 100644
--- a/Master/texmf-dist/source/latex/ltxindex/ltxindex.dtx
+++ b/Master/texmf-dist/source/latex/ltxindex/ltxindex.dtx
@@ -24,18 +24,58 @@
 %   along with this program; if not, write to the Free Software
 %   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 %
+% This work has the LPPL maintenance status "unmaintained".
+% 
 %\fi
-%
 %\iffalse
+%<*driver>
+\ProvidesFile{ltxindex.dtx}
+%</driver>
 %<ltxindex>\NeedsTeXFormat{LaTeX2e}[1995/06/01]
 %<ltxindex>\ProvidesPackage{ltxindex}
-%<ltxindex>    [2004/06/30 v0.1b ltxindex: LaTeX indexing, texindex style]
+    [2008/06/06 v0.1c ltxindex: LaTeX indexing, texindex style]
+%<*batchfile>
+\begingroup
+\input docstrip
+\keepsilent
+\usedir{tex/latex/contrib/ltxindex}
+\preamble
+
+   ltxindex.sty, a LaTeX package to typeset indices with GNU's Texindex
+   Copyright (C) 2004 by Richard Stallman, Robert J. Chassell,
+   Michael Clarkson, \& Luis Rivera.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+              WARNING!!! This code is fairly experimental.             
+ 
+\endpreamble
+
+\askforoverwritefalse
+
+\IfFileExists{ltxindex.sty}{}{%
+\generate{\file{ltxindex.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{ltxindex.dtx}{ltxindex,package}}
+}}
+\endgroup
+%</batchfile>
 %\fi
 %
 %\iffalse
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{ltxindex}
 \newcommand{\texindex}{\texttt{texindex}}
 \newcommand{\ltxindex}{\textsf{ltxindex}}
 \OnlyDescription
@@ -45,34 +85,19 @@
 %</driver>
 %\fi
 %
-% \CheckSum{541}
+% \CheckSum{548}
 %
-% \CharacterTable
-%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%   Digits        \0\1\2\3\4\5\6\7\8\9
-%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%   Dollar        \$     Percent       \%     Ampersand     \&
-%   Acute accent  \'     Left paren    \(     Right paren   \)
-%   Asterisk      \*     Plus          \+     Comma         \,
-%   Minus         \-     Point         \.     Solidus       \/
-%   Colon         \:     Semicolon     \;     Less than     \<
-%   Equals        \=     Greater than  \>     Question mark \?
-%   Commercial at \@     Left bracket  \[     Backslash     \\
-%   Right bracket \]     Circumflex    \^     Underscore    \_
-%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%   Right brace   \}     Tilde         \~}
+% \changes{0.1}{2004/06/30}{First Release.}
+% \changes{0.1b}{2007/12/14}{Made a first dtx file.}
+% \changes{0.1c}{2008/06/06}{Single file release, nomulticol option, dropped support.}
 %
-% \changes{0.1}{2004/06/30}{First Release}
-% \changes{0.1b}{2007/12/14}{Made a first dtx file}
-%
-% \GetFileInfo{ltxindex.sty}
+% \GetFileInfo{ltxindex.dtx}
 %
 % \title{\ltxindex: Making \LaTeX\ indexes with GNU's \texindex%
 % \thanks{This file documents version~\fileversion, as of~\filedate. 
-% Please send comments and bug reports to jlrn77 at gmail dot com.}}
+% This package has been orphaned: please adopt a package!}}
 % \author{Luis Rivera}
-% \date{December 14, 2006}
+% \date{June 6, 2008}
 % \maketitle
 %
 % \ltxindex\ is a simple package to make indices for \LaTeX\ 
@@ -155,9 +180,11 @@
 % \item Write some macros to modify the appearance of the index (by means 
 %   of some commands or package options).
 % \item PDF is not supported at all.
-% \item Documentation is wanting; I may improve it when I implement 
-%   user-defined indexes.
-% \item There is something odd about the license of this package. 
+% \item Documentation is wanting.
+% \end{itemize}
+%
+% There is something odd about the license of this package: it may 
+% be fixed by adding an independent implementation of multicolumns. 
 %
 % This package is distributed along the lines of the GNU General Public
 % License version 2.0, in compliance with the original license for 
@@ -177,18 +204,9 @@
 % of \textsf{multicol}.  
 % See the file |multicol.dtx| for details.
 % 
-% Confused? Well, just comment out the lines containing the strings
-% \begin{verbatim}
-% \RequirePackage{multicol}
-% \begin{multicols}{2}
-% \end{multicols}
-% \end{verbatim}
+% Confused? Well, just use the package option |nomulticol|.
 % The output will be ugly, but free from moral trouble. 
 %
-% I may get around this odd situation when I implement another way of setting 
-% multiple columns independently of Mittelbach's package. 
-% \end{itemize}
-%
 %\StopEventually{}
 %
 %\section{The Code}
@@ -197,7 +215,10 @@
 % in a two column environment. This should be the default behavior, save 
 % the case documented above.
 %    \begin{macrocode}
+%<*ltxindex>
 \RequirePackage{multicol}
+\newenvironment{ltxmulticols}{\begin{multicols}{2}}{\end{multicols}}
+\DeclareOption{nomulticol}{\renewenvironment{ltxmulticols}{}{}}
 %    \end{macrocode}
 % Index generation facilities
 %
@@ -383,9 +404,9 @@
   \ifeof 1
     \putwordIndexIsEmpty
   \else 
-    \begin{multicols}{2}
+    \begin{ltxmulticols}
     \input \jobname.#1s
-    \end{multicols}
+    \end{ltxmulticols}
   \fi
 \fi
 \closein 1 
@@ -429,13 +450,50 @@
 \newindex{cp}
 %    \end{macrocode}
 %
-% ...and two useful macros to save typing time
+% ...and two useful macros to save typing time.
 %
 %    \begin{macrocode}
 \newcommand{\indexcp}[1]{#1\cpindex{#1}}
 \newcommand{\subindexcp}[2]{#1\cpsubindex{#2}{#1}}
 %    \end{macrocode}
 %
+% Finally, process options.
+%
+%    \begin{macrocode}
+\ExecuteOptions{}
+\ProcessOptions
+%</ltxindex>
+%    \end{macrocode}
+%
 % et voil\`a!
 %
 %\Finale
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \typeout{**************************************************}
+% \typeout{*}
+% \typeout{* To finish the installation you have to move the}
+% \typeout{* following file into a directory searched by TeX:}
+% \typeout{*}
+% \typeout{* \space\space ltxindex.sty}
+% \typeout{*}
+% \typeout{* Documentation is in ltxindex.pdf or ltxindex.dvi}
+% \typeout{*}
+% \typeout{* Happy TeXing!}
+% \typeout{**************************************************}
+%
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/ltxindex/ltxindex.ins b/Master/texmf-dist/source/latex/ltxindex/ltxindex.ins
deleted file mode 100644
index b3744de7e7d..00000000000
--- a/Master/texmf-dist/source/latex/ltxindex/ltxindex.ins
+++ /dev/null
@@ -1,35 +0,0 @@
-% ltxindex.ins generated using /usr/local/bin/makedtx version 0.9b 2006/11/26 15:10
-\input docstrip
-\keepsilent
-\usedir{tex/latex/ltxindex}
-\preamble
-
-   ltxindex.sty, a LaTeX package to typeset indices with GNU's Texindex
-   Copyright (C) 2004 by Richard Stallman, Robert J. Chassell,
-   Michael Clarkson, \& Luis Rivera.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-              WARNING!!! This code is fairly experimental.             
- 
-\endpreamble
-
-\askforoverwritefalse
-
-\generate{\file{ltxindex.sty}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{ltxindex.dtx}{ltxindex,package}}
-}
-
-\endbatchfile