diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/thumbs/README | 40 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf | bin | 183129 -> 182726 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex | 37 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/thumbs/thumbs.pdf | bin | 494990 -> 499360 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/thumbs/thumbs.drv | 22 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/thumbs/thumbs.dtx | 669 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/thumbs/thumbs.ins | 35 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/thumbs/thumbs.sty | 235 |
8 files changed, 569 insertions, 469 deletions
diff --git a/Master/texmf-dist/doc/latex/thumbs/README b/Master/texmf-dist/doc/latex/thumbs/README index 3832f2b6f2d..ab17edfae4b 100644 --- a/Master/texmf-dist/doc/latex/thumbs/README +++ b/Master/texmf-dist/doc/latex/thumbs/README @@ -1,4 +1,4 @@ -README for thumbs package, 2011/10/19, v1.0j +README for thumbs package, 2012/01/01, v1.0k TABLE OF CONTENTS @@ -17,9 +17,9 @@ TABLE OF CONTENTS 1 INTRODUCTION ============== -This package puts running, customizable thumb marks in the -outer margin, moving downward as the chapter number (or -whatever shall be marked by the thumb marks) increases. +This LaTeX package puts running, customizable thumb marks +in the outer margin, moving downward as the chapter number +(or whatever shall be marked by the thumb marks) increases. Additionally an overview page/table of thumb marks can be added automatically, which gives the respective names of the thumbed objects, the page where the object/thumb mark first @@ -39,7 +39,15 @@ licenses.lppl.html for the details of that license. `thumbs' is available on CTAN: CTAN:macros/latex/contrib/thumbs/ -Also a ZIP file is provided that contains the files, already +Running +tex thumbs.dtx +generates the files +thumbs.ins, thumbs.drv, thumbs.sty, +and thumbs-example.tex. + +Also a ZIP file is provided that contains these files, +the manual (thumbs.pdf), the compiled example +(thumbs-example.pdf), and this README, already sorted in a TDS tree: CTAN:install/macros/latex/contrib/thumbs.tds.zip @@ -59,9 +67,9 @@ corresponds to Installation with ZIP file in TDS format ---------------------------------------- -The ZIP file `thumbs.tds.zip' contains the files sorted -in a TDS tree. Thus you can directly unpack the ZIP file -inside a TDS tree. +The ZIP file `thumbs.tds.zip' contains the files +sorted in a TDS tree. Thus you can directly unpack the +ZIP file inside a TDS tree. (See CTAN:tds.zip for an explanation of TDS.) Example: cd /...somewhere.../texmf @@ -73,7 +81,7 @@ Example: Manual installation ------------------- -a) Download the thumbs files from CTAN or the TUG server. +a) Download the thumbs files from CTAN. If necessary, unpack them. b) Generate the package and driver files: tex thumbs.dtx @@ -81,7 +89,7 @@ c) Install the file `*.sty' in your TDS tree: cp *.sty TDS:tex/latex/thumbs/ Replace `TDS:' by the prefix of your TDS tree (texmf directory). -d) Create the documentation, e.g. +d) Create the documentation (if necessary), e.g. pdflatex thumbs.dtx makeindex -s gind.ist thumbs.idx pdflatex thumbs.dtx @@ -89,7 +97,7 @@ d) Create the documentation, e.g. pdflatex thumbs.dtx e) Update the databases if necessary, e.g. for teTeX: mktexlsr .../texmf -f) Create the thumbs-example.pdf, e.g. +f) Create the thumbs-example.pdf (if necessary), e.g. pdflatex thumbs-example.tex pdflatex thumbs-example.tex pdflatex thumbs-example.tex @@ -116,11 +124,11 @@ which again load other packages ======================= thumbs should be loaded AFTER the required packages, -but loding it before those packages should be possible, -too. +but loding it before those packages should be possible, too. Thumbs MUST be loaded AFTER packages handling the page size, for example geometry. + 6 AUTHOR/MAINTAINER ===================== @@ -157,8 +165,4 @@ Bug reports can be send to the maintainer: 8 KNOWN PROBLEMS ================= -TeX 2011/06/27 has changed \enddocument and -thus broken the \AtVeryVeryEnd command/hooking -of atveryend package as of 2011/04/23, v1.7. -Until its fixed version (2011/06/30, v1.8) is -available at CTAN, \AtEndAfterFileList is used. +* as yet: none.
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf Binary files differindex b52465f59a0..338854edba1 100644 --- a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf +++ b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex index ddec0e914c0..ac15925f96f 100644 --- a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex +++ b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex @@ -9,12 +9,12 @@ %% This is a generated file. %% %% Project: thumbs -%% Version: 2011/10/19 v1.0j +%% Version: 2012/01/01 v1.0k %% -%% Copyright (C) 2010, 2011 by +%% Copyright (C) 2010 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> %% -%% The usual disclaimer applys: +%% The usual disclaimer applies: %% If it doesn't work right that's your problem. %% (Nevertheless, send an e-mail to the maintainer %% when you find an error in this package.) @@ -33,10 +33,10 @@ %% %% The Current Maintainer of this work is H.-Martin Muench. %% -%% This work consists of the main source file thumbs.dtx -%% and the derived files +%% This work consists of the main source file thumbs.dtx, +%% the README, and the derived files %% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, -%% thumbs-example.tex. +%% thumbs-example.tex, thumbs-example.pdf. %% \documentclass[twoside,british]{article}[2007/10/19]% v1.4h %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -59,15 +59,15 @@ hyperindex=false,% pdflang={en},% pdftitle={thumbs package example},% - pdfauthor={Hans-Martin Muench},% + pdfauthor={H.-Martin Muench},% pdfsubject={Example for the thumbs package},% - pdfkeywords={LaTeX, thumbs, thumb marks, Hans-Martin Muench},% + pdfkeywords={LaTeX, thumbs, thumb marks, H.-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% - linktoc=all]{hyperref}[2011/10/01]% v6.82j + linktoc=all]{hyperref}[2011/12/04]% v6.82m \usepackage[thumblink=rule,linefill=dots,height={auto},minheight={47pt},% width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},% nophantomsection=false,ignorehoffset=true,ignorevoffset=true,final=true,% - hidethumbs=false,verbose=true]{thumbs}[2011/10/19]% v1.0j + hidethumbs=false,verbose=true]{thumbs}[2012/01/01]% v1.0k \nopagecolor% use \pagecolor{white} if \nopagecolor does not work \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% \makeatletter @@ -84,13 +84,13 @@ \markboth{Example for thumbs}{Example for thumbs} This example demonstrates the most common uses of package -\textsf{thumbs}, v1.0j as of 2011/10/19 (HMM). +\textsf{thumbs}, v1.0k as of 2012/01/01 (HMM). The used options were \texttt{thumblink=rule}, \texttt{linefill=dots}, \texttt{height=auto}, \texttt{minheight=\{47pt\}}, \texttt{width={auto}}, \texttt{distance=\{2mm\}}, \newline \texttt{topthumbmargin=\{auto\}}, \texttt{bottomthumbmargin=\{auto\}}, \newline \texttt{nophantomsection=false}, -\texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, +\texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, \newline \texttt{final=true},\texttt{hidethumbs=false}, and \texttt{verbose=true}. \noindent These are the default options, except \texttt{verbose=true}. @@ -125,7 +125,7 @@ the thumb mark width would be automatically increased. For printing this example to another format of paper (e.\,g. A4) it is necessary to add the according option (e.\,g. \verb|a4paper|) to the document class and recompile it! (In that case the -thumb marks column change will occure at another point, of course.) +thumb marks column change will occur at another point, of course.) With paper format equal to document format the document can be printed without adapting the size, like e.\,g. \textquotedblleft shrink to page\textquotedblright . @@ -160,7 +160,7 @@ To include an overview page for the thumb marks, \addthumbsoverviewtocontents{section}{Thumb marks overview}% \thumbsoverview{Table of Thumbs} \end{verbatim} -is used, where \textbackslash addthumbsoverviewtocontents adds the thumb +is used, where \verb|\addthumbsoverviewtocontents| adds the thumb marks overview page to the table of contents. \smallskip @@ -170,7 +170,7 @@ to lead to the thumb mark and not to some earlier place. Therefore automatically a \verb|\phantomsection| is placed before each thumb mark. But for example when using the thumb mark after a \verb|\chapter{...}| command, it is probably nicer to have the link point at the top of that chapter's title (instead of the line -below it). The automatical placeing of the \verb|\phantomsection| can be disabled +below it). The automatical placing of the \verb|\phantomsection| can be disabled either globally by using option \texttt{nophantomsection}, or locally for the next thumb mark by the command \verb|\thumbsnophantom|. (When disabled globally, still manual use of \verb|\phantomsection| is possible.) @@ -241,7 +241,7 @@ The command \begin{verbatim} \stopthumb \end{verbatim} -was used here. Until another addthumb (with parameters) or +was used here. Until another \verb|\addthumb| (with parameters) or \begin{verbatim} \continuethumb \end{verbatim} @@ -346,7 +346,7 @@ You can, of course, keep the colour for more than one thumb mark. I am just adding further thumb marks. -If you are curiouse why the thumb mark between +If you are curious why the thumb mark between \textquotedblleft C mark\textquotedblright\ and \textquotedblleft E mark\textquotedblright\ has not been named \textquotedblleft D mark\textquotedblright\ but \textquotedblleft $1/1.\,955\,83$\, EUR\textquotedblright : @@ -433,7 +433,7 @@ The thumb marks are also too large - on purpose! This has been done to assure, that they cover the page up to its (paper) border, therefore they are placed a little bit over the paper margin. -Now I red somwhere in the net (should have remembered to note the url), +Now I red somewhere in the net (should have remembered to note the url), that white margins are presented, whenever there is some object outside of the page. Thus, it is a feature, not a bug?! What I do not understand: The same document sometimes is presented @@ -463,7 +463,6 @@ Now let us have a look at \verb|\thumbsoverviewback|: Text can be placed after any of the Tables of Thumbs, of course. \end{document} - \endinput %% %% End of file `thumbs-example.tex'. diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf Binary files differindex 561a6abbd75..cead746bc44 100644 --- a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf +++ b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.drv b/Master/texmf-dist/source/latex/thumbs/thumbs.drv index 20e9a160254..8a3c4658c05 100644 --- a/Master/texmf-dist/source/latex/thumbs/thumbs.drv +++ b/Master/texmf-dist/source/latex/thumbs/thumbs.drv @@ -9,12 +9,12 @@ %% This is a generated file. %% %% Project: thumbs -%% Version: 2011/10/19 v1.0j +%% Version: 2012/01/01 v1.0k %% -%% Copyright (C) 2010, 2011 by +%% Copyright (C) 2010 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> %% -%% The usual disclaimer applys: +%% The usual disclaimer applies: %% If it doesn't work right that's your problem. %% (Nevertheless, send an e-mail to the maintainer %% when you find an error in this package.) @@ -33,25 +33,26 @@ %% %% The Current Maintainer of this work is H.-Martin Muench. %% -%% This work consists of the main source file thumbs.dtx -%% and the derived files +%% This work consists of the main source file thumbs.dtx, +%% the README, and the derived files %% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, -%% thumbs-example.tex. +%% thumbs-example.tex, thumbs-example.pdf. %% -\NeedsTeXFormat{LaTeX2e}[2009/09/24] +\NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesFile{thumbs.drv}% - [2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)]% + [2012/01/01 v1.0k Thumb marks and overview page(s) (HMM)] \documentclass[landscape]{ltxdoc}[2007/11/11]% v2.0u \usepackage{geometry}[2010/09/12]% v5.6 \usepackage{holtxdoc}[2011/02/04]% v0.21 +\usepackage[maxfloats=20]{morefloats}[2011/07/10]% v1.0e %% thumbs may work with earlier versions of LaTeX2e and those %% class and packages, but this was not tested. %% Please consider updating your LaTeX, class, and packages %% to the most recent version (if they are not already the most %% recent version). \hypersetup{% - pdfsubject={Thumb marks and overwiew page(s) (HMM)},% - pdfkeywords={LaTeX, thumb, thumbs, thumb index, thumbs index, index, Hans-Martin Muench},% + pdfsubject={Thumb marks and overview page(s) (HMM)},% + pdfkeywords={LaTeX, thumb, thumbs, thumb index, thumbs index, index, H.-Martin Muench},% pdfencoding=auto,% pdflang={en},% breaklinks=true,% @@ -72,7 +73,6 @@ \begin{document} \DocInput{thumbs.dtx}% \end{document} - \endinput %% %% End of file `thumbs.drv'. diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.dtx b/Master/texmf-dist/source/latex/thumbs/thumbs.dtx index 6ca0f331788..b553720e610 100644 --- a/Master/texmf-dist/source/latex/thumbs/thumbs.dtx +++ b/Master/texmf-dist/source/latex/thumbs/thumbs.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment % % File: thumbs.dtx -% Version: 2011/10/19 v1.0j +% Version: 2012/01/01 v1.0k % -% Copyright (C) 2010, 2011 by +% Copyright (C) 2010 - 2012 by % H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> % % This work may be distributed and/or modified under the @@ -20,16 +20,19 @@ % % The Current Maintainer of this work is H.-Martin Muench. % -% This work consists of the main source file thumbs.dtx -% and the derived files -% thumbs.sty, thumbs.ins, thumbs.drv, -% thumbs-example.tex, thumbs.pdf. +% This work consists of the main source file thumbs.dtx, +% the README, and the derived files +% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, +% thumbs-example.tex, thumbs-example.pdf. % % Distribution: % CTAN:macros/latex/contrib/thumbs/thumbs.dtx % CTAN:macros/latex/contrib/thumbs/thumbs.pdf % CTAN:install/macros/latex/contrib/thumbs.tds.zip % +% Cf. http://ctan.org/pkg/thumbs and +% http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/thumbs.html +% % Unpacking: % (a) If thumbs.ins is present: % tex thumbs.ins @@ -62,6 +65,7 @@ % TDS:tex/latex/thumbs/thumbs.sty % TDS:doc/latex/thumbs/thumbs.pdf % TDS:doc/latex/thumbs/thumbs-example.tex +% TDS:doc/latex/thumbs/thumbs-example.pdf % TDS:source/latex/thumbs/thumbs.dtx % %<*ignore> @@ -77,10 +81,10 @@ %</ignore> %<*install> \input docstrip.tex -\Msg{*************************************************************************} -\Msg{* Installation} -\Msg{* Package: thumbs 2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)} -\Msg{*************************************************************************} +\Msg{**************************************************************************} +\Msg{* Installation *} +\Msg{* Package: thumbs 2012/01/01 v1.0k Thumb marks and overview page(s) (HMM)*} +\Msg{**************************************************************************} \keepsilent \askforoverwritefalse @@ -91,12 +95,12 @@ This is a generated file. Project: thumbs -Version: 2011/10/19 v1.0j +Version: 2012/01/01 v1.0k -Copyright (C) 2010, 2011 by +Copyright (C) 2010 - 2012 by H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> -The usual disclaimer applys: +The usual disclaimer applies: If it doesn't work right that's your problem. (Nevertheless, send an e-mail to the maintainer when you find an error in this package.) @@ -115,10 +119,10 @@ This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is H.-Martin Muench. -This work consists of the main source file thumbs.dtx -and the derived files +This work consists of the main source file thumbs.dtx, +the README, and the derived files thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, - thumbs-example.tex. + thumbs-example.tex, thumbs-example.pdf. \endpreamble \let\MetaPrefix\DoubleperCent @@ -139,7 +143,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* file into a directory searched by TeX:} \Msg{*} -\Msg{* thumbs.sty*} +\Msg{* thumbs.sty} \Msg{*} \Msg{* To produce the documentation run the file `thumbs.drv'} \Msg{* through (pdf)LaTeX, e.g.} @@ -167,26 +171,27 @@ and the derived files % The next bit of code contains the documentation driver file for % \TeX{}, i.\,e., the file that will produce the documentation you % are currently reading. It will be extracted from this file by the -% \texttt{docstrip} programme. That is, run \LaTeX\ on \texttt{docstrip} +% \texttt{docstrip} programme. That is, run \LaTeX{} on \texttt{docstrip} % and specify the \texttt{driver} option when \texttt{docstrip} % asks for options. % % \begin{macrocode} %<*driver> -\NeedsTeXFormat{LaTeX2e}[2009/09/24] +\NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesFile{thumbs.drv}% - [2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)]% + [2012/01/01 v1.0k Thumb marks and overview page(s) (HMM)] \documentclass[landscape]{ltxdoc}[2007/11/11]% v2.0u \usepackage{geometry}[2010/09/12]% v5.6 \usepackage{holtxdoc}[2011/02/04]% v0.21 +\usepackage[maxfloats=20]{morefloats}[2011/07/10]% v1.0e %% thumbs may work with earlier versions of LaTeX2e and those %% class and packages, but this was not tested. %% Please consider updating your LaTeX, class, and packages %% to the most recent version (if they are not already the most %% recent version). \hypersetup{% - pdfsubject={Thumb marks and overwiew page(s) (HMM)},% - pdfkeywords={LaTeX, thumb, thumbs, thumb index, thumbs index, index, Hans-Martin Muench},% + pdfsubject={Thumb marks and overview page(s) (HMM)},% + pdfkeywords={LaTeX, thumb, thumbs, thumb index, thumbs index, index, H.-Martin Muench},% pdfencoding=auto,% pdflang={en},% breaklinks=true,% @@ -212,7 +217,7 @@ and the derived files % % \fi % -% \CheckSum{2313} +% \CheckSum{2367} % % \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 @@ -249,33 +254,35 @@ and the derived files % % \DoNotIndex{\\} % \DoNotIndex{\documentclass,\usepackage,\ProvidesPackage,\begin,\end} +% \DoNotIndex{\MessageBreak} % \DoNotIndex{\NeedsTeXFormat,\DoNotIndex,\verb} % \DoNotIndex{\def,\edef,\gdef,\global} -% \DoNotIndex{\ifx,\kvoptions,\listfiles,\mathord,\mathrm,\ProcessKeyvalOptions} -% \DoNotIndex{\SetupKeyvalOptions} -% \DoNotIndex{\bigskip,\space,\thinspace,\Huge,\Large,\large,\linebreak,\MessageBreak} -% \DoNotIndex{\ldots,\indent,\noindent,\newline,\pagebreak,\pagenumbering} -% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textquotedblleft,\textquotedblright} +% \DoNotIndex{\ifx,\listfiles,\mathord,\mathrm} +% \DoNotIndex{\kvoptions,\SetupKeyvalOptions,\ProcessKeyvalOptions} +% \DoNotIndex{\bigskip,\space,\thinspace,\ldots} +% \DoNotIndex{\indent,\noindent,\newline,\linebreak,\pagebreak,\newpage} +% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textsc,\textquotedblleft,\textquotedblright} % \DoNotIndex{\plainTeX,\TeX,\LaTeX,\pdfLaTeX} % \DoNotIndex{\chapter,\section} -% \DoNotIndex{\arabic,\c@th@mbs@tmpA,\endcsname,\ifnum,\newpage,\setcounter,\advance} -% \DoNotIndex{\setlength,\the,\value,\textbackslash,\,} -% \DoNotIndex{\color,\copyright,\frac,\null,\thumbsinfo,\thumbsinfoa,\thumbsinfob} -% \DoNotIndex{\@PackageInfoNoLine,\addtocounter,\csname,\divide,\do,\empty} -% \DoNotIndex{\hspace,\thepage} +% \DoNotIndex{\Huge,\Large,\large} +% \DoNotIndex{\arabic,\the,\value,\ifnum,\setcounter,\addtocounter,\advance,\divide} +% \DoNotIndex{\setlength,\textbackslash,\,} +% \DoNotIndex{\csname,\endcsname,\color,\copyright,\frac,\null} +% \DoNotIndex{\@PackageInfoNoLine,\thumbsinfo,\thumbsinfoa,\thumbsinfob} +% \DoNotIndex{\hspace,\thepage,\do,\empty} % % \title{The \xpackage{thumbs} package} -% \date{2011/10/19 v1.0j} +% \date{2012/01/01 v1.0k} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}} % % \maketitle % % \begin{abstract} -% This \LaTeX\ package allows to create one or more customizable thumb index(es), -% providing a quick and easy reference methode for large documents. +% This \LaTeX{} package allows to create one or more customizable thumb index(es), +% providing a quick and easy reference method for large documents. % It must be loaded after the page size has been set, % when printing the document \textquotedblleft shrink to -% page\textquotedblright\ should not be used, and a printer capable of +% page\textquotedblright{} should not be used, and a printer capable of % printing up to the border of the sheet of paper is needed % (or afterwards cutting the paper). % \end{abstract} @@ -344,7 +351,7 @@ and the derived files % and by moving the thumb marks from the edge of the paper they no longer appear % at the side of the stack of paper. (Therefore e.\,g. for printing the example % file to A4 paper it is necessary to add |a4paper| option to the document class -% and recompile it! Then the thumb marks column change will occure at another +% and recompile it! Then the thumb marks column change will occur at another % point, of course.) It is also necessary to use a printer % capable of printing up to the border of the sheet of paper. Alternatively % it is possible after the printing to cut the paper to the right size. @@ -452,9 +459,9 @@ and the derived files % earlier place. Therefore automatically a |\phantomsection| is placed before each % thumb mark. But for example when using the thumb mark after a |\chapter{...}| % command, it is probably nicer to have the link point at the top of that chapter's -% title (instead of the line below it). When automatical placeing of the +% title (instead of the line below it). When automatical placing of the % |\phantomsection|s has been globally disabled, nevertheless manual use of -% |\phantomsection| is still possible. The other way round: When automatical placeing +% |\phantomsection| is still possible. The other way round: When automatical placing % of the |\phantomsection|s has \emph{not} been globally disabled, it can be disabled % just for the following thumb mark by the command |\thumbsnophantom|. % @@ -486,7 +493,7 @@ and the derived files % \DescribeMacro{draft} % \indent Option |draft| (\emph{not} the default) sets the thumb mark width to % $2\unit{pt}$, thumb mark text colour to black and thumb mark background colour -% to gray. Either do not use this option with the \xpackage{thumbs} package at all, +% to grey (|gray|). Either do not use this option with the \xpackage{thumbs} package at all, % or use |draft=false|, or |final|, or |final=true| to get the original appearance % of the thumb marks.\\ % @@ -507,10 +514,11 @@ and the derived files % \subsubsection{pagecolor (obsolete)\label{sss:pagecolor}} % \DescribeMacro{pagecolor} % \indent Option |pagecolor| is obsolete. Instead the \xpackage{pagecolor} -% package is used. Use |\pagecolor{...}| \emph{after} |\usepackage[...]{thumbs}| +% package is used.\\ +% Use |\pagecolor{...}| \emph{after} |\usepackage[...]{thumbs}| % and \emph{before} |\begin{document}| to define a background colour of the pages.\\ % -% \bigskip +% \medskip % % \subsection{Commands to be used in the document} % \subsubsection{\textbackslash addthumb} @@ -558,7 +566,7 @@ and the derived files % The commands |\thumbsoverview|, |\thumbsoverviewback|, |\thumbsoverviewverso|, and/or % |\thumbsoverviewdouble| is/are used to place the overview page(s) for the thumb marks. % Their single parameter is used to mark this page/these pages (e.\,g. in the page header). -% If these marks are not whished, |\thumbsoverview...{}| will generate empty marks in the +% If these marks are not wished, |\thumbsoverview...{}| will generate empty marks in the % page header(s). |\thumbsoverview| can be used more than once (for example at the % beginning and at the end of the document, or |\thumbsoverview| at the beginning and % |\thumbsoverviewback| at the end). The overviews have labels |TableOfThumbs1|, @@ -592,7 +600,7 @@ and the derived files % was not filled. This could be useful e.\,g. for a dictionary, which uses one column for % translations from language A to language B, and the second column for translations % from language B to language A. But in that case one probably should increase the -% size of the thumb marks, so that $26$~thumb marks (in~case of the latin alphabet) +% size of the thumb marks, so that $26$~thumb marks (in~case of the Latin alphabet) % fill one thumb column. Do not use |\thumbnewcolumn| on a page where |\addthumb| was % already used, but use |\addthumb| immediately after |\thumbnewcolumn|.\\ % @@ -607,7 +615,7 @@ and the derived files % % \subsubsection{\textbackslash thumbsnophantom} % \DescribeMacro{\thumbsnophantom} -% When automatical placeing of the |\phantomsection|s has \emph{not} been globally +% When automatical placing of the |\phantomsection|s has \emph{not} been globally % disabled by using option |nophantomsection| (see subsection~\ref{sss:nophantomsection}), % it can be disabled just for the following thumb mark by the command |\thumbsnophantom|. % @@ -700,15 +708,15 @@ and the derived files hyperindex=false,% pdflang={en},% pdftitle={thumbs package example},% - pdfauthor={Hans-Martin Muench},% + pdfauthor={H.-Martin Muench},% pdfsubject={Example for the thumbs package},% - pdfkeywords={LaTeX, thumbs, thumb marks, Hans-Martin Muench},% + pdfkeywords={LaTeX, thumbs, thumb marks, H.-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% - linktoc=all]{hyperref}[2011/10/01]% v6.82j + linktoc=all]{hyperref}[2011/12/04]% v6.82m \usepackage[thumblink=rule,linefill=dots,height={auto},minheight={47pt},% width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},% nophantomsection=false,ignorehoffset=true,ignorevoffset=true,final=true,% - hidethumbs=false,verbose=true]{thumbs}[2011/10/19]% v1.0j + hidethumbs=false,verbose=true]{thumbs}[2012/01/01]% v1.0k \nopagecolor% use \pagecolor{white} if \nopagecolor does not work \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% \makeatletter @@ -725,13 +733,13 @@ and the derived files \markboth{Example for thumbs}{Example for thumbs} This example demonstrates the most common uses of package -\textsf{thumbs}, v1.0j as of 2011/10/19 (HMM). +\textsf{thumbs}, v1.0k as of 2012/01/01 (HMM). The used options were \texttt{thumblink=rule}, \texttt{linefill=dots}, \texttt{height=auto}, \texttt{minheight=\{47pt\}}, \texttt{width={auto}}, \texttt{distance=\{2mm\}}, \newline \texttt{topthumbmargin=\{auto\}}, \texttt{bottomthumbmargin=\{auto\}}, \newline \texttt{nophantomsection=false}, -\texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, +\texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, \newline \texttt{final=true},\texttt{hidethumbs=false}, and \texttt{verbose=true}. \noindent These are the default options, except \texttt{verbose=true}. @@ -766,7 +774,7 @@ the thumb mark width would be automatically increased. For printing this example to another format of paper (e.\,g. A4) it is necessary to add the according option (e.\,g. \verb|a4paper|) to the document class and recompile it! (In that case the -thumb marks column change will occure at another point, of course.) +thumb marks column change will occur at another point, of course.) With paper format equal to document format the document can be printed without adapting the size, like e.\,g. \textquotedblleft shrink to page\textquotedblright . @@ -801,7 +809,7 @@ To include an overview page for the thumb marks, \addthumbsoverviewtocontents{section}{Thumb marks overview}% \thumbsoverview{Table of Thumbs} \end{verbatim} -is used, where \textbackslash addthumbsoverviewtocontents adds the thumb +is used, where \verb|\addthumbsoverviewtocontents| adds the thumb marks overview page to the table of contents. \smallskip @@ -811,7 +819,7 @@ to lead to the thumb mark and not to some earlier place. Therefore automatically a \verb|\phantomsection| is placed before each thumb mark. But for example when using the thumb mark after a \verb|\chapter{...}| command, it is probably nicer to have the link point at the top of that chapter's title (instead of the line -below it). The automatical placeing of the \verb|\phantomsection| can be disabled +below it). The automatical placing of the \verb|\phantomsection| can be disabled either globally by using option \texttt{nophantomsection}, or locally for the next thumb mark by the command \verb|\thumbsnophantom|. (When disabled globally, still manual use of \verb|\phantomsection| is possible.) @@ -885,7 +893,7 @@ The command \begin{verbatim} \stopthumb \end{verbatim} -was used here. Until another addthumb (with parameters) or +was used here. Until another \verb|\addthumb| (with parameters) or \begin{verbatim} \continuethumb \end{verbatim} @@ -990,7 +998,7 @@ You can, of course, keep the colour for more than one thumb mark. I am just adding further thumb marks. -If you are curiouse why the thumb mark between +If you are curious why the thumb mark between \textquotedblleft C mark\textquotedblright\ and \textquotedblleft E mark\textquotedblright\ has not been named \textquotedblleft D mark\textquotedblright\ but \textquotedblleft $1/1.\,955\,83$\, EUR\textquotedblright : @@ -1080,7 +1088,7 @@ The thumb marks are also too large - on purpose! This has been done to assure, that they cover the page up to its (paper) border, therefore they are placed a little bit over the paper margin. -Now I red somwhere in the net (should have remembered to note the url), +Now I red somewhere in the net (should have remembered to note the url), that white margins are presented, whenever there is some object outside of the page. Thus, it is a feature, not a bug?! What I do not understand: The same document sometimes is presented @@ -1119,7 +1127,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \section{The implementation} % -% We start off by checking that we are loading into \LaTeXe\ and +% We start off by checking that we are loading into \LaTeXe{} and % announcing the name and version of this package. % % \begin{macrocode} @@ -1127,9 +1135,9 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e}[2009/09/24]% recent: 2011/06/27 -\ProvidesPackage{thumbs}[2011/10/19 v1.0j - Thumb marks and overwiew page(s) (HMM)] +\NeedsTeXFormat{LaTeX2e}[2011/06/27] +\ProvidesPackage{thumbs}[2012/01/01 v1.0k + Thumb marks and overview page(s) (HMM)] % \end{macrocode} % @@ -1137,7 +1145,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \begin{macrocode} %% This package allows to create a customizable thumb index, -%% providing a quick and easy reference methode for large documents, +%% providing a quick and easy reference method for large documents, %% as well as an overview page. % \end{macrocode} @@ -1150,7 +1158,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % even reach the users. (Thus: Read the manual of the \xpackage{thumbs} package!) % The options for those packages might be changed by the user~-- I~did not % test all available options, thus first test, whether the document can be compiled -% with these options, and then try to change them according to your whishes. +% with these options, and then try to change them according to your wishes. % % \begin{macrocode} \IfFileExists{tcilatex.tex}{% @@ -1208,12 +1216,13 @@ Text can be placed after any of the Tables of Thumbs, of course. % the \xpackage{undolabl} package, which is needed for |\overridelabel|: % % \begin{macrocode} -\RequirePackage{pageslts}[2011/08/08]% v1.2a -\RequirePackage{pagecolor}[2011/08/08]% v1.0c +\RequirePackage{pageslts}[2011/08/08]% v1.2a +\RequirePackage{pagecolor}[2011/08/08]% v1.0c \RequirePackage{rerunfilecheck}[2011/04/15]% v1.7 -\RequirePackage{infwarerr}[2010/04/08]% v1.3 -\RequirePackage{atveryend}[2011/04/23]% v1.7, -%% v1.8 would be needed but is currently (2011/10/19) not available at CTAN yet +\RequirePackage{infwarerr}[2010/04/08]% v1.3 +\RequirePackage{atveryend}[2011/04/23]% v1.7 +%% \RequirePackage{atveryend}[2011/06/30]% v1.8 +%% would be needed but is currently (2012/01/01) not available at CTAN yet % \end{macrocode} % % A last information for the user: @@ -1227,6 +1236,55 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % See subsection~\ref{ss:Downloads} about how to get them.\\ % +% \LaTeXe{} 2011/06/27 changed the |\enddocument| command and thus +% broke the \xpackage{atveryend} package, which was then fixed. +% If new \LaTeXe{} and old \xpackage{atveryend} are combined, +% |\AtVeryVeryEnd| will never be called. +% |\@ifl@t@r\fmtversion| is from |\@needsf@rmat| as in\\ +% \texttt{File L: ltclass.dtx Date: 2007/08/05 Version v1.1h}, line~259,\\ +% of The \LaTeXe{} Sources\\ +% by \textsc{Johannes Braams, David Carlisle, Alan Jeffrey, Leslie Lamport,% +% Frank Mittelbach, Chris Rowley, and Rainer Sch\"{o}pf},\\ +% as of 2011/06/27, p.~464. +% +% \pagebreak +% +% \begin{macrocode} +\@ifl@t@r\fmtversion{2011/06/27}% or possibly even newer +{\@ifpackagelater{atveryend}{2011/06/29}% + {% 2011/06/30, v1.8, or even more recent: OK + }{% else: older package version, no \AtVeryVeryEnd + \PackageWarningNoLine{thumbs}{% + LaTeX 2011/06/27 has changed \string\enddocument\space and thus broken the\MessageBreak% + \string\AtVeryVeryEnd\space command/hooking of atveryend package as of\MessageBreak% + 2011/04/23, v1.7. New package version 2011/06/30, v1.8, works with\MessageBreak% + the new LaTeX format, but some older package version was loaded.\MessageBreak% + (As of 2012/01/01, the new version is NOT available at CTAN yet.)\MessageBreak% + For fixing this problem until the update is available,\MessageBreak% + \string\let\string\AtVeryVeryEnd\string\AtEndAfterFileList\MessageBreak% + is used now, fingers crossed.% + }% + \let\AtVeryVeryEnd\AtEndAfterFileList% + \RequirePackage{ltxcmds}[2011/04/18]% v1.20, for \ltx@firstofone + \AtEndAfterFileList{% if there is \AtVeryVeryEnd inside \AtEndAfterFileList + \let\AtEndAfterFileList\ltx@firstofone% + } + } +}{% else: older fmtversion: OK +% \end{macrocode} +% +% In this case the used \TeX{} format is outdated, but when\\ +% |\NeedsTeXFormat{LaTeX2e}[2011/06/27]|\\ +% is executed at the beginning of \xpackage{regstats} package, +% the appropriate warning message is issued automatically. +% (And \xpackage{regstats} should also work with older versions, +% I~used it with a 2003/12/01 version myself.) +% +% \begin{macrocode} +} + +% \end{macrocode} +% % The options are introduced: % % \begin{macrocode} @@ -1251,7 +1309,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \DescribeMacro{pagecolor} % The |pagecolor| option is obsolete now, but for compatibility with older -% documents we still provide it at the time beeing (might be removed +% documents we still provide it at the time being (might be removed % in future versions). % % \begin{macrocode} @@ -1390,28 +1448,14 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% We create a new |Box| for the thumbs, a~temporary counter and make some -% global definitions. +% We create a new |Box| for the thumbs and make some global definitions. % % \begin{macrocode} \newbox\ThumbsBox -% \end{macrocode} -% -% Generally it is not necessary to initialise a counter, because this is done -% automatically. But some packages change the handling of counters -% (e.\,g.~the \xpackage{localloc} package as of 1995/09/24, v1.1b), and then -% a~new counter might have a value different from zero (or the register might -% even contain something which is not a number value at all but some other -% string). -% -% \begin{macrocode} -\newcounter{th@mbs@tmpA} -\setcounter{th@mbs@tmpA}{0} - \gdef\th@mbs{0} \gdef\th@mbsmax{0} -\gdef\th@umbsperpage{0}% will be set via aux file +\gdef\th@umbsperpage{0}% will be set via .aux file \gdef\th@umbsperpagecount{0} \gdef\th@mbtitle{} @@ -1471,8 +1515,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \advance\th@mbheighty+\headsep \advance\th@mbheighty+\textheight \advance\th@mbheighty+\footskip - \setcounter{th@mbs@tmpA}{\th@mbsmax} - \ifnum\value{th@mbs@tmpA}>1 + \@tempcnta=\th@mbsmax\relax + \ifnum\@tempcnta>1 \divide\th@mbheighty\th@mbsmax \fi \advance\th@mbheighty-\th@mbsdistance @@ -1498,13 +1542,13 @@ Text can be placed after any of the Tables of Thumbs, of course. \gdef\th@bmsvoffset{\voffset} \fi \xdef\th@mbpaperwidth{\the\paperwidth} - \setlength{\th@mbposyA}{1pt} - \ifdim \thumbs@minheight < \th@mbposyA% too small + \setlength{\@tempdima}{1pt} + \ifdim \thumbs@minheight < \@tempdima% too small \setlength{\thumbs@minheight}{1pt} \else - \ifdim \thumbs@minheight = \th@mbposyA% small, but ok + \ifdim \thumbs@minheight = \@tempdima% small, but ok \else - \ifdim \thumbs@minheight > \th@mbposyA% ok + \ifdim \thumbs@minheight > \@tempdima% ok \else \PackageError{thumbs}{Option minheight has invalid value}{% Please use a number and a length unit (e.g. mm, cm, pt)\MessageBreak% @@ -1517,21 +1561,17 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi \fi \fi - \setlength{\th@mbposyA}{\thumbs@minheight} + \setlength{\@tempdima}{\thumbs@minheight} % \end{macrocode} % -% This should be a temporary dimension, but we do not want to waste -% a~|newdimension|, and |\th@mbposyA| is not used here yet and -% will be set later.\\ -% % Thumb height |\th@mbheighty| is treated. If the value is empty, -% it is set to |\th@mbposyA|, which was just defined to be $47\unit{pt}$ -% (by default, or to the value choosen by the user with package option +% it is set to |\@tempdima|, which was just defined to be $47\unit{pt}$ +% (by default, or to the value chosen by the user with package option % |minheight={...}|): % % \begin{macrocode} \ifx\thumbs@height\empty% - \setlength{\th@mbheighty}{\th@mbposyA} + \setlength{\th@mbheighty}{\@tempdima} \else \def\th@mbstest{auto} \ifx\thumbs@height\th@mbstest% @@ -1549,7 +1589,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \begin{macrocode} \ifdim \th@mbheighty < \thumbs@minheight - \PackageWarningNoLine{thumbs}{Thumbs not high enought:\MessageBreak% + \PackageWarningNoLine{thumbs}{Thumbs not high enough:\MessageBreak% Option height has value 'auto'. For \th@mbsmax\space thumbs per page\MessageBreak% this results in a thumb height of \the\th@mbheighty.\MessageBreak% This is lower than the minimal thumb height, \thumbs@minheight,\MessageBreak% @@ -1558,7 +1598,7 @@ Text can be placed after any of the Tables of Thumbs, of course. for option 'minheight'% } \setlength{\th@mbheighty}{\z@} - \advance\th@mbheighty+\th@mbposyA% = \thumbs@minheight + \advance\th@mbheighty by \@tempdima% = \thumbs@minheight \fi \else % \end{macrocode} @@ -1601,7 +1641,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \setlength{\th@mbwidthx}{\paperwidth} \advance\th@mbwidthx-\textwidth \divide\th@mbwidthx4 - \setlength{\th@mbposyA}{0sp} + \setlength{\@tempdima}{0sp} \ifx\thumbs@width\empty% \else \def\th@mbstest{auto} @@ -1628,10 +1668,10 @@ Text can be placed after any of the Tables of Thumbs, of course. \setlength{\th@mbwidthx}{\th@mbmaxwidtha} }%\fi \else - \ifdim \thumbs@width > \th@mbposyA% OK + \ifdim \thumbs@width > \@tempdima% OK \setlength{\th@mbwidthx}{\thumbs@width} \else - \PackageError{thumbs}{Thumbs not wide enought}{% + \PackageError{thumbs}{Thumbs not wide enough}{% Option width has value '\thumbs@width'.\MessageBreak% This is not a valid dimension larger than zero.\MessageBreak% Width will be set automatically.\MessageBreak% @@ -1651,7 +1691,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % Setting the position of the first/top thumb mark. Vertical (y) position -% is a little bit complicated, because option |\thumbs@topthumbmargin| must be handeled: +% is a little bit complicated, because option |\thumbs@topthumbmargin| must be handled: % % \begin{macrocode} % Thumb position x \th@mbposx @@ -1673,8 +1713,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \advance\th@mbposy-\th@mbsdistance \advance\th@mbposy+\th@mbheighty \else - \setlength{\th@mbposyA}{-1pt} - \ifdim \thumbs@topthumbmargin > \th@mbposyA% OK + \setlength{\@tempdima}{-1pt} + \ifdim \thumbs@topthumbmargin > \@tempdima% OK \else \PackageWarning{thumbs}{Thumbs column starting too high.\MessageBreak% Option topthumbmargin has value '\thumbs@topthumbmargin'.\MessageBreak% @@ -1696,8 +1736,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi % \end{macrocode} % -% \pagebreak -% % Setting the lowest position of a thumb mark, according to option |\thumbs@bottomthumbmargin|: % % \begin{macrocode} @@ -1721,29 +1759,34 @@ Text can be placed after any of the Tables of Thumbs, of course. \advance\th@mbposybottom-\th@mbsdistance \advance\th@mbposybottom-\th@mbheighty \else - \setlength{\th@mbposyA}{\paperheight} - \advance\th@mbposyA-\thumbs@bottomthumbmargin - \advance\th@mbposyA-\th@mbposytop - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-\th@mbheighty - \advance\th@mbposyA-\th@mbsdistance - \ifdim \th@mbposyA > 0sp%ok +% \end{macrocode} +% +% \pagebreak +% +% \begin{macrocode} + \setlength{\@tempdima}{\paperheight} + \advance\@tempdima by -\thumbs@bottomthumbmargin + \advance\@tempdima by -\th@mbposytop + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -\th@mbheighty + \advance\@tempdima by -\th@mbsdistance + \ifdim \@tempcnta > 0sp \relax \else - \setlength{\th@mbposyA}{\paperheight} - \advance\th@mbposyA-\th@mbposytop - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-\th@mbheighty - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-1pt + \setlength{\@tempdima}{\paperheight} + \advance\@tempdima by -\th@mbposytop + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -\th@mbheighty + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -1pt \PackageWarning{thumbs}{Thumbs column ending too high.\MessageBreak% Option bottomthumbmargin has value '\thumbs@bottomthumbmargin'.\MessageBreak% - bottomthumbmargin will be set to '\the\th@mbposyA'.\MessageBreak% + bottomthumbmargin will be set to '\the\@tempdima'.\MessageBreak% } - \xdef\thumbs@bottomthumbmargin{\the\th@mbposyA} + \xdef\thumbs@bottomthumbmargin{\the\@tempdima} \fi - \setlength{\th@mbposyA}{\thumbs@bottomthumbmargin} + \setlength{\@tempdima}{\thumbs@bottomthumbmargin} \setlength{\@tempdimc}{-1pt} - \ifdim \th@mbposyA < \@tempdimc% + \ifdim \@tempdima < \@tempdimc% \PackageWarning{thumbs}{Thumbs column ending too low.\MessageBreak% Option bottomthumbmargin has value '\thumbs@bottomthumbmargin'.\MessageBreak% bottomthumbmargin will be set to -1pt.\MessageBreak% @@ -1755,7 +1798,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi \ifthumbs@verbose% \setlength{\@tempdimc}{\paperheight} - \advance\@tempdimc-\th@mbposybottom + \advance\@tempdimc by -\th@mbposybottom \edef\thumbsinfo{\the\@tempdimc} \@PackageInfoNoLine{thumbs}{The bottom thumb margin is \thumbsinfo} \@PackageInfoNoLine{thumbs}{**********************************************} @@ -1763,14 +1806,13 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi % \end{macrocode} % -% |\th@mbposyA| is no longer used as temporary dimension here, but set to the top-most -% vertical thumb position~(y). Because it will be increased (i.\,e.~the thumb positions -% will move downwards on the page), |\th@mbsposytocyy| is used to remember this position -% unchanged. +% |\th@mbposyA| is set to the top-most vertical thumb position~(y). Because it will be increased +% (i.\,e.~the thumb positions will move downwards on the page), |\th@mbsposytocyy| is used +% to remember this position unchanged. % % \begin{macrocode} - \advance\th@mbposy-\th@mbheighty% because it will be advanced also for the first thumb - \setlength{\th@mbposyA}{\th@mbposy}% \th@mbposyA will change. + \advance\th@mbposy-\th@mbheighty% because it will be advanced also for the first thumb + \setlength{\th@mbposyA}{\th@mbposy}% \th@mbposyA will change. \setlength{\th@mbsposytocyy}{\th@mbposy}% \th@mbsposytocyy shall not be changed. } @@ -1801,13 +1843,12 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak % \DescribeMacro{\thumbnewcolumn} % With the command |\thumbnewcolumn| a new column can be started, even if the current one % was not filled. This could be useful e.\,g. for a dictionary, which uses one column for % translations from language~A to language~B, and the second column for translations % from language~B to language~A. But in that case one probably should increase the -% size of the thumb marks, so that $26$~thumb marks (in~case of the latin alphabet) +% size of the thumb marks, so that $26$~thumb marks (in~case of the Latin alphabet) % fill one thumb column. Do not use |\thumbnewcolumn| on a page where |\addthumb| was % already used, but use |\addthumb| immediately after |\thumbnewcolumn|. % @@ -1815,9 +1856,12 @@ Text can be placed after any of the Tables of Thumbs, of course. \newcommand{\thumbnewcolumn}{% \ifx\th@mbtoprint\pagesLTS@one% \PackageError{thumbs}{\string\thumbnewcolumn\space after \string\addthumb }{% - On page \thepage\space (approx.) \string\addthumb\space was used and *afterwards* \string\thumbnewcolumn .\MessageBreak% - When you want to use \string\thumbnewcolumn , do not use an \string\addthumb\space on the same\MessageBreak% - page before \string\thumbnewcolumn . Thus, either remove the \string\addthumb , or use a\MessageBreak% + On page \thepage\space (approx.) \string\addthumb\space was used and *afterwards* % + \string\thumbnewcolumn .\MessageBreak% + When you want to use \string\thumbnewcolumn , do not use an \string\addthumb\space % + on the same\MessageBreak% + page before \string\thumbnewcolumn . Thus, either remove the \string\addthumb , % + or use a\MessageBreak% \string\pagebreak , \string\newpage\space etc. before \string\thumbnewcolumn .\MessageBreak% (And remember to use an \string\addthumb\space*after* \string\thumbnewcolumn .)\MessageBreak% Your command \string\thumbnewcolumn\space will be ignored now.% @@ -1857,8 +1901,6 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \DescribeMacro{\thumbsnophantom} % To locally disable the setting of a |\phantomsection| before a thumb mark, % the command |\thumbsnophantom| is provided. (But at first it is not disabled.) @@ -1892,11 +1934,13 @@ Text can be placed after any of the Tables of Thumbs, of course. \gdef\th@mbcolumn{1}% \fi% \fi% - \setcounter{th@mbs@tmpA}{\th@mbs}% - \addtocounter{th@mbs@tmpA}{+1}% - \xdef\th@mbs{\arabic{th@mbs@tmpA}}% + \@tempcnta=\th@mbs\relax% + \advance\@tempcnta by 1% + \xdef\th@mbs{\the\@tempcnta}% % \end{macrocode} % +% \pagebreak +% % The |\addthumb| command has four parameters: % \begin{enumerate} % \item a title for the thumb mark (for the thumb marks overview page, @@ -1917,29 +1961,27 @@ Text can be placed after any of the Tables of Thumbs, of course. \gdef\th@mbbackgroundcolour{#4}% % \end{macrocode} % -% The width of the thumb mark text is dtermined and compared to the width of the +% The width of the thumb mark text is determined and compared to the width of the % thumb mark (rule). When the text is wider than the rule, this has to be changed % (either automatically with option |width={autoauto}| in the next compilation run % or manually by changing |width={|\ldots|}| by the user). % % \begin{macrocode} - \edef\th@mbstmpwidth{\the\th@mbposyA}% - \settowidth{\th@mbposyA}{\th@mbtext\space}% - \ifdim\th@mbposyA>\th@mbmaxwidth% - \xdef\th@mbmaxwidth{\the\th@mbposyA}% + \settowidth{\@tempdima}{\th@mbtext\space}% + \ifdim\@tempdima>\th@mbmaxwidth% + \xdef\th@mbmaxwidth{\the\@tempdima}% \fi% - \ifdim\th@mbposyA>\th@mbwidthx% + \ifdim\@tempdima>\th@mbwidthx% \ifthumbs@draft% \relax \else% \edef\thumbsinfoa{\the\th@mbwidthx} - \edef\thumbsinfob{\the\th@mbposyA} + \edef\thumbsinfob{\the\@tempdima} \PackageWarning{thumbs}{% Thumb mark too small (width: \thumbsinfoa )\MessageBreak% or its text too wide (width: \thumbsinfob )\MessageBreak% }% \fi% \fi% - \setlength{\th@mbposyA}{\th@mbstmpwidth}% % \end{macrocode} % % |\@ifpackageloaded| cannot be used after |\AtBeginDocument|, so here @@ -1961,6 +2003,11 @@ Text can be placed after any of the Tables of Thumbs, of course. }{% hyperref loaded \ifthumbs@nophantomsection% \relax \else% +% \end{macrocode} +% +% \pagebreak +% +% \begin{macrocode} \ifx\th@mbsphantom\pagesLTS@one% \phantomsection% \else% @@ -1990,9 +2037,9 @@ Text can be placed after any of the Tables of Thumbs, of course. % \begin{macrocode} \ifx\th@mbcolumnnew\pagesLTS@one% \else% - \setcounter{th@mbs@tmpA}{\th@mbonpage}% - \addtocounter{th@mbs@tmpA}{+1}% - \xdef\th@mbonpage{\arabic{th@mbs@tmpA}}% + \@tempcnta=\th@mbonpage\relax% + \advance\@tempcnta by 1% + \xdef\th@mbonpage{\the\@tempcnta}% \fi% \ifx\th@mbtoprint\pagesLTS@zero% \else% @@ -2000,7 +2047,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \PackageWarning{thumbs}{More than one thumb at one page:\MessageBreak% You placed more than one thumb mark (at least \th@mbonpage)\MessageBreak% on page \thepage \space (page is approximately).\MessageBreak% - Maybe insert a pagebreak?\MessageBreak% + Maybe insert a page break?\MessageBreak% }% \fi% \fi% @@ -2014,23 +2061,23 @@ Text can be placed after any of the Tables of Thumbs, of course. \setlength{\th@mbposyA}{\th@mbposy}% \else% \ifx\th@mbcolumnnew\pagesLTS@zero% - \setcounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% - \@whilenum\th@mbonpagetest<\th@mbonpage\do{% - \addtocounter{th@mbs@tmpA}{1}% - \xdef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% - \ifnum\th@mbonpage=\th@mbonpagetest% - \ifnum\th@mbonpagemax<\th@mbonpage% - \xdef\th@mbonpagemax{\th@mbonpage}% - \fi% - \edef\th@mbtmpdef{\csname th@mbtext\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#2}% - \edef\th@mbtmpdef{\csname th@mbtextcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#3}% - \edef\th@mbtmpdef{\csname th@mbbackgroundcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#4}% - \fi% - }% + \@tempcnta=1\relax% + \edef\th@mbonpagetest{\the\@tempcnta}% + \@whilenum\th@mbonpagetest<\th@mbonpage\do{% + \advance\@tempcnta by 1% + \xdef\th@mbonpagetest{\the\@tempcnta}% + \ifnum\th@mbonpage=\th@mbonpagetest% + \ifnum\th@mbonpagemax<\th@mbonpage% + \xdef\th@mbonpagemax{\th@mbonpage}% + \fi% + \edef\th@mbtmpdef{\csname th@mbtext\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#2}% + \edef\th@mbtmpdef{\csname th@mbtextcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#3}% + \edef\th@mbtmpdef{\csname th@mbbackgroundcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#4}% + \fi% + }% \else% \ifnum\th@mbonpagemax<\th@mbonpage% \xdef\th@mbonpagemax{\th@mbonpage}% @@ -2064,6 +2111,8 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % +% \pagebreak +% % \DescribeMacro{\thumbcontents} % The \textbf{internal} command |\thumbcontents| (which will be read in from the % |\jobname.tmb| file) creates a thumb mark entry on the overview page(s). @@ -2081,7 +2130,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \item the label where it should hyperlink to % -% \item and an indicator, whether |\thumbnewcolumn| is just issueing blank thumbs +% \item and an indicator, whether |\thumbnewcolumn| is just issuing blank thumbs % to fill a column % \end{enumerate} % (parameters in this order). Without \xpackage{hyperref} the $6^ \textrm{th} $ parameter @@ -2095,11 +2144,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \setlength{\th@mbposy}{\th@mbposytop}% \advance\th@mbposy\th@mbsdistance% \fi% -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \def\th@mb@tmp@title{#1}% \def\th@mb@tmp@text{#2}% \def\th@mb@tmp@textcolour{#3}% @@ -2136,14 +2180,14 @@ Text can be placed after any of the Tables of Thumbs, of course. \begin{picture}(0,0)% % \end{macrocode} % -% When the option |thumblink=rule| was choosen, the whole rule is made into a hyperlink. +% When the option |thumblink=rule| was chosen, the whole rule is made into a hyperlink. % Otherwise the rule is created without hyperlink (here). % % \begin{macrocode} \def\th@mbstest{rule}% \ifx\thumbs@thumblink\th@mbstest% \ifx\th@mb@tmp@column\pagesLTS@zero% - {\color{\th@mb@tmp@backgroundcolour}\hyperref[\th@mb@tmp@label]{\rule{\th@mbwidthxtoc}{\th@mbheighty}}}% + {\color{\th@mb@tmp@backgroundcolour}\hyperref[\th@mb@tmp@label]{\rule{\th@mbwidthxtoc}{\th@mbheighty}}}% \else% % \end{macrocode} % @@ -2158,8 +2202,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \end{picture}% % \end{macrocode} % -% \pagebreak -% % When |\th@mbsprintpage| is |l|, before the picture |\th@mbwidthxtoc| was changed, % which must be reverted now. % @@ -2190,6 +2232,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi% % \end{macrocode} % +% \pagebreak +% % Depending on which side the thumb marks should be placed the % according dimensions have to be adapted here, too. % @@ -2213,8 +2257,6 @@ Text can be placed after any of the Tables of Thumbs, of course. {\hsize=\th@mbwidthxtoc {% % \end{macrocode} % -% \pagebreak -% % Depending on the value of option |thumblink|, parts of the text are made into hyperlinks: % \begin{description} % \item[- |none|] creates \emph{none} hyperlink @@ -2385,8 +2427,6 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \DescribeMacro{\AtBeginShipout} % |\AtBeginShipoutUpperLeft| calls the |\th@mbprint| macro for each thumb mark % which shall be placed on that page. @@ -2407,8 +2447,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \space until \string\addthumb\space is used.)\MessageBreak% }% \fi% - \setcounter{th@mbs@tmpA}{\value{CurrentPage}}% - \addtocounter{th@mbs@tmpA}{-1}% because CurrentPage is already the one of the next page + \@tempcnta=\value{CurrentPage}\relax% + \advance\@tempcnta by -1% because CurrentPage is already the one of the next page % \end{macrocode} % % Changing the paper size mid-document will probably cause some problems. @@ -2436,7 +2476,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \begin{macrocode} \def\th@mbxpos{\th@mbposx}% - \ifodd\c@th@mbs@tmpA% \relax + \ifodd\@tempcnta% \relax \else% \if@twoside% \ifthumbs@ignorehoffset% @@ -2454,15 +2494,15 @@ Text can be placed after any of the Tables of Thumbs, of course. \AtBeginShipoutUpperLeft{% \ifx\th@mbprinting\pagesLTS@one% \th@mbprint{\th@mbtextA}{\th@mbtextcolourA}{\th@mbbackgroundcolourA}% - \setcounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% + \@tempcnta=1\relax% + \edef\th@mbonpagetest{\the\@tempcnta}% \@whilenum\th@mbonpagetest<\th@mbonpage\do{% - \addtocounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% + \advance\@tempcnta by 1% + \edef\th@mbonpagetest{\the\@tempcnta}% \th@mb@yA% - \def\th@mbtmpdeftext{\csname th@mbtext\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \def\th@mbtmpdefcolour{\csname th@mbtextcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \def\th@mbtmpdefbackgroundcolour{\csname th@mbbackgroundcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% + \def\th@mbtmpdeftext{\csname th@mbtext\AlphAlph{\the\@tempcnta}\endcsname}% + \def\th@mbtmpdefcolour{\csname th@mbtextcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \def\th@mbtmpdefbackgroundcolour{\csname th@mbbackgroundcolour\AlphAlph{\the\@tempcnta}\endcsname}% \th@mbprint{\th@mbtmpdeftext}{\th@mbtmpdefcolour}{\th@mbtmpdefbackgroundcolour}% }% \fi% @@ -2472,8 +2512,8 @@ Text can be placed after any of the Tables of Thumbs, of course. % only the last issued thumb mark shall appear. % % \begin{macrocode} - \setcounter{th@mbs@tmpA}{\th@mbonpage}% - \ifnum\value{th@mbs@tmpA}<2% \relax + \@tempcnta=\th@mbonpage\relax% + \ifnum\@tempcnta<2% \relax \else% \gdef\th@mbtextA{\th@mbtext}% \gdef\th@mbtextcolourA{\th@mbtextcolour}% @@ -2488,7 +2528,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % \DescribeMacro{\AfterLastShipout} -% |\AfterLastShipout| is executed after the last page has been shiped out. +% |\AfterLastShipout| is executed after the last page has been shipped out. % It is still possible to e.\,g. write to the \xfile{aux} file at this time. % % \begin{macrocode} @@ -2497,7 +2537,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \else \PackageWarningNoLine{thumbs}{% Still missing \string\addthumb\space after \string\thumbnewcolumn\space after\MessageBreak% - last shipout: Command \string\thumbnewcolumn\space was used,\MessageBreak% + last ship-out: Command \string\thumbnewcolumn\space was used,\MessageBreak% but no new thumb placed with \string\addthumb\space anywhere in the\MessageBreak% rest of the document. Starting a new column of thumb\MessageBreak% marks and not putting a thumb mark into that column\MessageBreak% @@ -2553,8 +2593,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \expandafter\newwrite\csname tf@tmb\endcsname % \end{macrocode} % -% \pagebreak -% % And a rerun check is performed: Did the |\jobname.tmb| file change? % % \begin{macrocode} @@ -2663,7 +2701,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % % The |\thumbsoverview...| commands are used to place the overview page(s) % for the thumb marks. Their parameter is used to mark this page/these pages -% (e.\,g. in the page header). If these marks are not whished, +% (e.\,g. in the page header). If these marks are not wished, % |\thumbsoverview...{}| will generate empty marks in the page header(s). % |\thumbsoverview...| can be used more than once (for example at the % beginning and at the end of the document). The overviews have labels @@ -2683,8 +2721,6 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \DescribeMacro{\thumbsoverviewprint} % |\thumbsoverviewprint| works by calling the internal command |\th@mbs@verview| % (see below), repeating this until all thumb marks have been processed. @@ -2727,6 +2763,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi% % \end{macrocode} % +% \pagebreak +% % Option |\thumbs@thumblink| is checked for a valid and resonable value here. % % \begin{macrocode} @@ -2774,7 +2812,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % When the thumb overview is printed and there is already a thumb mark set, -% for example for the frontmatter (e.\,g. title page, bibliographic information, +% for example for the front-matter (e.\,g. title page, bibliographic information, % acknowledgements, dedication, preface, abstract, tables of content, tables, % and figures, lists of symbols and abbreviations, and the thumbs overview itself, % of course) or when the overview is placed near the end of the document, @@ -2831,6 +2869,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \let\glossary\@gobble% % \end{macrocode} % +% \pagebreak +% % Some preparation in case of double printing the overview page(s): % % \begin{macrocode} @@ -2902,9 +2942,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \null% \th@mbs@verview% \pagebreak% -% \end{macrocode} -% \pagebreak -% \begin{macrocode} \ifthumbs@verbose% \message{THUMBS: Fileline: \arabic{FileLine}, a: \arabic{th@mblinea}, % b: \arabic{th@mblineb}, per page: \th@umbsperpage, max: \th@mbsmax.^^J}% @@ -2963,7 +3000,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \begin{macrocode} \newcommand{\th@mbs@verview}{% \ifthumbs@verbose% - \message{^^JPackage thumbs Info: Processing line \arabic{th@mblinea} to \arabic{th@mblineb} of \jobname.tmb.}% + \message{^^JPackage thumbs Info: Processing line \arabic{th@mblinea} to \arabic{th@mblineb} of \jobname.tmb.}% \fi% \setcounter{FileLine}{1}% \AtBeginShipoutNext{% @@ -3032,9 +3069,9 @@ Text can be placed after any of the Tables of Thumbs, of course. % \begin{macrocode} \addtocounter{th@mblinea}{\th@umbsperpage}% \addtocounter{th@mblineb}{\th@umbsperpage}% - \setcounter{th@mbs@tmpA}{\th@mbsmax}% - \ifnum \value{th@mblineb}>\value{th@mbs@tmpA} - \setcounter{th@mblineb}{\value{th@mbs@tmpA}}% + \@tempcnta=\th@mbsmax\relax% + \ifnum \value{th@mblineb}>\@tempcnta\relax% + \setcounter{th@mblineb}{\@tempcnta}% \fi% }{% else % \end{macrocode} @@ -3058,6 +3095,8 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % +% \pagebreak +% % When we are in |draft| mode, the thumb marks are % \textquotedblleft de-coloured\textquotedblright{}, % their width is reduced, and a warning is given. @@ -3078,10 +3117,8 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % When we are in |hidethumbs| mode, there are no thumb marks -% and therefore neither any thumb mark overview page. A warning is given. +% and therefore neither any thumb mark overview page. A~warning is given. % % \begin{macrocode} \ifthumbs@hidethumbs @@ -3109,44 +3146,65 @@ Text can be placed after any of the Tables of Thumbs, of course. % but may need additional packages themselves.\\ % % \DescribeMacro{thumbs.dtx} -% For unpacking the |thumbs.dtx| file and constructing the documentation it is required: +% For unpacking the |thumbs.dtx| file and constructing the documentation +% it is required: % \begin{description} -% \item[-] \TeX Format \LaTeXe: \url{http://www.CTAN.org/} +% \item[-] \TeX Format \LaTeXe{}, \url{http://www.CTAN.org/} +% +% \item[-] document class \xclass{ltxdoc}, 2007/11/11, v2.0u, +% \url{http://ctan.org/pkg/ltxdoc} % -% \item[-] document class \textsf{ltxdoc}, 2007/11/11, v2.0u, \CTAN{macros/latex/base/ltxdoc.dtx} +% \item[-] package \xpackage{geometry}, 2010/09/12, v5.6, +% \url{http://ctan.org/pkg/geometry} % -% \item[-] package \xpackage{geometry}, 2010/09/12, v5.6, \CTAN{macros/latex/contrib/geometry/geometry.dtx} +% \item[-] package \xpackage{holtxdoc}, 2011/02/04, v0.21, +% \url{http://ctan.org/pkg/holtxdoc} % -% \item[-] package \xpackage{holtxdoc}, 2011/02/04, v0.21, \CTAN{macros/latex/contrib/oberdiek/holtxdoc.dtx} +% \item[-] package \xpackage{morefloats}, 2011/07/10, v1.0e, +% \url{http://ctan.org/pkg/morefloats} % -% \item[-] package \xpackage{hypdoc}, 2010/03/26, v1.9, \CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx} +% \item[-] package \xpackage{hypdoc}, 2010/03/26, v1.9, +% \url{http://ctan.org/pkg/hypdoc} % \end{description} % % \DescribeMacro{thumbs.sty} -% The \texttt{thumbs.sty} for \LaTeXe\ (i.\,e. all documents using +% The |thumbs.sty| for \LaTeXe{} (i.\,e. each document using % the \xpackage{thumbs} package) requires: % \begin{description} -% \item[-] \TeX Format \LaTeXe, \url{http://www.CTAN.org/} +% \item[-] \TeX{} Format \LaTeXe{}, \url{http://www.CTAN.org/} % -% \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11, \CTAN{macros/latex/contrib/xcolor/xcolor.dtx} +% \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11, +% \url{http://ctan.org/pkg/xcolor} % -% \item[-] package \xpackage{pageslts}, 2011/08/08, v1.2a, \CTAN{macros/latex/contrib/pageslts/pagesLTS.dtx} +% \item[-] package \xpackage{pageslts}, 2011/08/08, v1.2a, +% \url{http://ctan.org/pkg/pageslts} % -% \item[-] package \xpackage{pagecolor}, 2011/08/08, v1.0c, \CTAN{macros/latex/contrib/pagecolor/pagecolor.dtx} +% \item[-] package \xpackage{pagecolor}, 2011/08/08, v1.0c, +% \url{http://ctan.org/pkg/pagecolor} % -% \item[-] package \xpackage{alphalph}, 2010/04/18, v2.3, \CTAN{macros/latex/contrib/oberdiek/alphalph.dtx} +% \item[-] package \xpackage{alphalph}, 2010/04/18, v2.3, +% \url{http://ctan.org/pkg/alphalph} % -% \item[-] package \xpackage{atbegshi}, 2011/01/30, v1.15, \CTAN{macros/latex/contrib/oberdiek/atbegshi.dtx} +% \item[-] package \xpackage{atbegshi}, 2011/01/30, v1.15, +% \url{http://ctan.org/pkg/atbegshi} % -% \item[-] package \xpackage{atveryend}, 2011/04/23, v1.7, \CTAN{macros/latex/contrib/oberdiek/atveryend.dtx} +% \item[-] package \xpackage{atveryend}, 2011/04/23, v1.7, +% \url{http://ctan.org/pkg/atveryend} % -% \item[-] package \xpackage{infwarerr}, 2010/04/08, v1.3, \CTAN{macros/latex/contrib/oberdiek/infwarerr.dtx} +% \item[-] package \xpackage{infwarerr}, 2010/04/08, v1.3, +% \url{http://ctan.org/pkg/infwarerr} % -% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10, \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx} +% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10, +% \url{http://ctan.org/pkg/kvoptions} % -% \item[-] package \xpackage{picture}, 2009/10/11, v1.3, \CTAN{macros/latex/contrib/oberdiek/picture.dtx} +% \item[-] package \xpackage{ltxcmds}, 2011/04/18, v1.20, +% \url{http://ctan.org/pkg/ltxcmds} % -% \item[-] package \xpackage{rerunfilecheck}, 2011/04/15, v1.7, \CTAN{macros/latex/contrib/oberdiek/rerunfilecheck.dtx} +% \item[-] package \xpackage{picture}, 2009/10/11, v1.3, +% \url{http://ctan.org/pkg/picture} +% +% \item[-] package \xpackage{rerunfilecheck}, 2011/04/15, v1.7, +% \url{http://ctan.org/pkg/rerunfilecheck} % \end{description} % % \DescribeMacro{SW/SWP} @@ -3164,50 +3222,60 @@ Text can be placed after any of the Tables of Thumbs, of course. %\end{verbatim} % \end{quote} % -% \noindent especially before \xpackage{hyperref} and \xpackage{thumbs}, but best right after the |\documentclass|! -% (The options for those packages might be changed by the user~-- I~did not test all available options, -% thus first test, whether the document can be compiled with these options, and then try to change them -% according to your whishes.)\\ -% -% \pagebreak +% \noindent especially before \xpackage{hyperref} and \xpackage{thumbs}, but best right after +% the |\documentclass|! (The options for those packages might be changed by the user~-- +% I~did not test all available options, thus first test, whether the document can be compiled +% with these options, and then try to change them according to your wishes.)\\ % % \DescribeMacro{thumb-example.tex} -% The |thumb-example.tex| requires the same files as all documents using the \xpackage{thumbs} -% package and additionally: +% The |thumb-example.tex| requires the same files as all +% documents using the \xpackage{thumbs} package and additionally: % \begin{description} -% \item[-] package \xpackage{eurosym}, 1998/08/06, v1.1, \CTAN{fonts/eurosym.zip} - -% \item[-] package \xpackage{lipsum}, 2011/04/14, v1.2, \CTAN{macros/latex/contrib/lipsum/lipsum.dtx} +% \item[-] package \xpackage{eurosym}, 1998/08/06, v1.1, +% \url{http://ctan.org/pkg/eurosym} +% +% \item[-] package \xpackage{lipsum}, 2011/04/14, v1.2, +% \url{http://ctan.org/pkg/lipsum} % -% \item[-] package \xpackage{hyperref}, 2011/10/01, v6.82j, \CTAN{macros/latex/contrib/hyperref/hyperref.dtx} +% \item[-] package \xpackage{hyperref}, 2011/12/04, v6.82m, +% \url{http://ctan.org/pkg/hyperref} % -% \item[-] package \xpackage{thumbs}, 2011/10/19, v1.0j, \CTAN{macros/latex/contrib/thumbs/thumbs.dtx}\\ +% \item[-] package \xpackage{thumbs}, 2012/01/01, v1.0k, +% \url{http://ctan.org/pkg/thumbs}\\ % (Well, it is the example file for this package, and because you are reading the -% documentation for the \xpackage{thumbs} package, it can be assumed that you already +% documentation for the \xpackage{thumbs} package, it~can be assumed that you already % have some version of it -- is it the current one?) % \end{description} % % \DescribeMacro{Alternatives} % As possible alternatives in section \ref{sec:Alternatives} there are listed % \begin{description} -% \item[-] \xpackage{chapterthumb}, 2005/03/10, v0.1, \CTAN{info/examples/KOMA-Script-3/Anhang-B/source/chapterthumb.sty} +% \item[-] \xpackage{chapterthumb}, 2005/03/10, v0.1, +% \CTAN{info/examples/KOMA-Script-3/Anhang-B/source/chapterthumb.sty} % -% \item[-] \xpackage{eso-pic}, 2010/10/06, v2.0c, \CTAN{macros/latex/contrib/eso-pic/eso-pic.dtx} +% \item[-] \xpackage{eso-pic}, 2010/10/06, v2.0c, +% \url{http://ctan.org/pkg/eso-pic} % -% \item[-] \xpackage{fancytabs}, 2011/04/16 v1.1, \CTAN{macros/latex/contrib/fancytabs/fancytabs.dtx} +% \item[-] \xpackage{fancytabs}, 2011/04/16 v1.1, +% \url{http://ctan.org/pkg/fancytabs} % -% \item[-] \xpackage{thumb}, 2001, without file version, \url{ftp://ftp.dante.de/pub/tex/info/examples/ltt/thumb.sty} +% \item[-] \xpackage{thumb}, 2001, without file version, +% \url{ftp://ftp.dante.de/pub/tex/info/examples/ltt/thumb.sty} % -% \item[-] \xpackage{thumb} (a completely different one), 1997/12/24, v1.0, \CTAN{macros/latex/contrib/thumb/thumb.dtx} +% \item[-] \xpackage{thumb} (a completely different one), 1997/12/24, v1.0, +% \url{http://ctan.org/pkg/thumb} % -% \item[-] \xpackage{thumbindex}, 2009/12/13, without file version, \url{http://hisashim.org/2009/12/13/thumbindex.html}. +% \item[-] \xpackage{thumbindex}, 2009/12/13, without file version, +% \url{http://hisashim.org/2009/12/13/thumbindex.html}. % % \item[-] \xpackage{thumb-index}, from the \xpackage{fancyhdr} package, 2005/03/22 v3.2, -% \CTAN{macros/latex/contrib/fancyhdr/fancyhdr.pdf} +% \url{http://ctan.org/pkg/fancyhdr} % -% \item[-] \xpackage{thumbpdf}, 2010/07/07, v3.11, \CTAN{support/thumbpdf/thumbpdf.sty} +% \item[-] \xpackage{thumbpdf}, 2010/07/07, v3.11, +% \url{http://ctan.org/pkg/thumbpdf} % -% \item[-] \xpackage{thumby}, 2010/01/14, v0.1, \CTAN{macros/latex/contrib/thumby/thumby.sty} +% \item[-] \xpackage{thumby}, 2010/01/14, v0.1, +% \url{http://ctan.org/pkg/thumby} % \end{description} % % \DescribeMacro{Oberdiek} @@ -3217,28 +3285,29 @@ Text can be placed after any of the Tables of Thumbs, of course. % \DescribeMacro{atveryend} % \DescribeMacro{infwarerr} % \DescribeMacro{kvoptions} +% \DescribeMacro{ltxcmds} % \DescribeMacro{picture} % \DescribeMacro{rerunfilecheck} -% All packages of \textsf{Heiko Oberdiek}'s bundle `oberdiek' +% All packages of \textsc{Heiko Oberdiek}'s bundle `oberdiek' % (especially \xpackage{holtxdoc}, \xpackage{alphalph}, \xpackage{atbegshi}, \xpackage{infwarerr}, -% \xpackage{kvoptions}, \xpackage{picture}, and \xpackage{rerunfilecheck}) +% \xpackage{kvoptions}, \xpackage{ltxcmds}, \xpackage{picture}, and \xpackage{rerunfilecheck}) % are also available in a TDS compliant ZIP archive:\\ % \CTAN{install/macros/latex/contrib/oberdiek.tds.zip}.\\ % It is probably best to download and use this, because the packages in there -% should be both recent and compatible.\\ +% are quite probably both recent and compatible among themselves.\\ % % \vspace{6em} % % \DescribeMacro{hyperref} -% \noindent \textsf{Heiko Oberdiek}'s \xpackage{hyperref} package is not included in that bundle -% but needs to be downloaded separately,\\ +% \noindent \xpackage{hyperref} is not included in that bundle and needs to be +% downloaded separately,\\ % \url{http://mirror.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\ % % \DescribeMacro{M\"{u}nch} -% A hyperlinked list of my (other) packages can be found at \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}. +% A hyperlinked list of my (other) packages can be found at +% \url{http://www.Uni-Bonn.de/~uzs5pv/LaTeX.html}. % % \subsection{Package, unpacking TDS} -% % \paragraph{Package.} This package is available on \CTAN{} % \begin{description} % \item[\CTAN{macros/latex/contrib/thumbs/thumbs.dtx}]\hspace*{0.1cm} \\ @@ -3249,24 +3318,27 @@ Text can be placed after any of the Tables of Thumbs, of course. % The compiled example file, as it should look like. % \item[\CTAN{macros/latex/contrib/thumbs/README}]\hspace*{0.1cm} \\ % The README file. +% \end{description} +% There is also a thumbs.tds.zip available: +% \begin{description} % \item[\CTAN{install/macros/latex/contrib/thumbs.tds.zip}]\hspace*{0.1cm} \\ -% Everything in TDS compliant, compiled format, +% Everything in \xfile{TDS} compliant, compiled format. % \end{description} % which additionally contains\\ % \begin{tabular}{ll} % thumbs.ins & The installation file.\\ % thumbs.drv & The driver to generate the documentation.\\ % thumbs.sty & The \xext{sty}le file.\\ -% thumbs-example.tex & The example file.% +% thumbs-example.tex & The example file. % \end{tabular} % % \bigskip % -% \noindent For required other packages, see the preceding subsection. +% \noindent For required other packages, please see the preceding subsection. % % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting -% \docstrip\ archive. The files are extracted by running the -% \xfile{.dtx} through \plainTeX: +% \docstrip{} archive. The files are extracted by running the +% \xext{dtx} through \plainTeX{}: % \begin{quote} % \verb|tex thumbs.dtx| % \end{quote} @@ -3279,11 +3351,11 @@ Text can be placed after any of the Tables of Thumbs, of course. % \begin{quote} % \def\t{^^A % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} -% thumbs.sty & tex/latex/thumbs.sty\\ -% thumbs.pdf & doc/latex/thumbs.pdf\\ -% thumbs-example.tex & doc/latex/thumbs-example.tex\\ -% thumbs-example.pdf & doc/latex/thumbs-example.pdf\\ -% thumbs.dtx & source/latex/thumbs.dtx\\ +% thumbs.sty & tex/latex/thumbs/thumbs.sty\\ +% thumbs.pdf & doc/latex/thumbs/thumbs.pdf\\ +% thumbs-example.tex & doc/latex/thumbs/thumbs-example.tex\\ +% thumbs-example.pdf & doc/latex/thumbs/thumbs-example.pdf\\ +% thumbs.dtx & source/latex/thumbs/thumbs.dtx\\ % \end{tabular}^^A % }^^A % \sbox0{\t}^^A @@ -3345,26 +3417,26 @@ Text can be placed after any of the Tables of Thumbs, of course. % \usebox0 % \fi % \end{quote} -% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's -% TDS installing feature, then some files can already be in the right -% place, see the documentation of \docstrip. +% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip{}'s +% \xfile{TDS} installing feature, then some files can already be in the right +% place, see the documentation of \docstrip{}. % % \subsection{Refresh file name databases} % -% If your \TeX~distribution (\teTeX, \mikTeX,\dots) relies on file name -% databases, you must refresh these. For example, \teTeX\ users run +% If your \TeX{}~distribution (\teTeX{}, \mikTeX{},\dots{}) relies on file name +% databases, you must refresh these. For example, \teTeX{} users run % \verb|texhash| or \verb|mktexlsr|. % % \subsection{Some details for the interested} % -% \paragraph{Unpacking with \LaTeX.} +% \paragraph{Unpacking with \LaTeX{}.} % The \xfile{.dtx} chooses its action depending on the format: % \begin{description} -% \item[\plainTeX:] Run \docstrip\ and extract the files. +% \item[\plainTeX:] Run \docstrip{} and extract the files. % \item[\LaTeX:] Generate the documentation. % \end{description} -% If you insist on using \LaTeX\ for \docstrip\ (really, -% \docstrip\ does not need \LaTeX), then inform the autodetect routine +% If you insist on using \LaTeX{} for \docstrip{} (really, +% \docstrip{} does not need \LaTeX{}), then inform the autodetect routine % about your intention: % \begin{quote} % \verb|latex \let\install=y\input{thumbs.dtx}| @@ -3375,22 +3447,22 @@ Text can be placed after any of the Tables of Thumbs, of course. % \paragraph{Generating the documentation.\label{GenDoc}} % You can use both the \xfile{.dtx} or the \xfile{.drv} to generate % the documentation. The process can be configured by a -% configuration file \xfile{ltxdoc.cfg}. For instance, put this +% configuration file \xfile{ltxdoc.cfg}. For instance, put the following % line into this file, if you want to have A4 as paper format: % \begin{quote} % \verb|\PassOptionsToClass{a4paper}{article}| % \end{quote} % % \noindent An example follows how to generate the -% documentation with \pdfLaTeX : +% documentation with \pdfLaTeX{}: % % \begin{quote} %\begin{verbatim} -%pdflatex thumbs.drv +%pdflatex thumbs.dtx %makeindex -s gind.ist thumbs.idx -%pdflatex thumbs.drv +%pdflatex thumbs.dtx %makeindex -s gind.ist thumbs.idx -%pdflatex thumbs.drv +%pdflatex thumbs.dtx %\end{verbatim} % \end{quote} % @@ -3406,14 +3478,13 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \section{Acknowledgements} % -% I would like to thank \textsc{Heiko Oberdiek} -% (heiko dot oberdiek at googlemail dot com) for providing +% I would like to thank \textsc{Heiko Oberdiek} for providing % the \xpackage{hyperref} as well as a~lot~(!) of other useful packages % (from which I also got everything I know about creating a file in % \xext{dtx} format, ok, say it: copying), % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} -% newsgroups for their help in all things \TeX. Thanks for bug reports go -% to \textsc{Veronica Brandt} and \textsc{Martin Baute}. +% newsgroups for their help in all things \TeX{}. +% Thanks for bug reports go to \textsc{Veronica Brandt} and \textsc{Martin Baute}. % % \bigskip % @@ -3518,7 +3589,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % to refer to any but the last Table of Tumbs. Fixed with labels % |TableofTumbs1|, |TableofTumbs2|,\ldots\ (|TableofTumbs| still aims % at the last used Table of Thumbs for compatibility.) -% \item Bug fix: Sometimes the thumb marks were stoped one page too early +% \item Bug fix: Sometimes the thumb marks were stopped one page too early % before the Table of Thumbs~- fixed. % \item Some details changed. % \end{Version} @@ -3542,7 +3613,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \item Hot fix: \TeX{} 2011/06/27 has changed |\enddocument| and % thus broken the |\AtVeryVeryEnd| command/hooking % of \xpackage{atveryend} package as of 2011/04/23, v1.7. -% Version 2011/06/30, v1.8, fixed it, but this version is not availabel +% Version 2011/06/30, v1.8, fixed it, but this version is not available % at \CTAN{} yet. Until then |\AtEndAfterFileList| is used. % \end{Version} % \begin{Version}{2011/10/19 v1.0j} @@ -3557,6 +3628,12 @@ Text can be placed after any of the Tables of Thumbs, of course. % \item README fixed. % \item Minor details changed. % \end{Version} +% \begin{Version}{2012/01/01 v1.0k} +% \item Bugfix: Wrong installation path given in the documentation, fixed. +% \item No longer uses the |th@mbs@tmpA| counter but |\@tempcnta|. +% \item No longer abuses the |\th@mbposyA| dimension but |\@tempdima|. +% \item Update of documentation, README, and \xfile{dtx} internals. +% \end{Version} % \end{History} % % \bigskip @@ -3570,7 +3647,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % but no command \emph{beginning} with any of these letters has been used in this % \xpackage{thumbs} package. % -% \bigskip +% \pagebreak % % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.ins b/Master/texmf-dist/source/latex/thumbs/thumbs.ins index afcca4117aa..2e74022a014 100644 --- a/Master/texmf-dist/source/latex/thumbs/thumbs.ins +++ b/Master/texmf-dist/source/latex/thumbs/thumbs.ins @@ -9,12 +9,12 @@ %% This is a generated file. %% %% Project: thumbs -%% Version: 2011/10/19 v1.0j +%% Version: 2012/01/01 v1.0k %% -%% Copyright (C) 2010, 2011 by +%% Copyright (C) 2010 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> %% -%% The usual disclaimer applys: +%% The usual disclaimer applies: %% If it doesn't work right that's your problem. %% (Nevertheless, send an e-mail to the maintainer %% when you find an error in this package.) @@ -33,16 +33,16 @@ %% %% The Current Maintainer of this work is H.-Martin Muench. %% -%% This work consists of the main source file thumbs.dtx -%% and the derived files +%% This work consists of the main source file thumbs.dtx, +%% the README, and the derived files %% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, -%% thumbs-example.tex. +%% thumbs-example.tex, thumbs-example.pdf. %% \input docstrip.tex -\Msg{*************************************************************************} -\Msg{* Installation} -\Msg{* Package: thumbs 2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)} -\Msg{*************************************************************************} +\Msg{**************************************************************************} +\Msg{* Installation *} +\Msg{* Package: thumbs 2012/01/01 v1.0k Thumb marks and overview page(s) (HMM)*} +\Msg{**************************************************************************} \keepsilent \askforoverwritefalse @@ -53,12 +53,12 @@ This is a generated file. Project: thumbs -Version: 2011/10/19 v1.0j +Version: 2012/01/01 v1.0k -Copyright (C) 2010, 2011 by +Copyright (C) 2010 - 2012 by H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> -The usual disclaimer applys: +The usual disclaimer applies: If it doesn't work right that's your problem. (Nevertheless, send an e-mail to the maintainer when you find an error in this package.) @@ -77,10 +77,10 @@ This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is H.-Martin Muench. -This work consists of the main source file thumbs.dtx -and the derived files +This work consists of the main source file thumbs.dtx, +the README, and the derived files thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, - thumbs-example.tex. + thumbs-example.tex, thumbs-example.pdf. \endpreamble \let\MetaPrefix\DoubleperCent @@ -101,7 +101,7 @@ and the derived files \Msg{* To finish the installation you have to move the following} \Msg{* file into a directory searched by TeX:} \Msg{*} -\Msg{* thumbs.sty*} +\Msg{* thumbs.sty} \Msg{*} \Msg{* To produce the documentation run the file `thumbs.drv'} \Msg{* through (pdf)LaTeX, e.g.} @@ -119,7 +119,6 @@ and the derived files \Msg{************************************************************************} \endbatchfile - \endinput %% %% End of file `thumbs.ins'. diff --git a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty index f2dec087375..c0663066fc9 100644 --- a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty +++ b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty @@ -9,12 +9,12 @@ %% This is a generated file. %% %% Project: thumbs -%% Version: 2011/10/19 v1.0j +%% Version: 2012/01/01 v1.0k %% -%% Copyright (C) 2010, 2011 by +%% Copyright (C) 2010 - 2012 by %% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de> %% -%% The usual disclaimer applys: +%% The usual disclaimer applies: %% If it doesn't work right that's your problem. %% (Nevertheless, send an e-mail to the maintainer %% when you find an error in this package.) @@ -33,17 +33,17 @@ %% %% The Current Maintainer of this work is H.-Martin Muench. %% -%% This work consists of the main source file thumbs.dtx -%% and the derived files +%% This work consists of the main source file thumbs.dtx, +%% the README, and the derived files %% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, -%% thumbs-example.tex. +%% thumbs-example.tex, thumbs-example.pdf. %% -\NeedsTeXFormat{LaTeX2e}[2009/09/24]% recent: 2011/06/27 -\ProvidesPackage{thumbs}[2011/10/19 v1.0j - Thumb marks and overwiew page(s) (HMM)] +\NeedsTeXFormat{LaTeX2e}[2011/06/27] +\ProvidesPackage{thumbs}[2012/01/01 v1.0k + Thumb marks and overview page(s) (HMM)] %% This package allows to create a customizable thumb index, -%% providing a quick and easy reference methode for large documents, +%% providing a quick and easy reference method for large documents, %% as well as an overview page. \IfFileExists{tcilatex.tex}{% @@ -83,17 +83,41 @@ \RequirePackage{xcolor}[2007/01/21]% v2.11 \RequirePackage{picture}[2009/10/11]% v1.3 \RequirePackage{alphalph}[2010/04/18]% v2.3 -\RequirePackage{pageslts}[2011/08/08]% v1.2a -\RequirePackage{pagecolor}[2011/08/08]% v1.0c +\RequirePackage{pageslts}[2011/08/08]% v1.2a +\RequirePackage{pagecolor}[2011/08/08]% v1.0c \RequirePackage{rerunfilecheck}[2011/04/15]% v1.7 -\RequirePackage{infwarerr}[2010/04/08]% v1.3 -\RequirePackage{atveryend}[2011/04/23]% v1.7, -%% v1.8 would be needed but is currently (2011/10/19) not available at CTAN yet +\RequirePackage{infwarerr}[2010/04/08]% v1.3 +\RequirePackage{atveryend}[2011/04/23]% v1.7 +%% \RequirePackage{atveryend}[2011/06/30]% v1.8 +%% would be needed but is currently (2012/01/01) not available at CTAN yet %% thumbs may work with earlier versions of LaTeX2e and those packages, %% but this was not tested. Please consider updating your LaTeX contribution %% and packages to the most recent version (if they are not already the most %% recent version). +\@ifl@t@r\fmtversion{2011/06/27}% or possibly even newer +{\@ifpackagelater{atveryend}{2011/06/29}% + {% 2011/06/30, v1.8, or even more recent: OK + }{% else: older package version, no \AtVeryVeryEnd + \PackageWarningNoLine{thumbs}{% + LaTeX 2011/06/27 has changed \string\enddocument\space and thus broken the\MessageBreak% + \string\AtVeryVeryEnd\space command/hooking of atveryend package as of\MessageBreak% + 2011/04/23, v1.7. New package version 2011/06/30, v1.8, works with\MessageBreak% + the new LaTeX format, but some older package version was loaded.\MessageBreak% + (As of 2012/01/01, the new version is NOT available at CTAN yet.)\MessageBreak% + For fixing this problem until the update is available,\MessageBreak% + \string\let\string\AtVeryVeryEnd\string\AtEndAfterFileList\MessageBreak% + is used now, fingers crossed.% + }% + \let\AtVeryVeryEnd\AtEndAfterFileList% + \RequirePackage{ltxcmds}[2011/04/18]% v1.20, for \ltx@firstofone + \AtEndAfterFileList{% if there is \AtVeryVeryEnd inside \AtEndAfterFileList + \let\AtEndAfterFileList\ltx@firstofone% + } + } +}{% else: older fmtversion: OK +} + \SetupKeyvalOptions{family=thumbs,prefix=thumbs@} \DeclareStringOption{linefill}[dots]% \thumbs@linefill \DeclareStringOption[rule]{thumblink}[rule] @@ -207,12 +231,9 @@ \newbox\ThumbsBox -\newcounter{th@mbs@tmpA} -\setcounter{th@mbs@tmpA}{0} - \gdef\th@mbs{0} \gdef\th@mbsmax{0} -\gdef\th@umbsperpage{0}% will be set via aux file +\gdef\th@umbsperpage{0}% will be set via .aux file \gdef\th@umbsperpagecount{0} \gdef\th@mbtitle{} @@ -259,8 +280,8 @@ \advance\th@mbheighty+\headsep \advance\th@mbheighty+\textheight \advance\th@mbheighty+\footskip - \setcounter{th@mbs@tmpA}{\th@mbsmax} - \ifnum\value{th@mbs@tmpA}>1 + \@tempcnta=\th@mbsmax\relax + \ifnum\@tempcnta>1 \divide\th@mbheighty\th@mbsmax \fi \advance\th@mbheighty-\th@mbsdistance @@ -279,13 +300,13 @@ \gdef\th@bmsvoffset{\voffset} \fi \xdef\th@mbpaperwidth{\the\paperwidth} - \setlength{\th@mbposyA}{1pt} - \ifdim \thumbs@minheight < \th@mbposyA% too small + \setlength{\@tempdima}{1pt} + \ifdim \thumbs@minheight < \@tempdima% too small \setlength{\thumbs@minheight}{1pt} \else - \ifdim \thumbs@minheight = \th@mbposyA% small, but ok + \ifdim \thumbs@minheight = \@tempdima% small, but ok \else - \ifdim \thumbs@minheight > \th@mbposyA% ok + \ifdim \thumbs@minheight > \@tempdima% ok \else \PackageError{thumbs}{Option minheight has invalid value}{% Please use a number and a length unit (e.g. mm, cm, pt)\MessageBreak% @@ -298,15 +319,15 @@ \fi \fi \fi - \setlength{\th@mbposyA}{\thumbs@minheight} + \setlength{\@tempdima}{\thumbs@minheight} \ifx\thumbs@height\empty% - \setlength{\th@mbheighty}{\th@mbposyA} + \setlength{\th@mbheighty}{\@tempdima} \else \def\th@mbstest{auto} \ifx\thumbs@height\th@mbstest% \setth@mbheight \ifdim \th@mbheighty < \thumbs@minheight - \PackageWarningNoLine{thumbs}{Thumbs not high enought:\MessageBreak% + \PackageWarningNoLine{thumbs}{Thumbs not high enough:\MessageBreak% Option height has value 'auto'. For \th@mbsmax\space thumbs per page\MessageBreak% this results in a thumb height of \the\th@mbheighty.\MessageBreak% This is lower than the minimal thumb height, \thumbs@minheight,\MessageBreak% @@ -315,7 +336,7 @@ for option 'minheight'% } \setlength{\th@mbheighty}{\z@} - \advance\th@mbheighty+\th@mbposyA% = \thumbs@minheight + \advance\th@mbheighty by \@tempdima% = \thumbs@minheight \fi \else \ifthumbs@verbose @@ -338,7 +359,7 @@ \setlength{\th@mbwidthx}{\paperwidth} \advance\th@mbwidthx-\textwidth \divide\th@mbwidthx4 - \setlength{\th@mbposyA}{0sp} + \setlength{\@tempdima}{0sp} \ifx\thumbs@width\empty% \else \def\th@mbstest{auto} @@ -365,10 +386,10 @@ \setlength{\th@mbwidthx}{\th@mbmaxwidtha} }%\fi \else - \ifdim \thumbs@width > \th@mbposyA% OK + \ifdim \thumbs@width > \@tempdima% OK \setlength{\th@mbwidthx}{\thumbs@width} \else - \PackageError{thumbs}{Thumbs not wide enought}{% + \PackageError{thumbs}{Thumbs not wide enough}{% Option width has value '\thumbs@width'.\MessageBreak% This is not a valid dimension larger than zero.\MessageBreak% Width will be set automatically.\MessageBreak% @@ -404,8 +425,8 @@ \advance\th@mbposy-\th@mbsdistance \advance\th@mbposy+\th@mbheighty \else - \setlength{\th@mbposyA}{-1pt} - \ifdim \thumbs@topthumbmargin > \th@mbposyA% OK + \setlength{\@tempdima}{-1pt} + \ifdim \thumbs@topthumbmargin > \@tempdima% OK \else \PackageWarning{thumbs}{Thumbs column starting too high.\MessageBreak% Option topthumbmargin has value '\thumbs@topthumbmargin'.\MessageBreak% @@ -445,29 +466,29 @@ \advance\th@mbposybottom-\th@mbsdistance \advance\th@mbposybottom-\th@mbheighty \else - \setlength{\th@mbposyA}{\paperheight} - \advance\th@mbposyA-\thumbs@bottomthumbmargin - \advance\th@mbposyA-\th@mbposytop - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-\th@mbheighty - \advance\th@mbposyA-\th@mbsdistance - \ifdim \th@mbposyA > 0sp%ok + \setlength{\@tempdima}{\paperheight} + \advance\@tempdima by -\thumbs@bottomthumbmargin + \advance\@tempdima by -\th@mbposytop + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -\th@mbheighty + \advance\@tempdima by -\th@mbsdistance + \ifdim \@tempcnta > 0sp \relax \else - \setlength{\th@mbposyA}{\paperheight} - \advance\th@mbposyA-\th@mbposytop - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-\th@mbheighty - \advance\th@mbposyA-\th@mbsdistance - \advance\th@mbposyA-1pt + \setlength{\@tempdima}{\paperheight} + \advance\@tempdima by -\th@mbposytop + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -\th@mbheighty + \advance\@tempdima by -\th@mbsdistance + \advance\@tempdima by -1pt \PackageWarning{thumbs}{Thumbs column ending too high.\MessageBreak% Option bottomthumbmargin has value '\thumbs@bottomthumbmargin'.\MessageBreak% - bottomthumbmargin will be set to '\the\th@mbposyA'.\MessageBreak% + bottomthumbmargin will be set to '\the\@tempdima'.\MessageBreak% } - \xdef\thumbs@bottomthumbmargin{\the\th@mbposyA} + \xdef\thumbs@bottomthumbmargin{\the\@tempdima} \fi - \setlength{\th@mbposyA}{\thumbs@bottomthumbmargin} + \setlength{\@tempdima}{\thumbs@bottomthumbmargin} \setlength{\@tempdimc}{-1pt} - \ifdim \th@mbposyA < \@tempdimc% + \ifdim \@tempdima < \@tempdimc% \PackageWarning{thumbs}{Thumbs column ending too low.\MessageBreak% Option bottomthumbmargin has value '\thumbs@bottomthumbmargin'.\MessageBreak% bottomthumbmargin will be set to -1pt.\MessageBreak% @@ -479,14 +500,14 @@ \fi \ifthumbs@verbose% \setlength{\@tempdimc}{\paperheight} - \advance\@tempdimc-\th@mbposybottom + \advance\@tempdimc by -\th@mbposybottom \edef\thumbsinfo{\the\@tempdimc} \@PackageInfoNoLine{thumbs}{The bottom thumb margin is \thumbsinfo} \@PackageInfoNoLine{thumbs}{**********************************************} \message{^^J} \fi - \advance\th@mbposy-\th@mbheighty% because it will be advanced also for the first thumb - \setlength{\th@mbposyA}{\th@mbposy}% \th@mbposyA will change. + \advance\th@mbposy-\th@mbheighty% because it will be advanced also for the first thumb + \setlength{\th@mbposyA}{\th@mbposy}% \th@mbposyA will change. \setlength{\th@mbsposytocyy}{\th@mbposy}% \th@mbsposytocyy shall not be changed. } @@ -507,9 +528,12 @@ \newcommand{\thumbnewcolumn}{% \ifx\th@mbtoprint\pagesLTS@one% \PackageError{thumbs}{\string\thumbnewcolumn\space after \string\addthumb }{% - On page \thepage\space (approx.) \string\addthumb\space was used and *afterwards* \string\thumbnewcolumn .\MessageBreak% - When you want to use \string\thumbnewcolumn , do not use an \string\addthumb\space on the same\MessageBreak% - page before \string\thumbnewcolumn . Thus, either remove the \string\addthumb , or use a\MessageBreak% + On page \thepage\space (approx.) \string\addthumb\space was used and *afterwards* % + \string\thumbnewcolumn .\MessageBreak% + When you want to use \string\thumbnewcolumn , do not use an \string\addthumb\space % + on the same\MessageBreak% + page before \string\thumbnewcolumn . Thus, either remove the \string\addthumb , % + or use a\MessageBreak% \string\pagebreak , \string\newpage\space etc. before \string\thumbnewcolumn .\MessageBreak% (And remember to use an \string\addthumb\space*after* \string\thumbnewcolumn .)\MessageBreak% Your command \string\thumbnewcolumn\space will be ignored now.% @@ -554,30 +578,28 @@ \gdef\th@mbcolumn{1}% \fi% \fi% - \setcounter{th@mbs@tmpA}{\th@mbs}% - \addtocounter{th@mbs@tmpA}{+1}% - \xdef\th@mbs{\arabic{th@mbs@tmpA}}% + \@tempcnta=\th@mbs\relax% + \advance\@tempcnta by 1% + \xdef\th@mbs{\the\@tempcnta}% \gdef\th@mbtitle{#1}% \gdef\th@mbtext{#2}% \gdef\th@mbtextcolour{#3}% \gdef\th@mbbackgroundcolour{#4}% - \edef\th@mbstmpwidth{\the\th@mbposyA}% - \settowidth{\th@mbposyA}{\th@mbtext\space}% - \ifdim\th@mbposyA>\th@mbmaxwidth% - \xdef\th@mbmaxwidth{\the\th@mbposyA}% + \settowidth{\@tempdima}{\th@mbtext\space}% + \ifdim\@tempdima>\th@mbmaxwidth% + \xdef\th@mbmaxwidth{\the\@tempdima}% \fi% - \ifdim\th@mbposyA>\th@mbwidthx% + \ifdim\@tempdima>\th@mbwidthx% \ifthumbs@draft% \relax \else% \edef\thumbsinfoa{\the\th@mbwidthx} - \edef\thumbsinfob{\the\th@mbposyA} + \edef\thumbsinfob{\the\@tempdima} \PackageWarning{thumbs}{% Thumb mark too small (width: \thumbsinfoa )\MessageBreak% or its text too wide (width: \thumbsinfob )\MessageBreak% }% \fi% \fi% - \setlength{\th@mbposyA}{\th@mbstmpwidth}% \@ifundefined{Hy@Warning}{% hyperref not loaded }{% hyperref loaded \ifthumbs@nophantomsection% \relax @@ -603,9 +625,9 @@ \fi% \ifx\th@mbcolumnnew\pagesLTS@one% \else% - \setcounter{th@mbs@tmpA}{\th@mbonpage}% - \addtocounter{th@mbs@tmpA}{+1}% - \xdef\th@mbonpage{\arabic{th@mbs@tmpA}}% + \@tempcnta=\th@mbonpage\relax% + \advance\@tempcnta by 1% + \xdef\th@mbonpage{\the\@tempcnta}% \fi% \ifx\th@mbtoprint\pagesLTS@zero% \else% @@ -613,7 +635,7 @@ \PackageWarning{thumbs}{More than one thumb at one page:\MessageBreak% You placed more than one thumb mark (at least \th@mbonpage)\MessageBreak% on page \thepage \space (page is approximately).\MessageBreak% - Maybe insert a pagebreak?\MessageBreak% + Maybe insert a page break?\MessageBreak% }% \fi% \fi% @@ -627,23 +649,23 @@ \setlength{\th@mbposyA}{\th@mbposy}% \else% \ifx\th@mbcolumnnew\pagesLTS@zero% - \setcounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% - \@whilenum\th@mbonpagetest<\th@mbonpage\do{% - \addtocounter{th@mbs@tmpA}{1}% - \xdef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% - \ifnum\th@mbonpage=\th@mbonpagetest% - \ifnum\th@mbonpagemax<\th@mbonpage% - \xdef\th@mbonpagemax{\th@mbonpage}% - \fi% - \edef\th@mbtmpdef{\csname th@mbtext\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#2}% - \edef\th@mbtmpdef{\csname th@mbtextcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#3}% - \edef\th@mbtmpdef{\csname th@mbbackgroundcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \expandafter\gdef\th@mbtmpdef{#4}% - \fi% - }% + \@tempcnta=1\relax% + \edef\th@mbonpagetest{\the\@tempcnta}% + \@whilenum\th@mbonpagetest<\th@mbonpage\do{% + \advance\@tempcnta by 1% + \xdef\th@mbonpagetest{\the\@tempcnta}% + \ifnum\th@mbonpage=\th@mbonpagetest% + \ifnum\th@mbonpagemax<\th@mbonpage% + \xdef\th@mbonpagemax{\th@mbonpage}% + \fi% + \edef\th@mbtmpdef{\csname th@mbtext\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#2}% + \edef\th@mbtmpdef{\csname th@mbtextcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#3}% + \edef\th@mbtmpdef{\csname th@mbbackgroundcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \expandafter\gdef\th@mbtmpdef{#4}% + \fi% + }% \else% \ifnum\th@mbonpagemax<\th@mbonpage% \xdef\th@mbonpagemax{\th@mbonpage}% @@ -698,7 +720,7 @@ \def\th@mbstest{rule}% \ifx\thumbs@thumblink\th@mbstest% \ifx\th@mb@tmp@column\pagesLTS@zero% - {\color{\th@mb@tmp@backgroundcolour}\hyperref[\th@mb@tmp@label]{\rule{\th@mbwidthxtoc}{\th@mbheighty}}}% + {\color{\th@mb@tmp@backgroundcolour}\hyperref[\th@mb@tmp@label]{\rule{\th@mbwidthxtoc}{\th@mbheighty}}}% \else% {\color{\th@mb@tmp@backgroundcolour}\rule{\th@mbwidthxtoc}{\th@mbheighty}}% \fi% @@ -866,8 +888,8 @@ \space until \string\addthumb\space is used.)\MessageBreak% }% \fi% - \setcounter{th@mbs@tmpA}{\value{CurrentPage}}% - \addtocounter{th@mbs@tmpA}{-1}% because CurrentPage is already the one of the next page + \@tempcnta=\value{CurrentPage}\relax% + \advance\@tempcnta by -1% because CurrentPage is already the one of the next page \edef\th@mbstmpwidth{\the\paperwidth}% \ifdim\th@mbpaperwidth=\th@mbstmpwidth% OK \else% @@ -883,7 +905,7 @@ \xdef\th@mbpaperwidth{\the\paperwidth}% \fi% \def\th@mbxpos{\th@mbposx}% - \ifodd\c@th@mbs@tmpA% \relax + \ifodd\@tempcnta% \relax \else% \if@twoside% \ifthumbs@ignorehoffset% @@ -896,20 +918,20 @@ \AtBeginShipoutUpperLeft{% \ifx\th@mbprinting\pagesLTS@one% \th@mbprint{\th@mbtextA}{\th@mbtextcolourA}{\th@mbbackgroundcolourA}% - \setcounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% + \@tempcnta=1\relax% + \edef\th@mbonpagetest{\the\@tempcnta}% \@whilenum\th@mbonpagetest<\th@mbonpage\do{% - \addtocounter{th@mbs@tmpA}{1}% - \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% + \advance\@tempcnta by 1% + \edef\th@mbonpagetest{\the\@tempcnta}% \th@mb@yA% - \def\th@mbtmpdeftext{\csname th@mbtext\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \def\th@mbtmpdefcolour{\csname th@mbtextcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% - \def\th@mbtmpdefbackgroundcolour{\csname th@mbbackgroundcolour\AlphAlph{\arabic{th@mbs@tmpA}}\endcsname}% + \def\th@mbtmpdeftext{\csname th@mbtext\AlphAlph{\the\@tempcnta}\endcsname}% + \def\th@mbtmpdefcolour{\csname th@mbtextcolour\AlphAlph{\the\@tempcnta}\endcsname}% + \def\th@mbtmpdefbackgroundcolour{\csname th@mbbackgroundcolour\AlphAlph{\the\@tempcnta}\endcsname}% \th@mbprint{\th@mbtmpdeftext}{\th@mbtmpdefcolour}{\th@mbtmpdefbackgroundcolour}% }% \fi% - \setcounter{th@mbs@tmpA}{\th@mbonpage}% - \ifnum\value{th@mbs@tmpA}<2% \relax + \@tempcnta=\th@mbonpage\relax% + \ifnum\@tempcnta<2% \relax \else% \gdef\th@mbtextA{\th@mbtext}% \gdef\th@mbtextcolourA{\th@mbtextcolour}% @@ -926,7 +948,7 @@ \else \PackageWarningNoLine{thumbs}{% Still missing \string\addthumb\space after \string\thumbnewcolumn\space after\MessageBreak% - last shipout: Command \string\thumbnewcolumn\space was used,\MessageBreak% + last ship-out: Command \string\thumbnewcolumn\space was used,\MessageBreak% but no new thumb placed with \string\addthumb\space anywhere in the\MessageBreak% rest of the document. Starting a new column of thumb\MessageBreak% marks and not putting a thumb mark into that column\MessageBreak% @@ -1202,7 +1224,7 @@ \newcommand{\th@mbs@verview}{% \ifthumbs@verbose% - \message{^^JPackage thumbs Info: Processing line \arabic{th@mblinea} to \arabic{th@mblineb} of \jobname.tmb.}% + \message{^^JPackage thumbs Info: Processing line \arabic{th@mblinea} to \arabic{th@mblineb} of \jobname.tmb.}% \fi% \setcounter{FileLine}{1}% \AtBeginShipoutNext{% @@ -1266,9 +1288,9 @@ \closein\@instreamthumb% \addtocounter{th@mblinea}{\th@umbsperpage}% \addtocounter{th@mblineb}{\th@umbsperpage}% - \setcounter{th@mbs@tmpA}{\th@mbsmax}% - \ifnum \value{th@mblineb}>\value{th@mbs@tmpA} - \setcounter{th@mblineb}{\value{th@mbs@tmpA}}% + \@tempcnta=\th@mbsmax\relax% + \ifnum \value{th@mblineb}>\@tempcnta\relax% + \setcounter{th@mblineb}{\@tempcnta}% \fi% }{% else \setcounter{FileLine}{\arabic{thumbsstop}}% @@ -1305,7 +1327,6 @@ \renewcommand{\thumbnewcolumn}{\relax} \fi - \endinput %% %% End of file `thumbs.sty'. |