thumbs (21may11)

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

8 files changed, 247 insertions, 138 deletions

diff --git a/Master/texmf-dist/doc/latex/thumbs/README b/Master/texmf-dist/doc/latex/thumbs/README
index 3ef2ca20ab6..40302d858ea 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/05/18, v1.0b
+README for thumbs package, 2011/05/20, v1.0c
 
 
 TABLE OF CONTENTS
diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf
index ece9f2c3639..215481bc532 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 a66ec4dab85..109811e15fd 100644
--- a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex
+++ b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: thumbs
-%% Version: 2011/05/18 v1.0b
+%% Version: 2011/05/20 v1.0c
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -66,7 +66,7 @@
  linktoc=all]{hyperref}[2011/04/17]% v6.82g
 \usepackage[pagecolor=white,thumblink=rule,linefill=dots,height={auto},minheight={47pt},%
             width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},%
-            verbose=true]{thumbs}[2011/05/18]% v1.0b
+            verbose=true]{thumbs}[2011/05/20]% v1.0c
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \listfiles
 \begin{document}
@@ -76,7 +76,7 @@
 \markboth{Example for thumbs}{Example for thumbs}
 
 This example demonstrates the most common uses of package
-\textsf{thumbs}, v1.0b as of 2011/05/18 (HMM).
+\textsf{thumbs}, v1.0c as of 2011/05/20 (HMM).
 The used options were \texttt{pagecolor=white},
 \texttt{thumblink=rule}, \texttt{linefill=dots},
 \texttt{height=auto}, \texttt{minheight=\{47pt\}},
diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf
index 3e234962917..7ee1d36634e 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 1025688459e..5fc71d571eb 100644
--- a/Master/texmf-dist/source/latex/thumbs/thumbs.drv
+++ b/Master/texmf-dist/source/latex/thumbs/thumbs.drv
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: thumbs
-%% Version: 2011/05/18 v1.0b
+%% Version: 2011/05/20 v1.0c
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -40,7 +40,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesFile{thumbs.drv}%
-  [2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)]%
+  [2011/05/20 v1.0c Thumb marks and overwiew 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
diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.dtx b/Master/texmf-dist/source/latex/thumbs/thumbs.dtx
index 1a142da5d0d..f3650d90243 100644
--- a/Master/texmf-dist/source/latex/thumbs/thumbs.dtx
+++ b/Master/texmf-dist/source/latex/thumbs/thumbs.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: thumbs.dtx
-% Version: 2011/05/18 v1.0b
+% Version: 2011/05/20 v1.0c
 %
 % Copyright (C) 2010, 2011 by
 %    H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -79,7 +79,7 @@
 \input docstrip.tex
 \Msg{*************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: thumbs 2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)}
+\Msg{* Package: thumbs 2011/05/20 v1.0c Thumb marks and overwiew page(s) (HMM)}
 \Msg{*************************************************************************}
 
 \keepsilent
@@ -91,7 +91,7 @@
 This is a generated file.
 
 Project: thumbs
-Version: 2011/05/18 v1.0b
+Version: 2011/05/20 v1.0c
 
 Copyright (C) 2010, 2011 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -175,7 +175,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[2009/09/24]
 \ProvidesFile{thumbs.drv}%
-  [2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)]%
+  [2011/05/20 v1.0c Thumb marks and overwiew 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
@@ -212,7 +212,7 @@ and the derived files
 %
 % \fi
 %
-% \CheckSum{1617}
+% \CheckSum{1678}
 %
 % \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
@@ -262,7 +262,7 @@ and the derived files
 % \DoNotIndex{\setlength,\the,\value,\textbackslash,\,}
 %
 % \title{The \xpackage{thumbs} package}
-% \date{2011/05/18 v1.0b}
+% \date{2011/05/20 v1.0c}
 % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
 %
 % \maketitle
@@ -407,6 +407,10 @@ and the derived files
 % \DescribeMacro{verbose}
 % \indent Option |verbose=false| (the default) suppresses some messages,
 %  which otherwise are presented at the screen and written into the \xfile{log}~file.
+%  Look for\\
+%  |************** THUMB dimensions **************|\\
+%  in the \xfile{log} file for height and width of the thumb marks as well as
+%  top and bottom thumb marks margins.
 %
 % \subsection{Commands to be used in the document}
 % \DescribeMacro{\addthumb}
@@ -565,7 +569,7 @@ and the derived files
  linktoc=all]{hyperref}[2011/04/17]% v6.82g
 \usepackage[pagecolor=white,thumblink=rule,linefill=dots,height={auto},minheight={47pt},%
             width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},%
-            verbose=true]{thumbs}[2011/05/18]% v1.0b
+            verbose=true]{thumbs}[2011/05/20]% v1.0c
 \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
 \listfiles
 \begin{document}
@@ -575,7 +579,7 @@ and the derived files
 \markboth{Example for thumbs}{Example for thumbs}
 
 This example demonstrates the most common uses of package
-\textsf{thumbs}, v1.0b as of 2011/05/18 (HMM).
+\textsf{thumbs}, v1.0c as of 2011/05/20 (HMM).
 The used options were \texttt{pagecolor=white},
 \texttt{thumblink=rule}, \texttt{linefill=dots},
 \texttt{height=auto}, \texttt{minheight=\{47pt\}},
@@ -852,7 +856,7 @@ Good bye!
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]% or later
-\ProvidesPackage{thumbs}[2011/05/18 v1.0b
+\ProvidesPackage{thumbs}[2011/05/20 v1.0c
             Thumb marks and overwiew page(s) (HMM)]
 
 %    \end{macrocode}
@@ -916,8 +920,8 @@ Good bye!
 %    \begin{macrocode}
 \RequirePackage{pagesLTS}[2011/03/17]% v1.1o
 \RequirePackage{rerunfilecheck}[2011/04/15]% v1.7
-\RequirePackage{ifthen}[2001/05/26]% v1.1c; for \whiledo
-\RequirePackage{warning}[2001/08/17]% v0.01
+\RequirePackage{infwarerr}[2010/04/08]% v1.3
+\RequirePackage{atveryend}[2011/04/23]% v1.7
 %    \end{macrocode}
 %
 % A last information for the user:
@@ -948,12 +952,6 @@ Good bye!
 
 \ProcessKeyvalOptions*
 
-\ifthumbs@verbose
-\else
-  \PackageWarningNoLine{thumbs}{Option verbose=false found:\MessageBreak%
-    You will lose some information.}
-\fi
-
 %    \end{macrocode}
 %
 % \DescribeMacro{pagecolor}
@@ -1019,6 +1017,24 @@ Good bye!
 
 %    \end{macrocode}
 %
+% When option |verbose| was choosen, information about the thumb marks dimensions
+% (and top and bottom thumb marks margin) shall be presented, but
+% |\the\something@something| does not work because of |@|. Therefore we need a
+% |\thumbsinfodimen| dimen and a command to set it.
+%
+%    \begin{macrocode}
+\ifthumbs@verbose
+  \newdimen\thumbsinfodimen
+  \newcommand{\thumbs@info}[1]{%
+    \setlength{\thumbsinfodimen}{#1}%
+    }%
+\else
+  \PackageWarningNoLine{thumbs}{Option verbose=false found:\MessageBreak%
+    You will lose some information.}
+\fi
+
+%    \end{macrocode}
+%
 % We create a new |Box| for the thumbs, a~temporary counter and make some
 % global definitions.
 %
@@ -1027,8 +1043,6 @@ Good bye!
 
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % 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
@@ -1042,7 +1056,8 @@ Good bye!
 
 \gdef\th@mbs{0}
 \gdef\th@mbsmax{0}
-\gdef\th@umbsperpage{0}
+\gdef\th@umbsperpage{0}% will be set via aux file
+\gdef\th@umbsperpagecount{0}
 
 \gdef\th@mbtitle{}
 \gdef\th@mbtext{}
@@ -1085,14 +1100,10 @@ Good bye!
 
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % In |\setth@mbheight| the height of a thumb mark (for automatically thumb heights)
-% is computed as
-%\begin{verbatim}
-% "round down{((Thumbs extension) / (Number of Thumbs)) - (distance between Thumbs)}"
-%\end{verbatim}
-% .
+% is computed as\\
+% \textquotedblleft |((Thumbs extension) / (Number of Thumbs)) - (2|
+% $\times $\ |distance between Thumbs)|\textquotedblright.
 %
 %    \begin{macrocode}
 \newcommand{\setth@mbheight}{%
@@ -1106,8 +1117,7 @@ Good bye!
     \divide\th@mbheighty\th@mbsmax
   \fi
   \advance\th@mbheighty-\th@mbsdistance
-  % Remove numbers behind the decimal seperator, e.g. 13.67777 pt -> 13 pt:
-  \@settopoint\th@mbheighty%
+  \advance\th@mbheighty-\th@mbsdistance
   }
 
 %    \end{macrocode}
@@ -1140,9 +1150,7 @@ Good bye!
 %
 % 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.
-%
-% \pagebreak
+% 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}$
@@ -1186,7 +1194,10 @@ Good bye!
 % When a value has been given for the thumb marks' height, this fixed value is used.
 %
 %    \begin{macrocode}
-      \PackageInfo{thumbs}{Now setting thumbs' height to \thumbs@height.\MessageBreak}
+      \ifthumbs@verbose
+        \thumbs@info{\th@mbheighty}
+        \PackageInfo{thumbs}{Now setting thumbs' height to \the\thumbsinfodimen .}
+      \fi
       \setlength{\th@mbheighty}{\thumbs@height}
     \fi
   \fi
@@ -1198,6 +1209,19 @@ Good bye!
   \newread\@instreamthumb%
 %    \end{macrocode}
 %
+% \pagebreak
+%
+% Inform the users about the dimensions of the thumb marks (look in the \xfile{log} file):
+%
+%    \begin{macrocode}
+  \ifthumbs@verbose
+    \message{^^J}
+    \@PackageInfoNoLine{thumbs}{************** THUMB dimensions **************}
+    \thumbs@info{\th@mbheighty}
+    \@PackageInfoNoLine{thumbs}{The height of the thumb marks is \the\thumbsinfodimen}
+  \fi
+%    \end{macrocode}
+%
 % Setting the thumb mark width (|\th@mbwidthx|):
 %
 %    \begin{macrocode}
@@ -1221,6 +1245,10 @@ Good bye!
       \fi
     \fi
   \fi
+  \ifthumbs@verbose
+    \thumbs@info{\th@mbwidthx}
+    \@PackageInfoNoLine{thumbs}{The width of the thumb marks is \the\thumbsinfodimen}
+  \fi
 %    \end{macrocode}
 %
 % Setting the position of the first/top thumb mark. Vertical (y) position
@@ -1236,6 +1264,11 @@ Good bye!
     \def\thumbs@topthumbmargin{auto}
   \fi
   \def\th@mbstest{auto}
+%    \end{macrocode}
+%
+% \pagebreak
+%
+%    \begin{macrocode}
   \ifx\thumbs@topthumbmargin\th@mbstest%
     \setlength{\th@mbposy}{1in}
     \advance\th@mbposy+\voffset
@@ -1257,6 +1290,13 @@ Good bye!
     \advance\th@mbposy+\th@mbheighty
   \fi
   \setlength{\th@mbposytop}{\th@mbposy}
+  \ifthumbs@verbose%
+    \setlength{\@tempdimc}{\th@mbposytop}
+    \advance\@tempdimc-\th@mbheighty
+    \advance\@tempdimc+\thumbs@distance
+    \thumbs@info{\@tempdimc}
+    \@PackageInfoNoLine{thumbs}{The top thumb margin is \the\thumbsinfodimen}
+  \fi
 %    \end{macrocode}
 %
 % Setting the lowest position of a thumb mark, according to option |\thumbs@bottomthumbmargin|:
@@ -1312,10 +1352,16 @@ Good bye!
     \setlength{\th@mbposybottom}{\paperheight}
     \advance\th@mbposybottom-\thumbs@bottomthumbmargin
   \fi
+  \ifthumbs@verbose%
+    \setlength{\@tempdimc}{\paperheight}
+    \advance\@tempdimc-\th@mbposybottom
+    \thumbs@info{\@tempdimc}
+    \@PackageInfoNoLine{thumbs}{The bottom thumb margin is \the\thumbsinfodimen}
+    \@PackageInfoNoLine{thumbs}{**********************************************}
+    \message{^^J}
+  \fi
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % |\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
@@ -1375,11 +1421,6 @@ Good bye!
       Your command \string\thumbnewcolumn\space will be ignored now.%
      }%
   \else%
-%    \end{macrocode}
-%
-% \pagebreak
-%
-%    \begin{macrocode}
     \PackageWarning{thumbs}{%
       Starting of another column requested by command\MessageBreak%
       \string\thumbnewcolumn.\space Only use this command directly\MessageBreak%
@@ -1430,7 +1471,7 @@ Good bye!
     \setlength{\th@mbposy}{\th@mbposytop}%
     \advance\th@mbposy\thumbs@distance%
     \ifx\th@mbcolumn\pagesLTS@zero%
-      \global\edef\th@umbsperpage{\th@mbs}%
+      \global\edef\th@umbsperpagecount{\th@mbs}%
       \gdef\th@mbcolumn{1}%
     \fi%
   \fi%
@@ -1439,8 +1480,6 @@ Good bye!
   \global\edef\th@mbs{\arabic{th@mbs@tmpA}}%
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % We do not want any labels or index or glossary entries confusing the
 % table of thumbs entries:
 %
@@ -1503,8 +1542,6 @@ Good bye!
   \fi%
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % Maybe there is a rare case, where more than one thumb mark will be placed
 % at one page. Probably a |\pagebreak|, |\newpage| or something similar
 % would be advisable, but nevertheless we should prepare for this case.
@@ -1519,6 +1556,11 @@ Good bye!
   \fi%
   \ifx\th@mbtoprint\pagesLTS@zero%
   \else%
+%    \end{macrocode}
+%
+% \pagebreak
+%
+%    \begin{macrocode}
     \ifx\th@mbcolumnnew\pagesLTS@zero%
       \PackageWarning{thumbs}{More than one thumb at one page:\MessageBreak%
         You placed more than one thumb mark (at least \th@mbonpage)\MessageBreak%
@@ -1632,6 +1674,11 @@ Good bye!
   \advance\th@mbwidthxtoc-1in%
   \advance\th@mbwidthxtoc-\hoffset%
   \advance\th@mbwidthxtoc-\oddsidemargin%
+%    \end{macrocode}
+%
+% \pagebreak
+%
+%    \begin{macrocode}
   \put(1in+\hoffset+\oddsidemargin,-\th@mbposy){%
     \begin{picture}(0,0)%
 %    \end{macrocode}
@@ -1684,8 +1731,6 @@ Good bye!
               \else%
 %    \end{macrocode}
 %
-% \pagebreak
-%
 % \item[- |title|] hyperlinks the \emph{titles} of the thumb marks
 %
 %    \begin{macrocode}
@@ -1812,6 +1857,8 @@ Good bye!
 
 %    \end{macrocode}
 %
+% \pagebreak
+%
 % \DescribeMacro{\th@mbprint}
 % |\th@mbprint| places a |picture| containing the thumb mark on the page.
 %
@@ -1929,15 +1976,15 @@ Good bye!
 %
 %    \begin{macrocode}
   \ifx\th@mbcolumn\pagesLTS@zero% if there is only one column of thumbs
-    \global\edef\th@umbsperpage{\th@mbs}
+    \global\edef\th@umbsperpagecount{\th@mbs}
     \gdef\th@mbcolumn{1}
   \fi
-  \ifx\th@umbsperpage\pagesLTS@zero
-    \gdef\th@umbsperpage{\th@mbs}% \th@mbs was increased with each \addthumb
+  \ifx\th@umbsperpagecount\pagesLTS@zero
+    \gdef\th@umbsperpagecount{\th@mbs}% \th@mbs was increased with each \addthumb
   \fi
   \if@filesw
     \immediate\write\@auxout{\string
-      \gdef\string\th@umbsperpage{\th@umbsperpage}}
+      \gdef\string\th@umbsperpage{\th@umbsperpagecount}}
     \immediate\write\@auxout{\string
       \gdef\string\th@mbsmax{\th@mbs}}
     \expandafter\newwrite\csname tf@tmb\endcsname
@@ -2058,10 +2105,10 @@ Good bye!
   \newcounter{thumbsstop}
   \setcounter{thumbsstop}{1}
   \addtocounter{thumbsstop}{\th@mbsmax}
-  \whiledo{\value{FileLine}<\value{thumbsstop}}
-    {\if@twoside \cleardoublepage%
-     \else \clearpage%
-     \fi%
+  \@whilenum\value{FileLine}<\value{thumbsstop}\do%
+   {\if@twoside \cleardoublepage%
+    \else \clearpage%
+    \fi%
 %    \end{macrocode}
 %
 % When the \xpackage{hyperref} package is used, one might like to refer to the
@@ -2070,20 +2117,20 @@ Good bye!
 % the entry is placed into the table of contents.
 %
 %    \begin{macrocode}
-     \ifnum\value{FileLine}=1%
-       \@ifundefined{Hy@Warning}{}{\phantomsection \label{TableOfThumbs}}%
-       \ifx\th@mbs@toc@level\empty%
-       \else \addcontentsline{toc}{\th@mbs@toc@level}{\th@mbs@toc@text}%
-       \fi%
-     \fi%
-     \null%
-     \th@mbs@verview%
-     \pagebreak%
-     \ifthumbs@verbose%
-       \message{THUMBS: Fileline: \arabic{FileLine}, a: \arabic{th@mblinea}, %
-         b: \arabic{th@mblineb}, per page: \th@umbsperpage, max: \th@mbsmax.^^J}%
-     \fi%
-    }%
+    \ifnum\value{FileLine}=1%
+      \@ifundefined{Hy@Warning}{}{\phantomsection \label{TableOfThumbs}}%
+      \ifx\th@mbs@toc@level\empty%
+      \else \addcontentsline{toc}{\th@mbs@toc@level}{\th@mbs@toc@text}%
+      \fi%
+    \fi%
+    \null%
+    \th@mbs@verview%
+    \pagebreak%
+    \ifthumbs@verbose%
+      \message{THUMBS: Fileline: \arabic{FileLine}, a: \arabic{th@mblinea}, %
+        b: \arabic{th@mblineb}, per page: \th@umbsperpage, max: \th@mbsmax.^^J}%
+    \fi%
+   }%
 %    \end{macrocode}
 %
 % \pagebreak
@@ -2114,7 +2161,7 @@ Good bye!
     \AtBeginShipoutUpperLeftForeground{%
       \IfFileExists{\jobname.tmb}{% then
         \openin\@instreamthumb=\jobname.tmb %
-          \whiledo{\value{FileLine}<\value{th@mblineb}}
+          \@whilenum\value{FileLine}<\value{th@mblineb}\do%
            {\ifthumbs@verbose%
               \message{THUMBS: Processing \jobname.tmb line \arabic{FileLine}.}%
             \fi%
@@ -2194,7 +2241,7 @@ Good bye!
 %
 %    \begin{macrocode}
         \setcounter{FileLine}{\arabic{thumbsstop}}%
-        \addglobalwarning{%
+        \AtVeryVeryEnd{%
           \PackageWarningNoLine{thumbs}{%
             File \jobname.tmb not found.\MessageBreak%
             Rerun to get thumbs overview page(s) right.\MessageBreak%
@@ -2225,10 +2272,10 @@ Good bye!
 % \begin{description}
 % \item[-] \TeX Format \LaTeXe: \url{http://www.CTAN.org/}
 %
-% \item[-] package \xpackage{geometry}, 2010/09/12, v5.6, \CTAN{macros/latex/contrib/geometry/geometry.dtx}
-%
 % \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, \CTAN{macros/latex/contrib/geometry/geometry.dtx}
+%
 % \item[-] package \xpackage{holtxdoc}, 2011/02/04, v0.21, \CTAN{macros/latex/contrib/oberdiek/holtxdoc.dtx}
 %
 % \item[-] package \xpackage{hypdoc}, 2010/03/26, v1.9, \CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx}
@@ -2240,24 +2287,23 @@ Good bye!
 % \begin{description}
 % \item[-] \TeX Format \LaTeXe, \url{http://www.CTAN.org/}
 %
-% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10, \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}
-%
-% \item[-] package \xpackage{atbegshi}, 2011/01/30, v1.15, \CTAN{macros/latex/contrib/oberdiek/atbegshi.dtx}
-%
 % \item[-] package \xpackage{xcolor}, 2007/01/21, v2.11, \CTAN{macros/latex/contrib/xcolor/xcolor.dtx}
 %
-% \item[-] package \xpackage{picture}, 2009/10/11, v1.3, \CTAN{macros/latex/contrib/oberdiek/picture.dtx}
+% \item[-] package \xpackage{pagesLTS}, 2011/03/17, v1.1o, \CTAN{macros/latex/contrib/pageslts/pagesLTS.dtx}
 %
 % \item[-] package \xpackage{alphalph}, 2010/04/18, v2.3, \CTAN{macros/latex/contrib/oberdiek/alphalph.dtx}
 %
-% \item[-] package \xpackage{pagesLTS}, 2011/03/17, v1.1o, \CTAN{macros/latex/contrib/pageslts/pagesLTS.dtx}
+% \item[-] package \xpackage{atbegshi}, 2011/01/30, v1.15, \CTAN{macros/latex/contrib/oberdiek/atbegshi.dtx}
 %
-% \item[-] package \xpackage{rerunfilecheck}, 2011/04/15, v1.7, \CTAN{macros/latex/contrib/oberdiek/rerunfilecheck.dtx}
+% \item[-] package \xpackage{atveryend}, 2011/04/23, v1.7, \CTAN{macros/latex/contrib/oberdiek/atveryend.dtx}
 %
-% \item[-] package \xpackage{ifthen}, 2001/05/26, v1.1c, \CTAN{macros/latex/base/ifthen.dtx}
+% \item[-] package \xpackage{infwarerr}, 2010/04/08, v1.3, \CTAN{macros/latex/contrib/oberdiek/infwarerr.dtx}
 %
-% \item[-] package \xpackage{warning}, 2001/08/17, v0.01, \CTAN{macros/latex/contrib/warning/warning.sty}
+% \item[-] package \xpackage{kvoptions}, 2010/12/23, v3.10, \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}
 %
+% \item[-] package \xpackage{picture}, 2009/10/11, v1.3, \CTAN{macros/latex/contrib/oberdiek/picture.dtx}
+%
+% \item[-] package \xpackage{rerunfilecheck}, 2011/04/15, v1.7, \CTAN{macros/latex/contrib/oberdiek/rerunfilecheck.dtx}
 % \end{description}
 %
 % \pagebreak
@@ -2291,7 +2337,7 @@ Good bye!
 %
 % \item[-] package \xpackage{hyperref}, 2011/04/17, v6.82g, \CTAN{macros/latex/contrib/hyperref/hyperref.dtx}
 %
-% \item[-] package \xpackage{thumbs}, 2011/05/18, v1.0b, \CTAN{macros/latex/contrib/thumbs/thumbs.dtx}\\
+% \item[-] package \xpackage{thumbs}, 2011/05/20, v1.0c, \CTAN{macros/latex/contrib/thumbs/thumbs.dtx}\\
 %   (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
 %    have some version of it -- is it the current one?)
@@ -2320,26 +2366,30 @@ Good bye!
 % \item[-] \xpackage{thumby}, 2010/01/14, v0.1, \CTAN{macros/latex/contrib/thumby/thumby.sty}
 % \end{description}
 %
+% \pagebreak
+%
 % \DescribeMacro{Oberdiek}
 % \DescribeMacro{holtxdoc}
 % \DescribeMacro{alphalph}
 % \DescribeMacro{atbegshi}
+% \DescribeMacro{atveryend}
+% \DescribeMacro{infwarerr}
 % \DescribeMacro{kvoptions}
 % \DescribeMacro{picture}
 % \DescribeMacro{rerunfilecheck}
-% All packages of Heiko Oberdiek's bundle `oberdiek'
-% (especially \xpackage{holtxdoc}, \xpackage{alphalph}, \xpackage{atbegshi}, \xpackage{kvoptions},
-% \xpackage{picture}, and \xpackage{rerunfilecheck})
+% All packages of \textsf{Heiko Oberdiek}'s bundle `oberdiek'
+% (especially \xpackage{holtxdoc}, \xpackage{alphalph}, \xpackage{atbegshi}, \xpackage{infwarerr},
+%  \xpackage{kvoptions}, \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.\\
 %
-% \pagebreak
+% \vspace{6em}
 %
 % \DescribeMacro{hyperref}
-% \noindent \xpackage{hyperref} is not included in that bundle and needs to be downloaded
-% separately,\\
+% \noindent \textsf{Heiko Oberdiek}'s \xpackage{hyperref} package is not included in that bundle
+% but needs to be downloaded separately,\\
 % \url{http://mirror.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
 %
 % \DescribeMacro{M\"{u}nch}
@@ -2510,6 +2560,8 @@ Good bye!
 % \indent |pdflatex thumbs-example.tex|\\
 % and will need probably at least four~(!) compiler runs to get everything right.
 %
+% \bigskip
+%
 % \section{Acknowledgements}
 %
 % I would like to thank \textsc{Heiko Oberdiek}
@@ -2521,6 +2573,7 @@ Good bye!
 % newsgroups for their help in all things \TeX.
 %
 % \bigskip
+%
 % \phantomsection
 % \begin{History}\label{History}
 %   \begin{Version}{2010/04/01 v0.01 -- 2011/05/13 v0.46}
@@ -2543,7 +2596,31 @@ Good bye!
 %             while the \xfile{.aux} file was not deleted,
 %             and the document was compiled again, and the \xfile{.aux} file was
 %             reused, then reading from the then empty \xfile{.tmb} files resulted
-%             in an endles loop. Fixed.
+%             in an endless loop. Fixed.
+%     \item Minor details.
+%   \end{Version}
+% \pagebreak
+%   \begin{Version}{2011/05/20 v1.0c}
+%     \item The thumb mark width is written to the \xfile{log} file (in |verbose| mode
+%             only). The knowledge of the value could be helpful for the user,
+%             when option |width={auto}| was used, and one wants the thumb marks to be
+%             half as big, or with double width, or a little wider, or a little
+%             smaller\ldots\ Also thumb marks' height, top thumb margin and bottom thumb
+%             margin are given. Look for\\
+%             |************** THUMB dimensions **************|\\
+%             in the \xfile{log} file.
+%     \item Bug fix: There was a\\
+%             |  \advance\th@mbheighty-\th@mbsdistance|,\\
+%             where\\
+%             |  \advance\th@mbheighty-\th@mbsdistance|\\
+%             |  \advance\th@mbheighty-\th@mbsdistance|\\
+%             should have been, causing wrong thumb marks' height, thereby wrong number
+%             of thumb marks per column, and thereby another endless loop. Fixed.
+%     \item The \xpackage{ifthen} package is no longer required, removed.
+%     \item The \xpackage{infwarerr} package is used for its |\@PackageInfoNoLine| command.
+%     \item The \xpackage{warning} package is no longer used, removed. Instead,
+%             the \xpackage{atveryend} package is used, because it is loaded anyway
+%             when \xpackage{hyperref} is used.
 %     \item Minor details.
 %   \end{Version}
 % \end{History}
diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.ins b/Master/texmf-dist/source/latex/thumbs/thumbs.ins
index daabbb1b09b..a77ceeff039 100644
--- a/Master/texmf-dist/source/latex/thumbs/thumbs.ins
+++ b/Master/texmf-dist/source/latex/thumbs/thumbs.ins
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: thumbs
-%% Version: 2011/05/18 v1.0b
+%% Version: 2011/05/20 v1.0c
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -41,7 +41,7 @@
 \input docstrip.tex
 \Msg{*************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: thumbs 2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)}
+\Msg{* Package: thumbs 2011/05/20 v1.0c Thumb marks and overwiew page(s) (HMM)}
 \Msg{*************************************************************************}
 
 \keepsilent
@@ -53,7 +53,7 @@
 This is a generated file.
 
 Project: thumbs
-Version: 2011/05/18 v1.0b
+Version: 2011/05/20 v1.0c
 
 Copyright (C) 2010, 2011 by
     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
diff --git a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
index 246156c9c56..52f8825b70d 100644
--- a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
+++ b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: thumbs
-%% Version: 2011/05/18 v1.0b
+%% Version: 2011/05/20 v1.0c
 %% 
 %% Copyright (C) 2010, 2011 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -39,7 +39,7 @@
 %%    thumbs-example.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]% or later
-\ProvidesPackage{thumbs}[2011/05/18 v1.0b
+\ProvidesPackage{thumbs}[2011/05/20 v1.0c
             Thumb marks and overwiew page(s) (HMM)]
 
 %% This package allows to create a customizable thumb index,
@@ -68,8 +68,8 @@
 \RequirePackage{alphalph}[2010/04/18]% v2.3
 \RequirePackage{pagesLTS}[2011/03/17]% v1.1o
 \RequirePackage{rerunfilecheck}[2011/04/15]% v1.7
-\RequirePackage{ifthen}[2001/05/26]% v1.1c; for \whiledo
-\RequirePackage{warning}[2001/08/17]% v0.01
+\RequirePackage{infwarerr}[2010/04/08]% v1.3
+\RequirePackage{atveryend}[2011/04/23]% v1.7
 %% thumbs may work with earlier versions of those packages,
 %% but this was not tested. Please consider updating your packages
 %% to the most recent version (if they are not already the most
@@ -89,12 +89,6 @@
 
 \ProcessKeyvalOptions*
 
-\ifthumbs@verbose
-\else
-  \PackageWarningNoLine{thumbs}{Option verbose=false found:\MessageBreak%
-    You will lose some information.}
-\fi
-
 \pagecolor{\thumbs@pagecolor}
 
 \ifx\thumbs@linefill\empty%
@@ -139,6 +133,16 @@
   \setlength{\th@mbsdistance}{\thumbs@distance}
 \fi
 
+\ifthumbs@verbose
+  \newdimen\thumbsinfodimen
+  \newcommand{\thumbs@info}[1]{%
+    \setlength{\thumbsinfodimen}{#1}%
+    }%
+\else
+  \PackageWarningNoLine{thumbs}{Option verbose=false found:\MessageBreak%
+    You will lose some information.}
+\fi
+
 \newbox\ThumbsBox
 
 \newcounter{th@mbs@tmpA}
@@ -146,7 +150,8 @@
 
 \gdef\th@mbs{0}
 \gdef\th@mbsmax{0}
-\gdef\th@umbsperpage{0}
+\gdef\th@umbsperpage{0}% will be set via aux file
+\gdef\th@umbsperpagecount{0}
 
 \gdef\th@mbtitle{}
 \gdef\th@mbtext{}
@@ -193,8 +198,7 @@
     \divide\th@mbheighty\th@mbsmax
   \fi
   \advance\th@mbheighty-\th@mbsdistance
-  % Remove numbers behind the decimal seperator, e.g. 13.67777 pt -> 13 pt:
-  \@settopoint\th@mbheighty%
+  \advance\th@mbheighty-\th@mbsdistance
   }
 
 \AtBeginDocument{%
@@ -237,11 +241,20 @@
         \advance\th@mbheighty+\th@mbposyA% = \thumbs@minheight
      \fi
     \else
-      \PackageInfo{thumbs}{Now setting thumbs' height to \thumbs@height.\MessageBreak}
+      \ifthumbs@verbose
+        \thumbs@info{\th@mbheighty}
+        \PackageInfo{thumbs}{Now setting thumbs' height to \the\thumbsinfodimen .}
+      \fi
       \setlength{\th@mbheighty}{\thumbs@height}
     \fi
   \fi
   \newread\@instreamthumb%
+  \ifthumbs@verbose
+    \message{^^J}
+    \@PackageInfoNoLine{thumbs}{************** THUMB dimensions **************}
+    \thumbs@info{\th@mbheighty}
+    \@PackageInfoNoLine{thumbs}{The height of the thumb marks is \the\thumbsinfodimen}
+  \fi
   \setlength{\th@mbwidthx}{\paperwidth}
   \advance\th@mbwidthx-\textwidth
   \divide\th@mbwidthx4
@@ -262,6 +275,10 @@
       \fi
     \fi
   \fi
+  \ifthumbs@verbose
+    \thumbs@info{\th@mbwidthx}
+    \@PackageInfoNoLine{thumbs}{The width of the thumb marks is \the\thumbsinfodimen}
+  \fi
   % Thumb position x \th@mbposx
   \setlength{\th@mbposx}{\paperwidth}
   \advance\th@mbposx-\th@mbwidthx
@@ -292,6 +309,13 @@
     \advance\th@mbposy+\th@mbheighty
   \fi
   \setlength{\th@mbposytop}{\th@mbposy}
+  \ifthumbs@verbose%
+    \setlength{\@tempdimc}{\th@mbposytop}
+    \advance\@tempdimc-\th@mbheighty
+    \advance\@tempdimc+\thumbs@distance
+    \thumbs@info{\@tempdimc}
+    \@PackageInfoNoLine{thumbs}{The top thumb margin is \the\thumbsinfodimen}
+  \fi
   % Max. thumb position y \th@mbposybottom
   \ifx\thumbs@bottomthumbmargin\empty%
     \gdef\thumbs@bottomthumbmargin{auto}
@@ -342,6 +366,14 @@
     \setlength{\th@mbposybottom}{\paperheight}
     \advance\th@mbposybottom-\thumbs@bottomthumbmargin
   \fi
+  \ifthumbs@verbose%
+    \setlength{\@tempdimc}{\paperheight}
+    \advance\@tempdimc-\th@mbposybottom
+    \thumbs@info{\@tempdimc}
+    \@PackageInfoNoLine{thumbs}{The bottom thumb margin is \the\thumbsinfodimen}
+    \@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.
   \setlength{\th@mbsposytocyy}{\th@mbposy}% \th@mbsposytocyy shall not be changed.
@@ -401,7 +433,7 @@
     \setlength{\th@mbposy}{\th@mbposytop}%
     \advance\th@mbposy\thumbs@distance%
     \ifx\th@mbcolumn\pagesLTS@zero%
-      \global\edef\th@umbsperpage{\th@mbs}%
+      \global\edef\th@umbsperpagecount{\th@mbs}%
       \gdef\th@mbcolumn{1}%
     \fi%
   \fi%
@@ -705,15 +737,15 @@
      }
   \fi
   \ifx\th@mbcolumn\pagesLTS@zero% if there is only one column of thumbs
-    \global\edef\th@umbsperpage{\th@mbs}
+    \global\edef\th@umbsperpagecount{\th@mbs}
     \gdef\th@mbcolumn{1}
   \fi
-  \ifx\th@umbsperpage\pagesLTS@zero
-    \gdef\th@umbsperpage{\th@mbs}% \th@mbs was increased with each \addthumb
+  \ifx\th@umbsperpagecount\pagesLTS@zero
+    \gdef\th@umbsperpagecount{\th@mbs}% \th@mbs was increased with each \addthumb
   \fi
   \if@filesw
     \immediate\write\@auxout{\string
-      \gdef\string\th@umbsperpage{\th@umbsperpage}}
+      \gdef\string\th@umbsperpage{\th@umbsperpagecount}}
     \immediate\write\@auxout{\string
       \gdef\string\th@mbsmax{\th@mbs}}
     \expandafter\newwrite\csname tf@tmb\endcsname
@@ -787,24 +819,24 @@
   \newcounter{thumbsstop}
   \setcounter{thumbsstop}{1}
   \addtocounter{thumbsstop}{\th@mbsmax}
-  \whiledo{\value{FileLine}<\value{thumbsstop}}
-    {\if@twoside \cleardoublepage%
-     \else \clearpage%
-     \fi%
-     \ifnum\value{FileLine}=1%
-       \@ifundefined{Hy@Warning}{}{\phantomsection \label{TableOfThumbs}}%
-       \ifx\th@mbs@toc@level\empty%
-       \else \addcontentsline{toc}{\th@mbs@toc@level}{\th@mbs@toc@text}%
-       \fi%
-     \fi%
-     \null%
-     \th@mbs@verview%
-     \pagebreak%
-     \ifthumbs@verbose%
-       \message{THUMBS: Fileline: \arabic{FileLine}, a: \arabic{th@mblinea}, %
-         b: \arabic{th@mblineb}, per page: \th@umbsperpage, max: \th@mbsmax.^^J}%
-     \fi%
-    }%
+  \@whilenum\value{FileLine}<\value{thumbsstop}\do%
+   {\if@twoside \cleardoublepage%
+    \else \clearpage%
+    \fi%
+    \ifnum\value{FileLine}=1%
+      \@ifundefined{Hy@Warning}{}{\phantomsection \label{TableOfThumbs}}%
+      \ifx\th@mbs@toc@level\empty%
+      \else \addcontentsline{toc}{\th@mbs@toc@level}{\th@mbs@toc@text}%
+      \fi%
+    \fi%
+    \null%
+    \th@mbs@verview%
+    \pagebreak%
+    \ifthumbs@verbose%
+      \message{THUMBS: Fileline: \arabic{FileLine}, a: \arabic{th@mblinea}, %
+        b: \arabic{th@mblineb}, per page: \th@umbsperpage, max: \th@mbsmax.^^J}%
+    \fi%
+   }%
   \setlength{\th@mbposy}{\th@mbsposytocy}%
   \ifx\th@mbprintingovertoc\pagesLTS@one%
     \continuethumb%
@@ -820,7 +852,7 @@
     \AtBeginShipoutUpperLeftForeground{%
       \IfFileExists{\jobname.tmb}{% then
         \openin\@instreamthumb=\jobname.tmb %
-          \whiledo{\value{FileLine}<\value{th@mblineb}}
+          \@whilenum\value{FileLine}<\value{th@mblineb}\do%
            {\ifthumbs@verbose%
               \message{THUMBS: Processing \jobname.tmb line \arabic{FileLine}.}%
             \fi%
@@ -883,7 +915,7 @@
         \fi%
       }{% else
         \setcounter{FileLine}{\arabic{thumbsstop}}%
-        \addglobalwarning{%
+        \AtVeryVeryEnd{%
           \PackageWarningNoLine{thumbs}{%
             File \jobname.tmb not found.\MessageBreak%
             Rerun to get thumbs overview page(s) right.\MessageBreak%