summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-30 23:07:36 +0000
committerKarl Berry <karl@freefriends.org>2019-01-30 23:07:36 +0000
commitb74c095b1b8555c7f85c1880a6038bea9a0a0f54 (patch)
tree082344d1ba4bb3bb5ea0955e44a56d2c435de980
parent56024c9972d18c28ea75874262e2ed510c7bff1f (diff)
manyind (30jan19)
git-svn-id: svn://tug.org/texlive/trunk@49874 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/manyind/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/manyind/mind.html4
-rw-r--r--Master/texmf-dist/doc/latex/manyind/mindsample.pdfbin151815 -> 154578 bytes
-rw-r--r--Master/texmf-dist/doc/latex/manyind/mindsample.tex55
-rw-r--r--Master/texmf-dist/tex/latex/manyind/manyind.sty30
5 files changed, 63 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/manyind/README.md b/Master/texmf-dist/doc/latex/manyind/README.md
index 88ea8c0712d..02d21555223 100644
--- a/Master/texmf-dist/doc/latex/manyind/README.md
+++ b/Master/texmf-dist/doc/latex/manyind/README.md
@@ -1,5 +1,5 @@
Package manyind.sty, Wilberd van der Kallen 2019.
-Date of last change of _anything_ in the bundle 2019/01/07
+Date of last change of _anything_ in the bundle 2019/01/29
This package provides support for many indexes, leaving all the bookkeeping to LaTeX and
makeindex. No extra programs or files are needed. One runs latex and makeindex as if
diff --git a/Master/texmf-dist/doc/latex/manyind/mind.html b/Master/texmf-dist/doc/latex/manyind/mind.html
index 8e5079bc5c3..aa9338d29dd 100644
--- a/Master/texmf-dist/doc/latex/manyind/mind.html
+++ b/Master/texmf-dist/doc/latex/manyind/mind.html
@@ -9,14 +9,14 @@
<H2>Just run latex and makeindex as if there is one index only</H2>
The package
-<A HREF="manyind.sty">manyind.sty</A> (version 2019/01/07)
+<A HREF="manyind.sty">manyind.sty</A> (version 2019/01/28)
provides support for many indexes, leaving all the bookkeeping to LaTeX and makeindex.
No extra programs or files are needed. One runs latex and makeindex as if there is
just one index. In the main file one puts commands like
\setindex{main}
to steer the flow.
- Some features of makeindex may no longer work.
+ Some features of makeindex do no longer work.
<P>The sample file <A HREF="mindsample.tex">mindsample.tex</A>
diff --git a/Master/texmf-dist/doc/latex/manyind/mindsample.pdf b/Master/texmf-dist/doc/latex/manyind/mindsample.pdf
index 23326abb845..5b5c38d574d 100644
--- a/Master/texmf-dist/doc/latex/manyind/mindsample.pdf
+++ b/Master/texmf-dist/doc/latex/manyind/mindsample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/manyind/mindsample.tex b/Master/texmf-dist/doc/latex/manyind/mindsample.tex
index 9e3d674f75c..b1ec5963d50 100644
--- a/Master/texmf-dist/doc/latex/manyind/mindsample.tex
+++ b/Master/texmf-dist/doc/latex/manyind/mindsample.tex
@@ -1,14 +1,14 @@
-% mindsample.tex 2018/04/29
+% mindsample.tex 2019.01.27.
\documentclass{book}
-\usepackage{manyind}
+\usepackage{manyind} %
\usepackage[plainpages=false,colorlinks=true]{hyperref}
-\title {Package manyind provides support for many indexes}
-
+\altsort % to get other sorting.
+\title {Package manyind provides support for many indexes}
\author{Wilberd van der Kallen\index{Wilberd}}
-\date{April 2018}
+\date{January 2019}
\makeindex % obligatory with manyindex
@@ -17,7 +17,9 @@
\renewcommand\thepage{\roman{page}}
\index{z}% ends up in index main.
-
+\index{/@/ divide symbol comes before A}
+\index{:@\indexspace : colon comes here}% goes after Z when using \altsort, before A otherwise.
+
\setindex{b1}
\maketitle % So Wilberd will end up in index b1.
@@ -87,6 +89,9 @@ To see how package \verb|manyind| may be used, you may also compare the file
This preface has an \emph{indexed term}.\setindex{b1}\index{indexed term}
(You see this in the source file only.)
+
+
+
\chapter{Introduction}\sloppy
\renewcommand\thepage{\arabic{page}}
\addtocounter{page}{-6}% Just to get overlap in roman and arabic page numbers.
@@ -109,6 +114,9 @@ The package \verb|manyind|
The index file {\it filename}.\texttt{ind} has become quite unreadable. Do not edit it.
Use the package \verb!manyind! only if you are willing to keep the indexes standard.
+If one puts \verb|\altsort|
+in the preamble, then entries are sorted differently. For instance, \verb|\index{\"U}|
+will put \"U after the alphabet, not before.
\setindex{a1}\index{alpha!see beta}
\index{alpha!see also gamma\gobblepageref}
@@ -173,6 +181,7 @@ Use the package \verb!manyind! only if you are willing to keep the indexes stand
\setindex{bis}\index{bis}
+
\setindex{main}\index{delta!vardelta}
@@ -181,16 +190,36 @@ Use the package \verb!manyind! only if you are willing to keep the indexes stand
\setindex{main}\index{time!here@now}
+% When you are sure there is an entry \index{\"U...}.
+\index{\"U@\indexcapstyle{\"U}\gobblepageref}%
+
+\index{\"Uber}%
+\index{\"Uberhaupt}%
+
+% There is a nerdy way:
+\index{\"N@\protect\nxtletre \protect\def \nwletre {\"O}\gobblepageref}
+\index{\"P@\relax\gobblepageref}
+
+% Now look what happens if you leave out the next line
+\index{\"Osterreich}
+
+% Similarly
+\index{\A>@\protect\nxtletre \protect\def \nwletre {\AA}\gobblepageref}
+\index{\AB@\relax\gobblepageref}
+
+\index{\AA ngstrom}
+
+
\setindex{b1}\index{page range!risky@this $\vert$is$\vert$ complicated|)textbf}
\index{page range|)textit}%
-\sindex[b1]{page range!risky@this $\vert$is$\vert$ complicated|textbf}
+%\sindex[b1]{page range!risky@this $\vert$is$\vert$ complicated|textbf}
%
-\setindex{a1}\index{page range!with risky label\label{range}}
+\index{page range!with risky label\label{range}}
% This label actually works and was used above in a \pageref{range} command.
%
\sindex[b1]{simpler!page range|)}%
@@ -199,9 +228,9 @@ Use the package \verb!manyind! only if you are willing to keep the indexes stand
% If you want the index in the table of contents, you may do
%
-% \clearpage
-% \phantomsection
-% \addcontentsline{toc}{chapter}{\indexname}
+% \clearpage
+% \phantomsection
+% \addcontentsline{toc}{chapter}{\indexname}
%
% We have a command for this:
@@ -213,6 +242,8 @@ Use the package \verb!manyind! only if you are willing to keep the indexes stand
\setindex{main}
\printindex
+\sindex[b1]{page range!risky@this $\vert$is$\vert$ complicated|textbf}
+
\renewcommand{\indexname}{Index bis}
\setindex{bis}
\printindex
@@ -248,4 +279,6 @@ One may embellish an index with letter headings, like this.\\
\printindex[main][Index with headings]
+
\end{document}
+
diff --git a/Master/texmf-dist/tex/latex/manyind/manyind.sty b/Master/texmf-dist/tex/latex/manyind/manyind.sty
index 8394d7008bb..21975b85f24 100644
--- a/Master/texmf-dist/tex/latex/manyind/manyind.sty
+++ b/Master/texmf-dist/tex/latex/manyind/manyind.sty
@@ -14,13 +14,13 @@
\ProvidesPackage{manyind}
- [2019/01/09
+ [2019/01/28
many indexes]
\RequirePackage{makeidx}
-\AtBeginDocument{\def\ind@nr#1{\string\indnr\mindchoice d\gr@bltr#1-\relax b #1}%
+\AtBeginDocument{\def\ind@nr#1{\string\indnr\mindchoice d\gr@bltr#1-\relax b{} #1}%
\ifx\@@wrindex\undefined
\def\@wrindex#1{\@bsphack
\protected@write
@@ -101,7 +101,11 @@ recently?}%
\newcommand{\gr@bltr}{\relax}%
-\def\gr@bltr#1#2\relax{\ifcat A#1\the\uccode`#1\else 60\fi}% to keep "a" and "A" together.
+\def\gr@bltr#1#2\relax{\ifcat A#10\the\uccode`#1\else 060\fi}%
+% to keep "a" and "A" together.
+
+\newcommand{\altsort}% to place some entries after the alphabet
+{\def\gr@bltr##1##2\relax{\ifcat A##10\the\uccode`##1\else##1\fi}}
% But first some code for embellishing an index. Our hacking brakes the insertion of
% \indexspace at appropriate places. We have to work hard to restore that. While we
@@ -117,11 +121,14 @@ recently?}%
\newcommand{\mindc@pitalhead}[1]{% Preparing for a heading; not printed.
\protected@write
\@indexfile {}{\string \indexentry
- {\string\indnr \mindchoice d\gr@bltr#1\relax a #1@\protect\nxtletre
+ {\string\indnr \mindchoice d\gr@bltr#1\relax a @\protect\nxtletre
\protect\def\protect\nwletre{#1}\string\jmptonine}{9}}%
}%
+\newcommand{\extraheaders}{\relax}
+
\newcommand{\capitals@inindex}[1]{% Will be called by \mnew@index with full alphabet.
+\extraheaders
\mfind@capitals#1\relax}%
\newcommand{\mfind@capitals}{\relax}%
@@ -138,14 +145,11 @@ recently?}%
\newcommand{\proc@letter}{\relax}%
-\def\proc@letter#1{\long\def\item{\m@olditem}\ifx#1\relax\else\indexcapstyle{\nwletre}\fi
-\ifx#1\indnr\expandafter\ja@\else #1\fi}%
+\def\proc@letter#1#2{\long\def\item{\m@olditem}%
+\ifx#1\relax\else\indexcapstyle{\nwletre}\fi\fi#1}%
\newcommand{\m@olditem}{\relax}%
-\newcommand{\ja@}{\relax}
-
-\def\ja@#1 {\fi}% Mysterious. Seems necessary.
% All this just to embellish an index. Now more support for multiple indexes.
@@ -188,8 +192,7 @@ Package needs \string\make index in preamble. Detected}\fi
\ifnum\c@multindctr=999%
\protected@write
\@indexfile {}{\string \indexentry
- {\string\indnr 999b @\string\nxtletre
- \string\mindcutpoint\string\jmptonine}{9}}%
+ {\string\indnr 999b @\string\mindcutpoint\string\jmptonine}{9}}%
\@esphack
\fi
\addtocounter{multindctr}{-1}%
@@ -200,8 +203,8 @@ Package needs \string\make index in preamble. Detected}\fi
\@esphack
\protected@write
\@indexfile {}{\string \indexentry
- {\string\indnr\the\c@multindctr d91a @\protect\nxtletre\protect\def
- \protect\nwletre{\relax}\string\jmptonine
+ {\string\indnr\the\c@multindctr d091 @\string
+ \relax\string\jmptonine% restores \item
}{9}}%
\protected@write
\@indexfile {}{\string \indexentry
@@ -216,4 +219,3 @@ Package needs \string\make index in preamble. Detected}\fi
}%
\endinput
-