From 772976b31dcc12f45676b472887bd330bff5b9d7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Oct 2011 22:28:08 +0000 Subject: thumbs (19oct11) git-svn-id: svn://tug.org/texlive/trunk@24332 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/thumbs/README | 34 ++- .../texmf-dist/doc/latex/thumbs/thumbs-example.pdf | Bin 182358 -> 183129 bytes .../texmf-dist/doc/latex/thumbs/thumbs-example.tex | 27 +- Master/texmf-dist/doc/latex/thumbs/thumbs.pdf | Bin 488183 -> 494990 bytes Master/texmf-dist/source/latex/thumbs/thumbs.drv | 4 +- Master/texmf-dist/source/latex/thumbs/thumbs.dtx | 276 +++++++++++++-------- Master/texmf-dist/source/latex/thumbs/thumbs.ins | 6 +- Master/texmf-dist/tex/latex/thumbs/thumbs.sty | 83 +++++-- 8 files changed, 272 insertions(+), 158 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/thumbs/README b/Master/texmf-dist/doc/latex/thumbs/README index e33c28a20d4..3832f2b6f2d 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/08/22, v1.0i +README for thumbs package, 2011/10/19, v1.0j TABLE OF CONTENTS @@ -76,17 +76,28 @@ Manual installation a) Download the thumbs files from CTAN or the TUG server. If necessary, unpack them. b) Generate the package and driver files: - tex thumbs.ins + tex thumbs.dtx 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) Copy the documentation files to +d) Create the documentation, e.g. + pdflatex thumbs.dtx + makeindex -s gind.ist thumbs.idx + pdflatex thumbs.dtx + makeindex -s gind.ist thumbs.idx + pdflatex thumbs.dtx +e) Update the databases if necessary, e.g. for teTeX: + mktexlsr .../texmf +f) Create the thumbs-example.pdf, e.g. + pdflatex thumbs-example.tex + pdflatex thumbs-example.tex + pdflatex thumbs-example.tex + pdflatex thumbs-example.tex +g) Copy the documentation files to "TDS:doc/latex/thumbs/": README, thumbs.pdf, thumbs-example.tex, thumbs-example.pdf. -e) Update the databases if necessary, e.g. for teTeX: - mktexlsr .../texmf 4 ADDITIONAL PACKAGES @@ -122,15 +133,15 @@ for example geometry. A bug report should contain: * Comprehensive problem description. This includes error or warning messages. - * \errorcontextlines=\maxdimen can be added in the - TeX code to get more information in TeX error messages. +* \errorcontextlines=\maxdimen can be added in the + TeX code to get more information in TeX error messages. * Minimal test file that shows the problem, but does not contain any unnecessary packages and code. * Used drivers/programs. * Version information about used packages and programs. - * If you are using LaTeX, then add "\listfiles". Then - a list of version information is printed at the end - of the LaTeX run. +* If you are using LaTeX, then add "\listfiles". Then + a list of version information is printed at the end + of the LaTeX run. * Please no other files than the minimal test file. The other files .log, .dvi, .ps, .pdf are seldom necessary, so send them only on request. @@ -149,4 +160,5 @@ Bug reports can be send to the maintainer: 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 it is fixed, \AtEndAfterFileList is used. +Until its fixed version (2011/06/30, v1.8) is +available at CTAN, \AtEndAfterFileList is used. diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf index 90058e69362..b52465f59a0 100644 Binary files a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf and b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex b/Master/texmf-dist/doc/latex/thumbs/thumbs-example.tex index 493a60cd6bf..ddec0e914c0 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/08/22 v1.0i +%% Version: 2011/10/19 v1.0j %% %% Copyright (C) 2010, 2011 by %% H.-Martin M"unch @@ -63,11 +63,11 @@ pdfsubject={Example for the thumbs package},% pdfkeywords={LaTeX, thumbs, thumb marks, Hans-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% - linktoc=all]{hyperref}[2011/04/17]% v6.82g + linktoc=all]{hyperref}[2011/10/01]% v6.82j \usepackage[thumblink=rule,linefill=dots,height={auto},minheight={47pt},% width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},% - ignorehoffset=true,ignorevoffset=true,final=true,hidethumbs=false,% - verbose=true]{thumbs}[2011/08/22]% v1.0i + nophantomsection=false,ignorehoffset=true,ignorevoffset=true,final=true,% + hidethumbs=false,verbose=true]{thumbs}[2011/10/19]% v1.0j \nopagecolor% use \pagecolor{white} if \nopagecolor does not work \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% \makeatletter @@ -84,11 +84,12 @@ \markboth{Example for thumbs}{Example for thumbs} This example demonstrates the most common uses of package -\textsf{thumbs}, v1.0i as of 2011/08/22 (HMM). +\textsf{thumbs}, v1.0j as of 2011/10/19 (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\}}, +\texttt{topthumbmargin=\{auto\}}, \texttt{bottomthumbmargin=\{auto\}}, \newline +\texttt{nophantomsection=false}, \texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, \texttt{final=true},\texttt{hidethumbs=false}, and \texttt{verbose=true}. @@ -162,6 +163,18 @@ To include an overview page for the thumb marks, is used, where \textbackslash addthumbsoverviewtocontents adds the thumb marks overview page to the table of contents. +\smallskip + +Generally it is desirable to have a hyperlink from the thumbs overview page +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 +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.) + \addthumbsoverviewtocontents{section}{Thumb marks overview}% \thumbsoverview{Table of Thumbs} @@ -217,7 +230,7 @@ And you do not need to have a section to add a thumb: This is still the third section, but there is a new thumb mark. -On the other hand, you can even get rid of the the thumb marks +On the other hand, you can even get rid of the thumb marks for some page(s): \newpage diff --git a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf index 49e40abc94a..561a6abbd75 100644 Binary files a/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf and b/Master/texmf-dist/doc/latex/thumbs/thumbs.pdf differ diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.drv b/Master/texmf-dist/source/latex/thumbs/thumbs.drv index e81bdf82c6c..20e9a160254 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/08/22 v1.0i +%% Version: 2011/10/19 v1.0j %% %% Copyright (C) 2010, 2011 by %% H.-Martin M"unch @@ -40,7 +40,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2009/09/24] \ProvidesFile{thumbs.drv}% - [2011/08/22 v1.0i Thumb marks and overwiew page(s) (HMM)]% + [2011/10/19 v1.0j 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 821a496d700..6ca0f331788 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/08/22 v1.0i +% Version: 2011/10/19 v1.0j % % Copyright (C) 2010, 2011 by % H.-Martin M"unch @@ -79,7 +79,7 @@ \input docstrip.tex \Msg{*************************************************************************} \Msg{* Installation} -\Msg{* Package: thumbs 2011/08/22 v1.0i Thumb marks and overwiew page(s) (HMM)} +\Msg{* Package: thumbs 2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)} \Msg{*************************************************************************} \keepsilent @@ -91,7 +91,7 @@ This is a generated file. Project: thumbs -Version: 2011/08/22 v1.0i +Version: 2011/10/19 v1.0j Copyright (C) 2010, 2011 by H.-Martin M"unch @@ -175,7 +175,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e}[2009/09/24] \ProvidesFile{thumbs.drv}% - [2011/08/22 v1.0i Thumb marks and overwiew page(s) (HMM)]% + [2011/10/19 v1.0j 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{2281} +% \CheckSum{2313} % % \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 @@ -265,7 +265,7 @@ and the derived files % \DoNotIndex{\hspace,\thepage} % % \title{The \xpackage{thumbs} package} -% \date{2011/08/22 v1.0i} +% \date{2011/10/19 v1.0j} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}} % % \maketitle @@ -444,6 +444,20 @@ and the derived files % \item[- |rule|] hyperlinks the whole \emph{rule}. % \end{description} % +% \subsubsection{nophantomsection\label{sss:nophantomsection}} +% \DescribeMacro{nophantomsection} +% \indent Option |nophantomsection| globally disables the automatical placement of a +% |\phantomsection| before the thumb marks. Generally it is desirable to have a +% hyperlink from the thumbs overview page to lead to the thumb mark and not to some +% 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 +% |\phantomsection|s has been globally disabled, nevertheless manual use of +% |\phantomsection| is still possible. The other way round: When automatical placeing +% of the |\phantomsection|s has \emph{not} been globally disabled, it can be disabled +% just for the following thumb mark by the command |\thumbsnophantom|. +% % \subsubsection{ignorehoffset, ignorevoffset\label{sss:ignoreoffset}} % \DescribeMacro{ignorehoffset} % \DescribeMacro{ignorevoffset} @@ -591,6 +605,12 @@ and the derived files % |\addthumbsoverviewtocontents| with its arguments should be used immediately before % |\thumbsoverview|. % +% \subsubsection{\textbackslash thumbsnophantom} +% \DescribeMacro{\thumbsnophantom} +% When automatical placeing 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|. +% % \pagebreak % % \section{Alternatives\label{sec:Alternatives}} @@ -684,11 +704,11 @@ and the derived files pdfsubject={Example for the thumbs package},% pdfkeywords={LaTeX, thumbs, thumb marks, Hans-Martin Muench},% pdfview=Fit,pdfstartview=Fit,% - linktoc=all]{hyperref}[2011/04/17]% v6.82g + linktoc=all]{hyperref}[2011/10/01]% v6.82j \usepackage[thumblink=rule,linefill=dots,height={auto},minheight={47pt},% width={auto},distance={2mm},topthumbmargin={auto},bottomthumbmargin={auto},% - ignorehoffset=true,ignorevoffset=true,final=true,hidethumbs=false,% - verbose=true]{thumbs}[2011/08/22]% v1.0i + nophantomsection=false,ignorehoffset=true,ignorevoffset=true,final=true,% + hidethumbs=false,verbose=true]{thumbs}[2011/10/19]% v1.0j \nopagecolor% use \pagecolor{white} if \nopagecolor does not work \gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}% \makeatletter @@ -705,11 +725,12 @@ and the derived files \markboth{Example for thumbs}{Example for thumbs} This example demonstrates the most common uses of package -\textsf{thumbs}, v1.0i as of 2011/08/22 (HMM). +\textsf{thumbs}, v1.0j as of 2011/10/19 (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\}}, +\texttt{topthumbmargin=\{auto\}}, \texttt{bottomthumbmargin=\{auto\}}, \newline +\texttt{nophantomsection=false}, \texttt{ignorehoffset=true}, \texttt{ignorevoffset=true}, \texttt{final=true},\texttt{hidethumbs=false}, and \texttt{verbose=true}. @@ -783,6 +804,21 @@ To include an overview page for the thumb marks, is used, where \textbackslash addthumbsoverviewtocontents adds the thumb marks overview page to the table of contents. +\smallskip + +Generally it is desirable to have a hyperlink from the thumbs overview page +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 +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.) + +% \end{macrocode} +% \pagebreak +% \begin{macrocode} \addthumbsoverviewtocontents{section}{Thumb marks overview}% \thumbsoverview{Table of Thumbs} @@ -838,7 +874,7 @@ And you do not need to have a section to add a thumb: This is still the third section, but there is a new thumb mark. -On the other hand, you can even get rid of the the thumb marks +On the other hand, you can even get rid of the thumb marks for some page(s): \newpage @@ -1014,6 +1050,9 @@ I just added another thumb mark. }% \makeatother +% \end{macrocode} +% \pagebreak +% \begin{macrocode} \label{greenpage} Some faulty pdf-viewer sometimes (for the same document!) @@ -1037,11 +1076,6 @@ for the other sides the $\unit{pt}$ are written as $\unit{bp}$ into the pdf-file, i.\,e. the rule is too large by $72.27/72$, which should cover also rounding errors.) -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} 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. @@ -1093,8 +1127,8 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e}[2009/09/24] -\ProvidesPackage{thumbs}[2011/08/22 v1.0i +\NeedsTeXFormat{LaTeX2e}[2009/09/24]% recent: 2011/06/27 +\ProvidesPackage{thumbs}[2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)] % \end{macrocode} @@ -1109,7 +1143,9 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % % For SW(P) users, we issue a warning. Unfortunately, we cannot check for the used -% software (can we?), and there will be a stack overflow when using \xpackage{hyperref} +% software (Can we? \xfile{tcilatex.tex} is \emph{probably} exactly there when SWP +% is used, but it \emph{could} also be there without SWP for compatibility reasons.), +% and there will be a stack overflow when using \xpackage{hyperref} % even before the \xpackage{thumbs} package is loaded, thus the warning might not % 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 @@ -1117,21 +1153,37 @@ Text can be placed after any of the Tables of Thumbs, of course. % with these options, and then try to change them according to your whishes. % % \begin{macrocode} -\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% - (\copyright\space MacKichan Software, Inc.),\MessageBreak% - these additional packages are needed:\MessageBreak% - \string\usepackage[T1]{fontenc}\MessageBreak% - \string\usepackage{amsfonts}\MessageBreak% - \string\usepackage[math]{cellspace}\MessageBreak% - \string\usepackage{xcolor}\MessageBreak% - \string\pagecolor{white}\MessageBreak% - \string\newcommand{\string\QTO}[2]{\string#2}\MessageBreak% - especially before hyperref and thumbs,\MessageBreak% - but best right after the \string\documentclass!\MessageBreak% - } +\IfFileExists{tcilatex.tex}{% + % Quite probably SWP/SW/SN + \PackageWarningNoLine{thumbs}{% + 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% + \string\usepackage[math]{cellspace}\MessageBreak% + \string\usepackage{xcolor}\MessageBreak% + \string\pagecolor{white}\MessageBreak% + \string\newcommand{\string\QTO}[2]{\string##2}\MessageBreak% + especially before hyperref and thumbs,\MessageBreak% + but best right after the \string\documentclass!% + }% + }{% Probably not SWP/SW/SN + \message{^^J *** Compiling with SW(P)? ^^J% + When compiling with SWP 5.50 Build 2960^^J% + (copyright MacKichan Software, Inc.),^^J% + these additional packages are needed:^^J% + \string\usepackage[T1]{fontenc}^^J% + \string\usepackage{amsfonts}^^J% + \string\usepackage[math]{cellspace}^^J% + \string\usepackage{xcolor}^^J% + \string\pagecolor{white}^^J% + \string\newcommand{\string\QTO}[2]{\string##2}^^J% + especially before hyperref and thumbs,^^J% + but best right after the \string\documentclass!^^J% + ^^J% + }% + } % \end{macrocode} % @@ -1151,8 +1203,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \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}). It also loads % the \xpackage{undolabl} package, which is needed for |\overridelabel|: @@ -1162,7 +1212,8 @@ Text can be placed after any of the Tables of Thumbs, of course. \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 +\RequirePackage{atveryend}[2011/04/23]% v1.7, +%% v1.8 would be needed but is currently (2011/10/19) not available at CTAN yet % \end{macrocode} % % A last information for the user: @@ -1190,6 +1241,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \DeclareStringOption{bottomthumbmargin}[auto] \DeclareBoolOption[true]{ignorehoffset} \DeclareBoolOption[true]{ignorevoffset} +\DeclareBoolOption{nophantomsection}% false by default, but true if used \DeclareBoolOption[true]{verbose} \DeclareComplementaryOption{silent}{verbose} \DeclareBoolOption{draft} @@ -1243,14 +1295,14 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \begin{macrocode} \ifthumbs@ignorehoffset - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorehoffset NOT =false:\MessageBreak% hoffset will be ignored.\MessageBreak% To make thumbs regard hoffset use option\MessageBreak% ignorehoffset=false} \gdef\th@bmshoffset{0pt} \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorehoffset=false:\MessageBreak% hoffset will be regarded.\MessageBreak% This might move the thumb marks away from the paper edge} @@ -1258,14 +1310,14 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi \ifthumbs@ignorevoffset - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorevoffset NOT =false:\MessageBreak% voffset will be ignored.\MessageBreak% To make thumbs regard voffset use option\MessageBreak% ignorevoffset=false} \gdef\th@bmsvoffset{-\voffset} \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorevoffset=false:\MessageBreak% voffset will be regarded.\MessageBreak% This might move the thumb mark outside of the printable area} @@ -1274,8 +1326,6 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \DescribeMacro{linefill} % We process the |linefill| option value: % @@ -1330,12 +1380,10 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \begin{macrocode} \ifthumbs@verbose% \relax \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option verbose=false (or silent=true) found:\MessageBreak% You will lose some information} \fi @@ -1617,11 +1665,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \ifx\thumbs@topthumbmargin\empty% \def\thumbs@topthumbmargin{auto} \fi -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \def\th@mbstest{auto} \ifx\thumbs@topthumbmargin\th@mbstest% \setlength{\th@mbposy}{1in} @@ -1653,6 +1696,8 @@ 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} @@ -1718,8 +1763,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \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 @@ -1758,6 +1801,7 @@ 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 @@ -1779,11 +1823,6 @@ Text can be placed after any of the Tables of Thumbs, of course. 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% @@ -1816,6 +1855,21 @@ Text can be placed after any of the Tables of Thumbs, of course. \xdef\th@mb@titlelabel{}% } +% \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.) +% +% \begin{macrocode} +\gdef\th@mbsphantom{1} + +\newcommand{\thumbsnophantom}{% + \gdef\th@mbsphantom{0}% + } + % \end{macrocode} % % \DescribeMacro{\addthumb} @@ -1828,7 +1882,7 @@ Text can be placed after any of the Tables of Thumbs, of course. \advance\th@mbposy\th@mbheighty% \advance\th@mbposy\th@mbsdistance% \ifdim\th@mbposy>\th@mbposybottom% - \PackageWarning{thumbs}{% + \PackageInfo{thumbs}{% Thumbs column full, starting another column.\MessageBreak% }% \setlength{\th@mbposy}{\th@mbposytop}% @@ -1843,8 +1897,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \xdef\th@mbs{\arabic{th@mbs@tmpA}}% % \end{macrocode} % -% \pagebreak -% % The |\addthumb| command has four parameters: % \begin{enumerate} % \item a title for the thumb mark (for the thumb marks overview page, @@ -1897,16 +1949,24 @@ Text can be placed after any of the Tables of Thumbs, of course. % but by my humble opinion, defining |\Hy@Warning| does not make sense and % is bad style (except definition by the \xpackage{hyperref} package itself, % of course). Into the |\jobname.tmb| file a |\thumbcontents| entry is written. -% If \xpackage{hyperref} is found, a |\phantomsection| is placed, a~label -% for the thumb mark created, and the |\thumbcontents| entry will be hyperlinked -% to that label (except when |\addtitlethumb| was used, then the label reported -% from the user is used -- the \xpackage{thumbs} package does \emph{not} create -% that label!). +% If \xpackage{hyperref} is found, a |\phantomsection| is placed (except when +% globally disabled by option |nophantomsection| or locally by |\thumbsnophantom|), +% a~label for the thumb mark created, and the |\thumbcontents| entry will be +% hyperlinked to that label (except when |\addtitlethumb| was used, then the label +% reported from the user is used -- the \xpackage{thumbs} package does \emph{not} +% create that label!). % % \begin{macrocode} \@ifundefined{Hy@Warning}{% hyperref not loaded }{% hyperref loaded - \phantomsection% + \ifthumbs@nophantomsection% \relax + \else% + \ifx\th@mbsphantom\pagesLTS@one% + \phantomsection% + \else% + \gdef\th@mbsphantom{1}% + \fi% + \fi% }% \label{thumbs.\th@mbs}% \if@filesw% @@ -1956,11 +2016,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \ifx\th@mbcolumnnew\pagesLTS@zero% \setcounter{th@mbs@tmpA}{1}% \edef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \@whilenum\th@mbonpagetest<\th@mbonpage\do{% \addtocounter{th@mbs@tmpA}{1}% \xdef\th@mbonpagetest{\arabic{th@mbs@tmpA}}% @@ -2040,6 +2095,11 @@ 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}% @@ -2073,11 +2133,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \ifx\th@mbstest\th@mbsprintpage% l \advance\th@mbwidthxtoc+\evensidemargin% \fi% -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \begin{picture}(0,0)% % \end{macrocode} % @@ -2103,6 +2158,8 @@ 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. % @@ -2156,6 +2213,8 @@ 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 @@ -2193,8 +2252,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \else% % \end{macrocode} % -% \pagebreak -% % \item[- |titleandpage|] hyperlinks the \emph{title and page} numbers of the thumb marks % % \begin{macrocode} @@ -2300,8 +2357,6 @@ Text can be placed after any of the Tables of Thumbs, of course. % \end{macrocode} % -% \pagebreak -% % \DescribeMacro{\th@mbprint} % |\th@mbprint| places a |picture| containing the thumb mark on the page. % @@ -2330,6 +2385,8 @@ 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. @@ -2354,8 +2411,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \addtocounter{th@mbs@tmpA}{-1}% because CurrentPage is already the one of the next page % \end{macrocode} % -% \pagebreak -% % Changing the paper size mid-document will probably cause some problems. % But if it works, we try to cope with it. (When the change is performed % without changing |\paperwidth|, we cannot detect it. Sorry.) @@ -2413,8 +2468,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi% % \end{macrocode} % -% \pagebreak -% % When more than one thumb mark was placed at that page, on the following pages % only the last issued thumb mark shall appear. % @@ -2470,11 +2523,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \ifdim\th@mbmaxwidth>\th@mbwidthx \ifthumbs@draft% \relax \else -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \def\th@mbstest{autoauto} \ifx\thumbs@width\th@mbstest% \AtEndAfterFileList{% @@ -2505,6 +2553,8 @@ 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} @@ -2633,6 +2683,8 @@ 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. @@ -2662,11 +2714,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \ifx\th@mbstest\th@mbstestb% d \gdef\th@mbsprintpage{d}% \else% -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \PackageError{thumbs}{% Invalid second parameter of \string\thumbsoverviewprint % }{The second argument of command \string\thumbsoverviewprint\space must be\MessageBreak% @@ -2827,11 +2874,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \def\th@mb@resetdoublepage{1}% \fi% \else% -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \if@twoside% \def\th@mbstest{r}% \ifx\th@mbstest\th@mbsprintpage% @@ -2860,6 +2902,9 @@ 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}% @@ -2889,8 +2934,6 @@ Text can be placed after any of the Tables of Thumbs, of course. \fi% % \end{macrocode} % -% \pagebreak -% % as well as the |\label|, |\index|, and |\glossary| commands: % % \begin{macrocode} @@ -3035,6 +3078,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. % @@ -3134,9 +3179,9 @@ Text can be placed after any of the Tables of Thumbs, of course. % \item[-] package \xpackage{lipsum}, 2011/04/14, v1.2, \CTAN{macros/latex/contrib/lipsum/lipsum.dtx} % -% \item[-] package \xpackage{hyperref}, 2011/04/17, v6.82g, \CTAN{macros/latex/contrib/hyperref/hyperref.dtx} +% \item[-] package \xpackage{hyperref}, 2011/10/01, v6.82j, \CTAN{macros/latex/contrib/hyperref/hyperref.dtx} % -% \item[-] package \xpackage{thumbs}, 2011/08/22, v1.0i, \CTAN{macros/latex/contrib/thumbs/thumbs.dtx}\\ +% \item[-] package \xpackage{thumbs}, 2011/10/19, v1.0j, \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?) @@ -3368,7 +3413,7 @@ Text can be placed after any of the Tables of Thumbs, of course. % \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}. +% to \textsc{Veronica Brandt} and \textsc{Martin Baute}. % % \bigskip % @@ -3497,7 +3542,20 @@ 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. -% Until it is fixed, |\AtEndAfterFileList| is used. +% Version 2011/06/30, v1.8, fixed it, but this version is not availabel +% at \CTAN{} yet. Until then |\AtEndAfterFileList| is used. +% \end{Version} +% \begin{Version}{2011/10/19 v1.0j} +% \item Changed some Warnings into Infos (as suggested by \textsc{Martin Baute}). +% \item The SWP-warning is now only given |\IfFileExists{tcilatex.tex}|, otherwise +% just a message is given. (Warning questioned by \textsc{Martin Baute}, +% thanks.) +% \item New option |nophantomsection| to \emph{globally} disable the automatical +% placement of a |\phantomsection| before \emph{all} thumb marks. +% \item New command |\thumbsnophantom| to \emph{locally} disable the automatical +% placement of a |\phantomsection| before the \emph{next} thumb mark. +% \item README fixed. +% \item Minor details changed. % \end{Version} % \end{History} % @@ -3508,11 +3566,11 @@ Text can be placed after any of the Tables of Thumbs, of course. % % \bigskip % -% Note: \textsf{Q}, \textsf{X}, and \textsf{Y} are not missing in the following index, +% Note: \textsf{X} and \textsf{Y} are not missing in the following index, % but no command \emph{beginning} with any of these letters has been used in this % \xpackage{thumbs} package. % -% \pagebreak +% \bigskip % % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/thumbs/thumbs.ins b/Master/texmf-dist/source/latex/thumbs/thumbs.ins index 64bfd04f93f..afcca4117aa 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/08/22 v1.0i +%% Version: 2011/10/19 v1.0j %% %% Copyright (C) 2010, 2011 by %% H.-Martin M"unch @@ -41,7 +41,7 @@ \input docstrip.tex \Msg{*************************************************************************} \Msg{* Installation} -\Msg{* Package: thumbs 2011/08/22 v1.0i Thumb marks and overwiew page(s) (HMM)} +\Msg{* Package: thumbs 2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)} \Msg{*************************************************************************} \keepsilent @@ -53,7 +53,7 @@ This is a generated file. Project: thumbs -Version: 2011/08/22 v1.0i +Version: 2011/10/19 v1.0j Copyright (C) 2010, 2011 by H.-Martin M"unch diff --git a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty index 6191e707189..f2dec087375 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/08/22 v1.0i +%% Version: 2011/10/19 v1.0j %% %% Copyright (C) 2010, 2011 by %% H.-Martin M"unch @@ -38,29 +38,45 @@ %% thumbs.sty, thumbs.pdf, thumbs.ins, thumbs.drv, %% thumbs-example.tex. %% -\NeedsTeXFormat{LaTeX2e}[2009/09/24] -\ProvidesPackage{thumbs}[2011/08/22 v1.0i +\NeedsTeXFormat{LaTeX2e}[2009/09/24]% recent: 2011/06/27 +\ProvidesPackage{thumbs}[2011/10/19 v1.0j Thumb marks and overwiew page(s) (HMM)] %% This package allows to create a customizable thumb index, %% providing a quick and easy reference methode for large documents, %% as well as an overview page. -\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% - (\copyright\space MacKichan Software, Inc.),\MessageBreak% - these additional packages are needed:\MessageBreak% - \string\usepackage[T1]{fontenc}\MessageBreak% - \string\usepackage{amsfonts}\MessageBreak% - \string\usepackage[math]{cellspace}\MessageBreak% - \string\usepackage{xcolor}\MessageBreak% - \string\pagecolor{white}\MessageBreak% - \string\newcommand{\string\QTO}[2]{\string#2}\MessageBreak% - especially before hyperref and thumbs,\MessageBreak% - but best right after the \string\documentclass!\MessageBreak% - } +\IfFileExists{tcilatex.tex}{% + % Quite probably SWP/SW/SN + \PackageWarningNoLine{thumbs}{% + 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% + \string\usepackage[math]{cellspace}\MessageBreak% + \string\usepackage{xcolor}\MessageBreak% + \string\pagecolor{white}\MessageBreak% + \string\newcommand{\string\QTO}[2]{\string##2}\MessageBreak% + especially before hyperref and thumbs,\MessageBreak% + but best right after the \string\documentclass!% + }% + }{% Probably not SWP/SW/SN + \message{^^J *** Compiling with SW(P)? ^^J% + When compiling with SWP 5.50 Build 2960^^J% + (copyright MacKichan Software, Inc.),^^J% + these additional packages are needed:^^J% + \string\usepackage[T1]{fontenc}^^J% + \string\usepackage{amsfonts}^^J% + \string\usepackage[math]{cellspace}^^J% + \string\usepackage{xcolor}^^J% + \string\pagecolor{white}^^J% + \string\newcommand{\string\QTO}[2]{\string##2}^^J% + especially before hyperref and thumbs,^^J% + but best right after the \string\documentclass!^^J% + ^^J% + }% + } \RequirePackage{kvoptions}[2010/12/23]% v3.10 \RequirePackage{atbegshi}[2011/01/30]% v1.15 @@ -71,7 +87,8 @@ \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 +\RequirePackage{atveryend}[2011/04/23]% v1.7, +%% v1.8 would be needed but is currently (2011/10/19) 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 @@ -88,6 +105,7 @@ \DeclareStringOption{bottomthumbmargin}[auto] \DeclareBoolOption[true]{ignorehoffset} \DeclareBoolOption[true]{ignorevoffset} +\DeclareBoolOption{nophantomsection}% false by default, but true if used \DeclareBoolOption[true]{verbose} \DeclareComplementaryOption{silent}{verbose} \DeclareBoolOption{draft} @@ -109,14 +127,14 @@ \fi \ifthumbs@ignorehoffset - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorehoffset NOT =false:\MessageBreak% hoffset will be ignored.\MessageBreak% To make thumbs regard hoffset use option\MessageBreak% ignorehoffset=false} \gdef\th@bmshoffset{0pt} \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorehoffset=false:\MessageBreak% hoffset will be regarded.\MessageBreak% This might move the thumb marks away from the paper edge} @@ -124,14 +142,14 @@ \fi \ifthumbs@ignorevoffset - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorevoffset NOT =false:\MessageBreak% voffset will be ignored.\MessageBreak% To make thumbs regard voffset use option\MessageBreak% ignorevoffset=false} \gdef\th@bmsvoffset{-\voffset} \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option ignorevoffset=false:\MessageBreak% voffset will be regarded.\MessageBreak% This might move the thumb mark outside of the printable area} @@ -182,7 +200,7 @@ \ifthumbs@verbose% \relax \else - \PackageWarningNoLine{thumbs}{% + \PackageInfo{thumbs}{% Option verbose=false (or silent=true) found:\MessageBreak% You will lose some information} \fi @@ -515,12 +533,18 @@ \xdef\th@mb@titlelabel{}% } +\gdef\th@mbsphantom{1} + +\newcommand{\thumbsnophantom}{% + \gdef\th@mbsphantom{0}% + } + \newcommand{\addthumb}[4]{% \gdef\th@mbprinting{1}% \advance\th@mbposy\th@mbheighty% \advance\th@mbposy\th@mbsdistance% \ifdim\th@mbposy>\th@mbposybottom% - \PackageWarning{thumbs}{% + \PackageInfo{thumbs}{% Thumbs column full, starting another column.\MessageBreak% }% \setlength{\th@mbposy}{\th@mbposytop}% @@ -556,7 +580,14 @@ \setlength{\th@mbposyA}{\th@mbstmpwidth}% \@ifundefined{Hy@Warning}{% hyperref not loaded }{% hyperref loaded - \phantomsection% + \ifthumbs@nophantomsection% \relax + \else% + \ifx\th@mbsphantom\pagesLTS@one% + \phantomsection% + \else% + \gdef\th@mbsphantom{1}% + \fi% + \fi% }% \label{thumbs.\th@mbs}% \if@filesw% -- cgit v1.2.3