From 2e7e146f33f732452d00e27f657a6306e225fb9b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Jan 2019 23:11:40 +0000 Subject: robustindex (30jan19) git-svn-id: svn://tug.org/texlive/trunk@49877 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/robustindex/README.md | 12 ++++---- .../doc/latex/robustindex/multisample.pdf | Bin 163966 -> 162849 bytes .../doc/latex/robustindex/multisample.tex | 3 +- .../doc/latex/robustindex/robustmanual.pdf | Bin 122602 -> 122138 bytes .../doc/latex/robustindex/robustmanual.tex | 28 ++++++++--------- .../doc/latex/robustindex/robustsample.pdf | Bin 177933 -> 177933 bytes Master/texmf-dist/doc/latex/robustindex/stind.html | 2 +- .../tex/latex/robustindex/robustindex.sty | 33 +++++++++++---------- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Master/texmf-dist/doc/latex/robustindex/README.md b/Master/texmf-dist/doc/latex/robustindex/README.md index 7e2fde0e1ad..fa1326991d2 100644 --- a/Master/texmf-dist/doc/latex/robustindex/README.md +++ b/Master/texmf-dist/doc/latex/robustindex/README.md @@ -1,5 +1,5 @@ -Package robustindex.sty, Wilberd van der Kallen 2018. -Date of last change of _anything_ in the bundle 2018/04/28 +Package robustindex.sty, Wilberd van der Kallen 2019. +Date of last change of _anything_ in the bundle 2019/01/29 This package uses \pageref to ensure that the page numbers in the index are synchronous with the manuscript, even when a third party changes the page numbers and fails to @@ -13,11 +13,11 @@ Date of last change of _anything_ in the bundle 2018/04/28 It uses just one index file and relies on the old compile cycle (latex, makeindex, latex) in the standard TeX setup. - Copyright 2005, 2017, 2018 Wilberd van der Kallen + Copyright 2005, 2017, 2018, 2019 Wilberd van der Kallen - This package may be distributed under the conditions of the - LaTeX Project Public License, either version 1.2 of this license or - (at your option) any later version. The latest version of this license is in + This package may be distributed under the conditions of the LaTeX Project Public + License, either version 1.2 of this license or (at your option) any + later version. The latest version of this license is in [lpp.txt](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. diff --git a/Master/texmf-dist/doc/latex/robustindex/multisample.pdf b/Master/texmf-dist/doc/latex/robustindex/multisample.pdf index 44fa6ac84a4..8322a88c95a 100644 Binary files a/Master/texmf-dist/doc/latex/robustindex/multisample.pdf and b/Master/texmf-dist/doc/latex/robustindex/multisample.pdf differ diff --git a/Master/texmf-dist/doc/latex/robustindex/multisample.tex b/Master/texmf-dist/doc/latex/robustindex/multisample.tex index 1e0458ee86a..a7c03733399 100644 --- a/Master/texmf-dist/doc/latex/robustindex/multisample.tex +++ b/Master/texmf-dist/doc/latex/robustindex/multisample.tex @@ -12,7 +12,8 @@ \date{April 2018} \makeindex % obligatory with robustindex - +%\altsort % to get other sorting under option maltind in Version 2019/01/24 of robustindex . +% It places \index{\"U} after the alphabet, not before. \begin{document} %\renewcommand{\indexcapstyle}[1]{\par\vskip1em plus.5em minus.3em\textbf{\uppercase{#1}}} \renewcommand\thepage{\roman{page}} diff --git a/Master/texmf-dist/doc/latex/robustindex/robustmanual.pdf b/Master/texmf-dist/doc/latex/robustindex/robustmanual.pdf index 3488a6a2497..35179f110cb 100644 Binary files a/Master/texmf-dist/doc/latex/robustindex/robustmanual.pdf and b/Master/texmf-dist/doc/latex/robustindex/robustmanual.pdf differ diff --git a/Master/texmf-dist/doc/latex/robustindex/robustmanual.tex b/Master/texmf-dist/doc/latex/robustindex/robustmanual.tex index 6c7b2354159..b43d49f3e27 100644 --- a/Master/texmf-dist/doc/latex/robustindex/robustmanual.tex +++ b/Master/texmf-dist/doc/latex/robustindex/robustmanual.tex @@ -1,6 +1,6 @@ -% robustmanual.tex 2018/04/23 +% robustmanual.tex 2018/04/11 \documentclass{article} -%\usepackage{makeidx} +\usepackage{makeidx} \usepackage[multind]{robustindex}[2018/04/15] \usepackage[hyperindex=false,colorlinks=true]{hyperref} @@ -36,9 +36,9 @@ Keep an eye on the \TeX\ log file. It often contains a warning that you need to \section*{Standard usage} Put -%$$ -%\verb!\usepackage{makeidx}! -%$$ +$$ +\verb!\usepackage{makeidx}! +$$ $$ \verb!\usepackage{robustindex}! $$ @@ -52,7 +52,7 @@ $$ \verb!\usepackage[plainpages=false,hyperindex=false]{hyperref}!. $$ -That should be all. (You may have to trash old auxiliary files, the \emph{filename}.\verb!ind! file included.) +That should be all. (You may have to trash old auxiliary files, the \verb!ind! file included.) You can now use \index{alpha}\index{gamma|textbf} $$\verb!\index{alpha}!$$ @@ -103,9 +103,7 @@ Before discussing the \verb|multind| option we now use $\verb!\printindex!$ to \section*{The \texttt{multind} option} The \verb!multind! option provides support for many indexes. -Suppose the preamble contains\\ - \verb!\usepackage[multind]{robustindex}[2018/04/15]!.\\ -\verb!\makeindex!. +Suppose the preamble contains \verb!\usepackage[multind]{robustindex}[2018/04/15]!. Let us say we want to use four indexes. First we choose tags to identify them. Say we use the tags \verb|main|, \verb|bis|, \verb|a1|, \verb|b1|. @@ -121,13 +119,13 @@ The \verb!\index! command and the \verb|\printindex| commands write to/from the active index. All indexes are hidden in one big index file (with extension \verb!ind!) and \LaTeX\ knows how to find the active index in there. -If you wish you may use \verb!\sindex[bis]{!\emph{entry}\verb!}! as shorthand for +If you wish you may use \verb!\sindex[bis]{!\emph{entry}\verb!}! as shorthand for\\ -\hspace{5em} \verb!\setindex{bis}\index{!\emph{entry}\verb!}! +\hspace{5em} \verb!\setindex{bis}\index{!\emph{entry}\verb!}!\\ -and \verb!\sindex{!\emph{entry}\verb!}! as shorthand for +and \verb!\sindex{!\emph{entry}\verb!}! as shorthand for\\ - \hspace{5em} \verb!\setindex{main}\index{!\emph{entry}\verb!}!. + \hspace{5em} \verb!\setindex{main}\index{!\emph{entry}\verb!}!.\\ @@ -145,8 +143,8 @@ latex multisample.tex\\ Older versions of \verb!robustindex.sty! may give different results. Use version \verb!2018/04/15! or later. -We recommend to bundle \verb!robustindex.sty! with your \emph{filename}.\verb!tex! and \emph{filename}.\verb!ind! when moving -files to another computer.\\ +We recommend to bundle \verb!robustindex.sty! with your \verb!tex! and \verb!ind! file when moving +files to another computer. If you have an entry that should go before the letter a, then you may start the argument of \verb!\index! with \verb!It is much nicer to have an index that adapts itself to all changes but the adding/deleting/rearranging of \index commands.

Our package -robustindex.sty (version 2018/04/28) +robustindex.sty (version 2019/01/25) achieves this with the \pageref mechanism.

Here is our Manual for the robustindex package. diff --git a/Master/texmf-dist/tex/latex/robustindex/robustindex.sty b/Master/texmf-dist/tex/latex/robustindex/robustindex.sty index 8c3d3943412..a30c5d81b7d 100644 --- a/Master/texmf-dist/tex/latex/robustindex/robustindex.sty +++ b/Master/texmf-dist/tex/latex/robustindex/robustindex.sty @@ -1,4 +1,4 @@ -% Package robustindex.sty, Wilberd van der Kallen 2005, 2017, 2018. +% Package robustindex.sty, Wilberd van der Kallen 2005, 2017, 2018, 2019. % % Third parties often change the page numbers without rerunning makeindex. % One would like to make the page numbers in the index entries more robust. @@ -54,7 +54,7 @@ % % https://www.staff.science.uu.nl/~kalle101/stind % -% Copyright 2018 Wilberd van der Kallen +% Copyright 2019 Wilberd van der Kallen % % This file may be distributed under the conditions of the LaTeX Project Public % License, either version 1.2 of this license or (at your option) any @@ -64,7 +64,7 @@ % version 1999/12/01 or later. \ProvidesPackage{robustindex} - [2018/04/28 + [2019/01/25 index entries with pagerefs] \RequirePackage{makeidx} @@ -111,8 +111,8 @@ }% \@esphack \protected@write - \@indexfile {}{\string \indexentry - {\string\indnr\robustchoice d\gr@bltr#1-\relax b \findencap#1|\relax}{\theindexctr}}% + \@indexfile {}{\string \indexentry + {\string\indnr\robustchoice d\gr@bltr#1-\relax b{} \findencap#1|\relax}{\theindexctr}}% \endgroup \@esphack } @@ -300,7 +300,11 @@ \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 @@ -320,8 +324,10 @@ \protect\def\protect\nwletre{#1}\string\jmptonine}{9}}% }% +\newcommand{\extraheaders}{\relax} + \newcommand{\capitalsinindex}[1]{% Will be called by \newindex with full alphabet. -\find@capitals#1\relax}% +\extraheaders\find@capitals#1\relax}% \newcommand{\find@capitals}{\relax}% @@ -333,19 +339,15 @@ \newcommand{\letr@test}{\relax}% To test if entry starts with new letter. -\long\def\letr@test#1{\ifx#1\nxtletre\else\proc@letter{#1}\fi}% +\long\def\letr@test#1{\ifx#1\nxtletre\else\proc@letter{\relax#1}\fi}% \newcommand{\proc@letter}{\relax}% -\def\proc@letter#1{\long\def\item{\olditem}\ifx#1\relax\else\indexcapstyle{\nwletre}\fi -\ifx#1\indnr\expandafter\ja@\else #1\fi}% +\def\proc@letter#1#2{\long\def\item{\olditem}% +\ifx#1\relax\else\indexcapstyle{\nwletre}\fi\fi#1}% \newcommand{\olditem}{\relax}% -\newcommand{\ja@}{\relax} - -\def\ja@#1 {\fi}% Mysterious. Seems necessary. - % All this just to embellish an index. Now the support for multiple indexes. \newcommand{\setindex}[1]{% @@ -401,8 +403,7 @@ 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 @\protect\relax\string\jmptonine }{9}}% \protected@write \@indexfile {}{\string \indexentry -- cgit v1.2.3