summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/imakeidx/README50
-rw-r--r--Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdfbin504387 -> 494075 bytes
-rw-r--r--Master/texmf-dist/doc/latex/imakeidx/manifest.txt16
-rw-r--r--Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx51
-rw-r--r--Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty12
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo2
6 files changed, 95 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/imakeidx/README b/Master/texmf-dist/doc/latex/imakeidx/README
index 98449796ad0..397f03c24b9 100644
--- a/Master/texmf-dist/doc/latex/imakeidx/README
+++ b/Master/texmf-dist/doc/latex/imakeidx/README
@@ -1,12 +1,13 @@
-This is the README file relative to package imakeidx version 1.2d
-dated 2012/10/05
+This is the README file relative to package imakeidx version 1.2e
+dated 22 October 2012.
-Copyright 2010--2012 Claudio Beccari and Enrico Gregorio
+Copyright 2010-2012 by Claudio Beccari and Enrico Gregorio
The bundle contains the files:
README this file
imakeidx.dtx the documented source TeX file
+manifest.txt legalese information.
WARNING: the derived files:
@@ -15,25 +16,36 @@ imakeidx.pdf the documentation file in PDF format
are SIMULTANEOUSLY produced while running pdflatex on imakeidx.dtx.
-The bundle is distributed under the LPPL license version 1.3c or any
-later version.
+The bundle is distributed under the LPPL license version 1.3c or
+any later version.
The bundle has the status of author maintained.
-The main purpose of this bundle is to exploit the possibility of
-running an index formatting program from within a document typesetting
-task (tested with the engines pdftex, xetex, and luatex in their
-incarnation set up to process the LaTeX markup) at the \printindex
-level, so that one or more indices can be typeset in such a way that
-they are always synchronous with the document they belong to.
-
-With TeX Live (release 2010 and later) the makeindex program can be
-safely run within a TeX run; with previous distributions the shell
-escape feature must be explicity enabled. With the 2010 or later
-distribution the makeindex program is directly accessible.
-
-This bundle is compatible with most existing classes and also with the
-idxlayout package for customizing index general formatting.
+The various files should be moved to the TDS folders as such:
+in source/latex/imakeidx/ file: imakeidx.dtx
+in doc/latex/imakeidx/ files: README, manifest.txt.imakidx.pdf
+in /tex/latex/imakeidx/ file: imakeidx.sty
+
+
+The main purpose of this bundle is to exploit the possibility of
+running an index formatting program from within a document
+typesetting task (tested with the engines pdftex, xetex, and luatex
+in their incarnation set up to process the LaTeX markup) at the
+\printindex level, so that one or more indices can be typeset in
+such a way that they are always synchronous with the document they
+belong to.
+
+With the TeXlive 2010 release the makeindex program can be safely
+run within a TeX run; with previous distributions the shell escape
+feature had to be explicitly enabled. With the 2010 and later
+distributions the makeindex program is directly accessible. If the
+xindy program is used to sort index entries and format the index
+files, it is still necessary to use the shell escape option.
+
+This bundle is compatible with most existing classes; some reported
+conflicts with other packages have been reported and have been
+resolved, or at least advice is given so as to overcome such
+conflicts.
Claudio Beccari claudio dot beccari at gmail.com
Enrico Gregorio enrico dot gregorio at univr.it
diff --git a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
index 3fd16297c13..742ea162151 100644
--- a/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
+++ b/Master/texmf-dist/doc/latex/imakeidx/imakeidx.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/imakeidx/manifest.txt b/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
new file mode 100644
index 00000000000..c05756d9a89
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/imakeidx/manifest.txt
@@ -0,0 +1,16 @@
+ The imakeidx extension package
+ version 1.2e of 22 October 2012
+
+Copyright 2010-2012 by Claudio Beccari and Enrico Gregorio
+
+This package is subject to the LaTeX Project Pubblic Lincence, version 1.3c or
+any later version. The full test of the license is always present in the CTAN
+archives and in any TeX Live, MacTeX, MiKTeX distribution of the TeX system.
+
+The Work consists of this file manifest.txt, the README file, the documented
+imakeidx.dtx file; the derived files are imakeidx.sty and imakeidx.pdf.
+
+This Work has the status of "author maintained".
+
+Claudio Beccari claudio dot beccari at gmail.com
+Enrico Gregorio enrico dot gregorio at univr.it \ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx b/Master/texmf-dist/source/latex/imakeidx/imakeidx.dtx
index ecf7dfdc43f..bcac4894408 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.
%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<package>\ProvidesPackage{imakeidx}%
%<*package>
- [2012/10/05 v1.2d Package for typesetting indices in a synchronous mode]
+ [2012/10/22 v1.2e Package for typesetting indices in a synchronous mode]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -77,7 +77,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
\end{document}
%</driver>
% \fi
-% \CheckSum{782}
+% \CheckSum{785}
%
% \changes{v1.0}{2010/07/10}{First public version}
% \changes{v1.0a}{2010/07/12}{Small bug correction}
@@ -89,6 +89,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% \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}
+% \changes{v1.2e}{2012/10/22}{Fixed bug with showidx simulated by memoir}
%
% \begin{abstract}
% This package exploits the |\write18| facility of modern \TeX\ system
@@ -553,7 +554,9 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% \pack{memoir} class. Since version 1.1 it is; however, one has to
% keep in mind that all index processing is done with the methods of
% the present package, and \emph{not} with \pack{memoir}'s; however
-% the syntax used is the same and there should be no problem.
+% the syntax used is the same and there should be no problem. There is
+% an interaction between \pack{memoir} and \pack{showidx} that required
+% special attention. See below about using \pack{showidx}.
%
% \subsubsection{Package \pack{showidx}}
%
@@ -644,7 +647,7 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% differently according to the next list entry.
% \item There are some classes (for example \class{book},
% \class{scrapbook}, \class{menoir},\dots) that have the special
-% ``sectioning'' declarations |\fontmatter|, |\mainmatter|, and
+% ``sectioning'' declarations |\frontmatter|, |\mainmatter|, and
% |\backmatter| modify how the unstarred sectioning commands behave for
% what concerns the heading and the table of contents entries.
%
@@ -721,6 +724,15 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% to the fact that \pack{showidx} redefines several internal commands,
% some of which have to receive the \pack{imakeidx} definition in order
% to perform as described in this documentation.
+
+% At the same time if the \pack{memoir} classis being used, remember that this class
+% simulates the \pack{showidx} package and has its own commands to enable or
+% disable the printing of the index entries into the margin of the document;
+% the default setting is with the |\hideindexmarks| command in force; but if
+% the user wants to write his index entries in the margin he has to issue the
+% declaration |\showindexmarks| just after begin document, in any case before
+% the part of the source file(s) he wants to be marked with the index entries
+% in the margin.
%
% \subsection{Index List sectioning customization}
% Use freely the options and the key values in order to reach the
@@ -1055,14 +1067,30 @@ and the derived files imakeidx.sty and imakeidx.pdf.
\def\imki@nowrindex#1{\endgroup\@esphack}
% \end{macrocode}
%
-% Command \cs{@wrindex} must be duplicated; we have to call it the
-% same as usual in order to support \pack{hyperref}. But the real name
-% will be given at the end. We have to define a switch to allow the use of the \pack{showidx} facilities. We define also a helper macro so as to do the right thing so as to show the index file name to which a certain index entry is going to be written; the idea is to prefix the induex entry with the actual name of the specific index, except in the case or the default index, where the name is set to |\jobname|. Since they control sequence is a primitive command, its value cannot be directly compared in the |\ifx| sense to the current macro represented by argument |#1|. therefore we need a further helper control sequence |\imki@jobname| that contains the value assigned to |\jobname|.
+% Command \cs{@wrindex} must be duplicated; we have to call it the same as usual in order
+% to support \pack{hyperref}. But the real name will be given at the end. We have to
+% define a switch to allow the use of the \pack{showidx} facilities. We define also a
+% helper macro so as to do the right thing so as to show the index file name to which
+% a certain index entry is going to be written; the idea is to prefix the index entry
+% with the actual name of the specific index, except in the case or the default index,
+% where the name is set to |\jobname|. Since the control sequence is a primitive
+% command, its value cannot be directly compared in the |\ifx| sense to the current
+% macro represented by argument |#1|. Therefore we need a further helper control
+% sequence |\imki@jobname| that contains the value assigned to |\jobname|.
+% We must also take care of the case where the user wants to print the index entries
+% in the margin while working on the document. This implies testing for the package
+% \pack{showidx} being already loaded; but this is not sufficient, because the
+% \pack{memoir} class simulates the \pack{showidx} package and the test would result
+% to be true even if the user did not load thet package, but uses the \pack{memoir} class.
+% Therefore we use the same boolean used by \pack{memoir}, testing in advance so as not
+% defining it twice; then we use it to let the \pack{showidx} true or simulated macros do
+% their job, but we also take care of resetting the switch default value to
+% false at begin document time if the \pack{memoir} class is being used.
% \begin{macrocode}
-\newif\ifimki@showidx
-\@ifpackageloaded{showidx}{\imki@showidxtrue}{\imki@showidxfalse}
+\@ifundefined{showindexmarks}{\newif\ifshowindexmark}{}
+\@ifpackageloaded{showidx}{\showindexmarktrue}{\showindexmarkfalse}
\newcommand\imki@showidxentry[2]{%
- \ifimki@showidx
+ \ifshowindexmark
\@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}%
\fi}
\def\imki@wrindexsplit#1#2{%
@@ -1378,7 +1406,8 @@ and the derived files imakeidx.sty and imakeidx.pdf.
% \end{macrocode}
% To end the code, we deal with \pack{memoir}:
% \begin{macrocode}
-\@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex}{}
+\@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex
+ \AtBeginDocument{\hideindexmarks}}{}
% \end{macrocode}
%\iffalse
%</package>
diff --git a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
index 7eba70c2b07..bda1c3a7c47 100644
--- a/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
+++ b/Master/texmf-dist/tex/latex/imakeidx/imakeidx.sty
@@ -14,7 +14,8 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{imakeidx}%
- [2012/10/05 v1.2d Package for typesetting indices in a synchronous mode]
+ [2012/10/22 v1.2e Package for typesetting indices in a synchronous mode]
+
@@ -168,10 +169,10 @@
\@sanitize
\@wrindex\@idxfile}}
\def\imki@nowrindex#1{\endgroup\@esphack}
-\newif\ifimki@showidx
-\@ifpackageloaded{showidx}{\imki@showidxtrue}{\imki@showidxfalse}
+\@ifundefined{showindexmarks}{\newif\ifshowindexmark}{}
+\@ifpackageloaded{showidx}{\showindexmarktrue}{\showindexmarkfalse}
\newcommand\imki@showidxentry[2]{%
- \ifimki@showidx
+ \ifshowindexmark
\@showidx{\ifdefequal{\imki@jobname}{#1}{}{[#1]\space}#2}%
\fi}
\def\imki@wrindexsplit#1#2{%
@@ -384,7 +385,8 @@
\let\imki@wrindexunique\@undefined
\let\imki@putindexunique\@undefined
\fi
-\@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex}{}
+\@ifclassloaded{memoir}{\let\@wrindexm@m\@wrindex
+ \AtBeginDocument{\hideindexmarks}}{}
%%
%% Copyright 2010--2012 Claudio Beccari <claudio dot beccari at gmail dot it>
%% Copyright 2010--2012 Enrico Gregorio <Enrico dot Gregorio at univr dot it>
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 8efc1d78f56..0a8c600193e 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -17,7 +17,7 @@ sub main {
# erroneous or problematic tds files (when new, tell RobinF and author)
$erroneous_tds = join ("|",
- qw(countriesofeurope engpron gost hacm he-she imtekda spanish
+ qw(countriesofeurope engpron gost hacm he-she imakeidx imtekda spanish
sttools titleps),
);