summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-18 22:24:23 +0000
committerKarl Berry <karl@freefriends.org>2011-05-18 22:24:23 +0000
commitff287f29c33f3f1d440be0d25e7d480316c1af57 (patch)
tree073584f5e2a68e27ce5ce25d036c820318625154 /Master
parente3638039b13680f893866fb5f168f48bd9fc8c24 (diff)
thumbs (18may11)
git-svn-id: svn://tug.org/texlive/trunk@22525 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/thumbs/README2
-rw-r--r--Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdfbin152393 -> 152389 bytes
-rw-r--r--Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex25
-rw-r--r--Master/texmf-dist/doc/latex/thumbs/thumbs.pdfbin426650 -> 425755 bytes
-rw-r--r--Master/texmf-dist/source/latex/thumbs/thumbs.drv4
-rw-r--r--Master/texmf-dist/source/latex/thumbs/thumbs.dtx248
-rw-r--r--Master/texmf-dist/source/latex/thumbs/thumbs.ins6
-rw-r--r--Master/texmf-dist/tex/latex/thumbs/thumbs.sty110
8 files changed, 167 insertions, 228 deletions
diff --git a/Master/texmf-dist/doc/latex/thumbs/README b/Master/texmf-dist/doc/latex/thumbs/README
index 0602f9a74b5..3ef2ca20ab6 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/14, v1.0a
+README for thumbs package, 2011/05/18, v1.0b
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 87f2719777e..ece9f2c3639 100644
--- a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf
+++ b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex
index b462f664b55..a66ec4dab85 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/14 v1.0a
+%% Version: 2011/05/18 v1.0b
%%
%% Copyright (C) 2010, 2011 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -40,15 +40,16 @@
%%
\documentclass[twoside,british]{article}[2007/10/19]% v1.4h
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% When compiling with SWP 5.50. Build 2960, %
-%% these additional packages are needed: %
-%% \usepackage[T1]{fontenc} %
-%% \usepackage{amsfonts} %
-%% \usepackage[math]{cellspace} %
-%% \usepackage{xcolor} %
-%% \pagecolor{white} %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% When compiling with SWP 5.50. Build 2960 %
+%% (copyright MacKichan Software, Inc.), %
+%% these additional packages are needed: %
+%% \usepackage[T1]{fontenc} %
+%% \usepackage{amsfonts} %
+%% \usepackage[math]{cellspace} %
+%% \usepackage{xcolor} %
+%% \pagecolor{white} %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{lipsum}[2011/04/14]% v1.2
\usepackage{eurosym}[1998/08/06]% v1.1
\usepackage[extension=pdf,%
@@ -65,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/14]% 1.0a
+ verbose=true]{thumbs}[2011/05/18]% v1.0b
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
\begin{document}
@@ -75,7 +76,7 @@
\markboth{Example for thumbs}{Example for thumbs}
This example demonstrates the most common uses of package
-\textsf{thumbs}, v1.0a as of 2011/05/14 (HMM).
+\textsf{thumbs}, v1.0b as of 2011/05/18 (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 ae3ee003f78..3e234962917 100644
--- a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf
+++ b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.drv b/Master/texmf-dist/source/latex/thumbs/thumbs.drv
index e0669fd4026..1025688459e 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/14 v1.0a
+%% Version: 2011/05/18 v1.0b
%%
%% 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/14 v1.0a Thumb marks and overwiew page(s) (HMM)]%
+ [2011/05/18 v1.0b 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 d30c931ca4d..1a142da5d0d 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/14 v1.0a
+% Version: 2011/05/18 v1.0b
%
% 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/14 v1.0a Thumb marks and overwiew page(s) (HMM)}
+\Msg{* Package: thumbs 2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)}
\Msg{*************************************************************************}
\keepsilent
@@ -91,7 +91,7 @@
This is a generated file.
Project: thumbs
-Version: 2011/05/14 v1.0a
+Version: 2011/05/18 v1.0b
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/14 v1.0a Thumb marks and overwiew page(s) (HMM)]%
+ [2011/05/18 v1.0b 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{1663}
+% \CheckSum{1617}
%
% \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/14 v1.0a}
+% \date{2011/05/18 v1.0b}
% \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
%
% \maketitle
@@ -539,15 +539,16 @@ and the derived files
%<*example>
\documentclass[twoside,british]{article}[2007/10/19]% v1.4h
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% When compiling with SWP 5.50. Build 2960, %
-%% these additional packages are needed: %
-%% \usepackage[T1]{fontenc} %
-%% \usepackage{amsfonts} %
-%% \usepackage[math]{cellspace} %
-%% \usepackage{xcolor} %
-%% \pagecolor{white} %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% When compiling with SWP 5.50. Build 2960 %
+%% (copyright MacKichan Software, Inc.), %
+%% these additional packages are needed: %
+%% \usepackage[T1]{fontenc} %
+%% \usepackage{amsfonts} %
+%% \usepackage[math]{cellspace} %
+%% \usepackage{xcolor} %
+%% \pagecolor{white} %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{lipsum}[2011/04/14]% v1.2
\usepackage{eurosym}[1998/08/06]% v1.1
\usepackage[extension=pdf,%
@@ -564,7 +565,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/14]% 1.0a
+ verbose=true]{thumbs}[2011/05/18]% v1.0b
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
\begin{document}
@@ -574,7 +575,7 @@ and the derived files
\markboth{Example for thumbs}{Example for thumbs}
This example demonstrates the most common uses of package
-\textsf{thumbs}, v1.0a as of 2011/05/14 (HMM).
+\textsf{thumbs}, v1.0b as of 2011/05/18 (HMM).
The used options were \texttt{pagecolor=white},
\texttt{thumblink=rule}, \texttt{linefill=dots},
\texttt{height=auto}, \texttt{minheight=\{47pt\}},
@@ -851,7 +852,7 @@ Good bye!
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/06/01]% or later
-\ProvidesPackage{thumbs}[2011/05/14 v1.0a
+\ProvidesPackage{thumbs}[2011/05/18 v1.0b
Thumb marks and overwiew page(s) (HMM)]
% \end{macrocode}
@@ -877,7 +878,8 @@ Good bye!
\message{^^J *** Compiling with SW(P)? ^^J%
Please see the sw(p)*.log or \jobname.log-file! *** ^^J}
\PackageWarningNoLine{thumbs}{%
- When compiling with SWP 5.50 Build 2960,\MessageBreak%
+ When compiling with SWP 5.50 Build 2960\MessageBreak%
+ (\copyright\ MacKichan Software, Inc.),\MessageBreak%
these additional packages are needed:\MessageBreak%
\string\usepackage[T1]{fontenc}\MessageBreak%
\string\usepackage{amsfonts}\MessageBreak%
@@ -906,6 +908,8 @@ Good bye!
\RequirePackage{alphalph}[2010/04/18]% v2.3
% \end{macrocode}
%
+% \pagebreak
+%
% For the total number of the current page we need the \xpackage{pagesLTS}
% package of myself (see subsection~\ref{ss:Downloads}):
%
@@ -1023,6 +1027,8 @@ 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
@@ -1134,7 +1140,10 @@ 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.\\
+% will be set later.
+%
+% \pagebreak
+%
% 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
@@ -1366,6 +1375,11 @@ 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%
@@ -1425,6 +1439,8 @@ 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:
%
@@ -1487,14 +1503,12 @@ 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.
-% We save the properties of the thumb mark(s). Instead of using |\...A|,
-% |\...B| and so on, I really would like to generate this dynamically.
-% If anybody could tell me how to do this, please send me an e-mail, thanks!
-%
-% \pagebreak
+% We save the properties of the thumb mark(s).
%
% \begin{macrocode}
\ifx\th@mbcolumnnew\pagesLTS@one%
@@ -1523,66 +1537,23 @@ Good bye!
\setlength{\th@mbposyA}{\th@mbposy}%
\else%
\ifx\th@mbcolumnnew\pagesLTS@zero%
- \ifnum\th@mbonpage=2%
- \ifnum\th@mbonpagemax>1%
- \else \gdef\th@mbonpagemax{2}%
- \fi%
- \gdef\th@mbtextB{#2}%
- \gdef\th@mbtextcolourB{#3}%
- \gdef\th@mbbackgroundcolourB{#4}%
- \else%
- \ifnum\th@mbonpage=3%
- \ifnum\th@mbonpagemax>2%
- \else \gdef\th@mbonpagemax{3}%
- \fi%
- \gdef\th@mbtextC{#2}%
- \gdef\th@mbtextcolourC{#3}%
- \gdef\th@mbbackgroundcolourC{#4}%
- \else%
- \ifnum\th@mbonpage=4%
- \ifnum\th@mbonpagemax>3%
- \else \gdef\th@mbonpagemax{4}%
- \fi%
- \gdef\th@mbtextD{#2}%
- \gdef\th@mbtextcolourD{#3}%
- \gdef\th@mbbackgroundcolourD{#4}%
- \else%
- \ifnum\th@mbonpage=5%
- \ifnum\th@mbonpagemax>4%
- \else \gdef\th@mbonpagemax{5}%
- \fi%
- \gdef\th@mbtextE{#2}%
- \gdef\th@mbtextcolourE{#3}%
- \gdef\th@mbbackgroundcolourE{#4}%
- \else%
- \ifnum\th@mbonpage=6%
- \ifnum\th@mbonpagemax>5%
- \else \gdef\th@mbonpagemax{6}%
- \fi%
- \gdef\th@mbtextF{#2}%
- \gdef\th@mbtextcolourF{#3}%
- \gdef\th@mbbackgroundcolourF{#4}%
- \else%
-% \end{macrocode}
-%
-% Dynamical creation also would overcome the limitation of six thumb marks on
-% a single page. It would be possible to continue with |\...G| and so on, but
-% this increases the code further -- and where to stop?
-%
-% \begin{macrocode}
- \PackageError{thumbs}{Too many thumbs on one page!}{%
- You tried to placed more than six (!) thumb marks on a single page,\MessageBreak%
- (approximate page number: \thepage ).\MessageBreak%
- Maybe insert a \string\pagebreak or \string\newpage?\MessageBreak%
- No following thumb marks will show on this page, sorry.\MessageBreak%
- If you absolutly need more marks on one page,\MessageBreak%
- please write an e-mail to the package maintainer.\MessageBreak%
- }%
- \fi%
- \fi%
- \fi%
+ \setcounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \@whilenum\th@mbonpagetest<\th@mbonpage\do{%
+ \addtocounter{th@mbs@tmpA}{1}%
+ \global\edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \ifnum\th@mbonpage=\th@mbonpagetest%
+ \ifnum\th@mbonpagemax<\th@mbonpage%
+ \global\edef\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%
+ }%
\else%
\ifnum\th@mbonpagemax<\th@mbonpage%
\global\edef\th@mbonpagemax{\th@mbonpage}%
@@ -1661,11 +1632,6 @@ 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}
@@ -1718,6 +1684,8 @@ Good bye!
\else%
% \end{macrocode}
%
+% \pagebreak
+%
% \item[- |title|] hyperlinks the \emph{titles} of the thumb marks
%
% \begin{macrocode}
@@ -1844,8 +1812,6 @@ Good bye!
% \end{macrocode}
%
-% \pagebreak
-%
% \DescribeMacro{\th@mbprint}
% |\th@mbprint| places a |picture| containing the thumb mark on the page.
%
@@ -1903,35 +1869,21 @@ Good bye!
\fi%
\fi%
\AtBeginShipoutUpperLeft{%
- \setcounter{th@mbs@tmpA}{\th@mbonpage}%
\ifx\th@mbprinting\pagesLTS@one%
\th@mbprint{\th@mbtextA}{\th@mbtextcolourA}{\th@mbbackgroundcolourA}%
- \ifnum\value{th@mbs@tmpA}>1%
+ \setcounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \@whilenum\th@mbonpagetest<\th@mbonpage\do{%
+ \addtocounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
\th@mb@yA%
- \th@mbprint{\th@mbtextB}{\th@mbtextcolourB}{\th@mbbackgroundcolourB}%
- \ifnum\value{th@mbs@tmpA}>2%
- \th@mb@yA%
- \th@mbprint{\th@mbtextC}{\th@mbtextcolourC}{\th@mbbackgroundcolourC}%
- \ifnum\value{th@mbs@tmpA}>3%
- \th@mb@yA%
- \th@mbprint{\th@mbtextD}{\th@mbtextcolourD}{\th@mbbackgroundcolourD}%
- \ifnum\value{th@mbs@tmpA}>4%
- \th@mb@yA%
- \th@mbprint{\th@mbtextE}{\th@mbtextcolourE}{\th@mbbackgroundcolourE}%
- \ifnum\value{th@mbs@tmpA}>5%
- \th@mb@yA%
- \th@mbprint{\th@mbtextF}{\th@mbtextcolourF}{\th@mbbackgroundcolourF}%
- \ifnum\value{th@mbs@tmpA}>6%
- \PackageWarning{thumbs}{Too many thumbs on one page,\MessageBreak%
- please see error message already given above.\MessageBreak%
- }%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
+ \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}%
+ \th@mbprint{\th@mbtmpdeftext}{\th@mbtmpdefcolour}{\th@mbtmpdefbackgroundcolour}%
+ }%
\fi%
+ \setcounter{th@mbs@tmpA}{\th@mbonpage}%
% \end{macrocode}
%
% When more than one thumb mark was placed at that page, on the following pages
@@ -1952,8 +1904,6 @@ Good bye!
% \end{macrocode}
%
-% \pagebreak
-%
% \DescribeMacro{\AfterLastShipout}
%
% \begin{macrocode}
@@ -1975,7 +1925,7 @@ Good bye!
%
% |\AfterLastShipout| the number of thumb marks per overview page
% and the total number of thumb marks are determined and saved
-% for the next \LaTeX\ run via the \xfile{.aux}\ file.
+% for the next \LaTeX\ run via the \xfile{.aux} file.
%
% \begin{macrocode}
\ifx\th@mbcolumn\pagesLTS@zero% if there is only one column of thumbs
@@ -2007,8 +1957,6 @@ Good bye!
% \end{macrocode}
%
-% \pagebreak
-%
% \DescribeMacro{\addthumbsoverviewtocontents}
% |\addthumbsoverviewtocontents| with two arguments is a replacement for
% |\addcontentsline{toc}{<level>}{<text>}|, where the first argument of
@@ -2025,6 +1973,8 @@ Good bye!
% \end{macrocode}
%
+% \pagebreak
+%
% \DescribeMacro{\thumbsoverview}
% |\thumbsoverview| is used to place the overview page(s) for the thumb marks.
% Its parameter is used to mark this page/these pages (e.\,g. in the page header).
@@ -2136,6 +2086,8 @@ Good bye!
}%
% \end{macrocode}
%
+% \pagebreak
+%
% After the overview, the current thumb mark (if there is any) is restored.
%
% \begin{macrocode}
@@ -2188,6 +2140,11 @@ Good bye!
\message{Executing \jobname.tmb line \arabic{FileLine}.^^J}%
\fi%
\@thumbsout%
+% \end{macrocode}
+%
+% \pagebreak
+%
+% \begin{macrocode}
\else% THIS SHOULD NEVER HAPPEN!
\PackageError{thumbs}{Unexpected error! (Really!)}{%
! You are in trouble here.\MessageBreak%
@@ -2229,6 +2186,14 @@ Good bye!
\setcounter{th@mblineb}{\value{th@mbs@tmpA}}%
\fi%
}{% else
+% \end{macrocode}
+%
+% When |\jobname.tmb| was not found, we cannot read from that file, therefore
+% the |FileLine| is set to |thumbsstop|, stopping the calling of |\th@mbs@verview|
+% in |\thumbsoverview|. (And we issue a warning, of course).
+%
+% \begin{macrocode}
+ \setcounter{FileLine}{\arabic{thumbsstop}}%
\addglobalwarning{%
\PackageWarningNoLine{thumbs}{%
File \jobname.tmb not found.\MessageBreak%
@@ -2246,13 +2211,13 @@ Good bye!
%</package>
% \end{macrocode}
%
-% \pagebreak
+% \bigskip
%
% \section{Installation}
%
% \subsection{Downloads\label{ss:Downloads}}
%
-% Everything should be available on \CTAN{}, \url{http://www.ctan.org/tex-archive/},
+% Everything is available on \CTAN{}, \url{http://www.ctan.org/tex-archive/},
% but may need additional packages themselves.\\
%
% \DescribeMacro{thumbs.dtx}
@@ -2295,8 +2260,11 @@ Good bye!
%
% \end{description}
%
+% \pagebreak
+%
% \DescribeMacro{SW/SWP}
-% When compiling with SWP 5.50 Build 2960, these additional packages are needed:
+% When compiling with SWP 5.50 Build 2960 (\copyright~MacKichan Software, Inc.),
+% these additional packages are needed:
%
% \begin{quote}
%\begin{verbatim}
@@ -2311,9 +2279,7 @@ Good bye!
% \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
+% according to your whishes.)\\
%
% \DescribeMacro{thumb-example.tex}
% The |thumb-example.tex| requires the same files as all documents using the \xpackage{thumbs}
@@ -2325,7 +2291,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/14, v1.0a, \CTAN{macros/latex/contrib/thumbs/thumbs.dtx}\\
+% \item[-] package \xpackage{thumbs}, 2011/05/18, v1.0b, \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?)
@@ -2369,13 +2335,16 @@ Good bye!
% It is probably best to download and use this, because the packages in there
% should be both recent and compatible.\\
%
-% \vspace{1.5cm}
+% \pagebreak
+%
+% \DescribeMacro{hyperref}
+% \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}.
%
-% \pagebreak
-%
% \subsection{Package, unpacking TDS}
%
% \paragraph{Package.} This package should be available on \CTAN{}:
@@ -2558,7 +2527,24 @@ Good bye!
% \item Diverse $\beta $-versions during the creation of this package.\\
% \end{Version}
% \begin{Version}{2011/05/14 v1.0a}
-% \item Upload to \CTAN{}.
+% \item Upload to \url{http://www.ctan.org/pkg/thumbs}.
+% \end{Version}
+% \begin{Version}{2011/05/18 v1.0b}
+% \item When more than one thumb mark is places at one single page,
+% the variables containing the values (text, colour, backgroundcolour)
+% of those thumb marks are now created dynamically. Theoretically,
+% one can now have $2\,147\,483\,647$ thumb marks at one page instead of
+% six thumb marks (as with \xpackage{thumbs} version~1.0a),
+% but I am quite sure that some other limit will be reached before the
+% $2\,147\,483\,647^ \textrm{th} $ thumb mark.
+% \item Bug fix: When a document using the \xpackage{thumbs} package was compiled,
+% and the \xfile{.aux} and \xfile{.tmb} files were created, and the
+% \xfile{.tmb} file was deleted (or renamed or moved),
+% 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.
+% \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 fc53f2d1467..daabbb1b09b 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/14 v1.0a
+%% Version: 2011/05/18 v1.0b
%%
%% 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/14 v1.0a Thumb marks and overwiew page(s) (HMM)}
+\Msg{* Package: thumbs 2011/05/18 v1.0b Thumb marks and overwiew page(s) (HMM)}
\Msg{*************************************************************************}
\keepsilent
@@ -53,7 +53,7 @@
This is a generated file.
Project: thumbs
-Version: 2011/05/14 v1.0a
+Version: 2011/05/18 v1.0b
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 67b1fecfeb2..246156c9c56 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/14 v1.0a
+%% Version: 2011/05/18 v1.0b
%%
%% 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/14 v1.0a
+\ProvidesPackage{thumbs}[2011/05/18 v1.0b
Thumb marks and overwiew page(s) (HMM)]
%% This package allows to create a customizable thumb index,
@@ -49,7 +49,8 @@
\message{^^J *** Compiling with SW(P)? ^^J%
Please see the sw(p)*.log or \jobname.log-file! *** ^^J}
\PackageWarningNoLine{thumbs}{%
- When compiling with SWP 5.50 Build 2960,\MessageBreak%
+ When compiling with SWP 5.50 Build 2960\MessageBreak%
+ (\copyright\ MacKichan Software, Inc.),\MessageBreak%
these additional packages are needed:\MessageBreak%
\string\usepackage[T1]{fontenc}\MessageBreak%
\string\usepackage{amsfonts}\MessageBreak%
@@ -457,59 +458,23 @@
\setlength{\th@mbposyA}{\th@mbposy}%
\else%
\ifx\th@mbcolumnnew\pagesLTS@zero%
- \ifnum\th@mbonpage=2%
- \ifnum\th@mbonpagemax>1%
- \else \gdef\th@mbonpagemax{2}%
- \fi%
- \gdef\th@mbtextB{#2}%
- \gdef\th@mbtextcolourB{#3}%
- \gdef\th@mbbackgroundcolourB{#4}%
- \else%
- \ifnum\th@mbonpage=3%
- \ifnum\th@mbonpagemax>2%
- \else \gdef\th@mbonpagemax{3}%
- \fi%
- \gdef\th@mbtextC{#2}%
- \gdef\th@mbtextcolourC{#3}%
- \gdef\th@mbbackgroundcolourC{#4}%
- \else%
- \ifnum\th@mbonpage=4%
- \ifnum\th@mbonpagemax>3%
- \else \gdef\th@mbonpagemax{4}%
- \fi%
- \gdef\th@mbtextD{#2}%
- \gdef\th@mbtextcolourD{#3}%
- \gdef\th@mbbackgroundcolourD{#4}%
- \else%
- \ifnum\th@mbonpage=5%
- \ifnum\th@mbonpagemax>4%
- \else \gdef\th@mbonpagemax{5}%
- \fi%
- \gdef\th@mbtextE{#2}%
- \gdef\th@mbtextcolourE{#3}%
- \gdef\th@mbbackgroundcolourE{#4}%
- \else%
- \ifnum\th@mbonpage=6%
- \ifnum\th@mbonpagemax>5%
- \else \gdef\th@mbonpagemax{6}%
- \fi%
- \gdef\th@mbtextF{#2}%
- \gdef\th@mbtextcolourF{#3}%
- \gdef\th@mbbackgroundcolourF{#4}%
- \else%
- \PackageError{thumbs}{Too many thumbs on one page!}{%
- You tried to placed more than six (!) thumb marks on a single page,\MessageBreak%
- (approximate page number: \thepage ).\MessageBreak%
- Maybe insert a \string\pagebreak or \string\newpage?\MessageBreak%
- No following thumb marks will show on this page, sorry.\MessageBreak%
- If you absolutly need more marks on one page,\MessageBreak%
- please write an e-mail to the package maintainer.\MessageBreak%
- }%
- \fi%
- \fi%
- \fi%
+ \setcounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \@whilenum\th@mbonpagetest<\th@mbonpage\do{%
+ \addtocounter{th@mbs@tmpA}{1}%
+ \global\edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \ifnum\th@mbonpage=\th@mbonpagetest%
+ \ifnum\th@mbonpagemax<\th@mbonpage%
+ \global\edef\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%
+ }%
\else%
\ifnum\th@mbonpagemax<\th@mbonpage%
\global\edef\th@mbonpagemax{\th@mbonpage}%
@@ -698,35 +663,21 @@
\fi%
\fi%
\AtBeginShipoutUpperLeft{%
- \setcounter{th@mbs@tmpA}{\th@mbonpage}%
\ifx\th@mbprinting\pagesLTS@one%
\th@mbprint{\th@mbtextA}{\th@mbtextcolourA}{\th@mbbackgroundcolourA}%
- \ifnum\value{th@mbs@tmpA}>1%
+ \setcounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
+ \@whilenum\th@mbonpagetest<\th@mbonpage\do{%
+ \addtocounter{th@mbs@tmpA}{1}%
+ \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}%
\th@mb@yA%
- \th@mbprint{\th@mbtextB}{\th@mbtextcolourB}{\th@mbbackgroundcolourB}%
- \ifnum\value{th@mbs@tmpA}>2%
- \th@mb@yA%
- \th@mbprint{\th@mbtextC}{\th@mbtextcolourC}{\th@mbbackgroundcolourC}%
- \ifnum\value{th@mbs@tmpA}>3%
- \th@mb@yA%
- \th@mbprint{\th@mbtextD}{\th@mbtextcolourD}{\th@mbbackgroundcolourD}%
- \ifnum\value{th@mbs@tmpA}>4%
- \th@mb@yA%
- \th@mbprint{\th@mbtextE}{\th@mbtextcolourE}{\th@mbbackgroundcolourE}%
- \ifnum\value{th@mbs@tmpA}>5%
- \th@mb@yA%
- \th@mbprint{\th@mbtextF}{\th@mbtextcolourF}{\th@mbbackgroundcolourF}%
- \ifnum\value{th@mbs@tmpA}>6%
- \PackageWarning{thumbs}{Too many thumbs on one page,\MessageBreak%
- please see error message already given above.\MessageBreak%
- }%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
- \fi%
+ \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}%
+ \th@mbprint{\th@mbtmpdeftext}{\th@mbtmpdefcolour}{\th@mbtmpdefbackgroundcolour}%
+ }%
\fi%
+ \setcounter{th@mbs@tmpA}{\th@mbonpage}%
\ifnum\value{th@mbs@tmpA}<2% \relax
\else%
\gdef\th@mbtextA{\th@mbtext}%
@@ -931,6 +882,7 @@
\setcounter{th@mblineb}{\value{th@mbs@tmpA}}%
\fi%
}{% else
+ \setcounter{FileLine}{\arabic{thumbsstop}}%
\addglobalwarning{%
\PackageWarningNoLine{thumbs}{%
File \jobname.tmb not found.\MessageBreak%