From 420c94dbde219df3a7055fb922a6dbe04ca875ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Nov 2011 23:29:02 +0000 Subject: tablefootnote (7nov11) git-svn-id: svn://tug.org/texlive/trunk@24536 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/tablefootnote/README | 21 ++- .../latex/tablefootnote/tablefootnote-example.pdf | Bin 117430 -> 127108 bytes .../latex/tablefootnote/tablefootnote-example.tex | 21 +-- .../doc/latex/tablefootnote/tablefootnote.pdf | Bin 307897 -> 311900 bytes .../source/latex/tablefootnote/tablefootnote.drv | 4 +- .../source/latex/tablefootnote/tablefootnote.dtx | 171 +++++++++++++++------ .../source/latex/tablefootnote/tablefootnote.ins | 6 +- .../tex/latex/tablefootnote/tablefootnote.sty | 56 +++++-- 8 files changed, 197 insertions(+), 82 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/tablefootnote/README b/Master/texmf-dist/doc/latex/tablefootnote/README index f6dc5566227..1963b30fa0e 100644 --- a/Master/texmf-dist/doc/latex/tablefootnote/README +++ b/Master/texmf-dist/doc/latex/tablefootnote/README @@ -1,4 +1,4 @@ -README for tablefootnote package, 2011/10/29, v1.0b +README for tablefootnote package, 2011/11/06, v1.0c TABLE OF CONTENTS @@ -108,8 +108,11 @@ packages are loaded: - amstext, http://ctan.org/pkg/amstext - setspace, http://ctan.org/pkg/setspace - subcaption, http://ctan.org/pkg/subcaption -which again load other packages -(see the result of the \listfiles command in the log-file +which again load other packages. +When the etoolbox package is not available, the package + - letltxmacro, http://ctan.org/pkg/letltxmacro +is used (possibly loading further packages). +(See the result of the \listfiles command in the log-file of the example). @@ -120,8 +123,10 @@ Pages with tables with footnotes, which are rotated with the (pdf)lscape-package, will break the hyperlinks to the table-footnotes on that page. Using the hyperref-option pdfview=FitH or FitBH makes the -hyperlinks of footnotes in sidewaystables aim at the end of -the document(printed version is OK). +hyperlinks of footnotes in sidewaystables do no lead +to the footnotes, due to a bug in pdfTeX, +computing wrong anchor coordinates (Heiko Oberdiek, +29. October 2011) The printed version is OK. 6 AUTHOR/MAINTAINER @@ -164,8 +169,10 @@ Pages with tables with footnotes, which are rotated with the (pdf)lscape-package, will break the hyperlinks to the table-footnotes on that page. Using the hyperref-option pdfview=FitH or FitBH makes the -hyperlinks of footnotes in sidewaystables aim at the end of -the document(printed version is OK). +hyperlinks of footnotes in sidewaystables do no lead +to the footnotes, due to a bug in pdfTeX, +computing wrong anchor coordinates (Heiko Oberdiek, +29. October 2011) The printed version is OK. When a table with (table)footnotes floates to another place, its footnotenumbers are not automatically adapted. diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf index 4b248bf04ed..b76c034d3da 100644 Binary files a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf and b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex index b615d86c85f..26dd918305e 100644 --- a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex +++ b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: tablefootnote -%% Version: 2011/10/29 v1.0b +%% Version: 2011/11/06 v1.0c %% %% Copyright (C) 2011 by %% H.-Martin M"unch @@ -43,11 +43,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{float}[2001/11/08]% v1.3d \usepackage{placeins}[2005/04/18]% v2.2 ; for \FloatBarrier - \usepackage{rotating}[2009/03/28]% v2.16a; for sidewaystable-environment - -\usepackage{tablefootnote}[2011/10/29]% v1.0b - +\usepackage{tablefootnote}[2011/11/06]% v1.0c \usepackage[% extension=pdf,% plainpages=false,% @@ -59,7 +56,8 @@ pdfsubject={Example for the tablefootnote package},% pdfkeywords={LaTeX, tablefootnote, footnote, table, Hans-Martin Muench},% % pdfview=FitH and FitBH do not work: hyperlinks in sidewaystables - % aim at the end of the document, not at the footnote + % do no lead to the footnotes, due to a bug in pdfTeX, + % computing wrong anchor coordinates (Heiko Oberdiek, 29. October 2011) % pdfview=Fit, FitV, FitR, FitB, FitBV work % print is OK for all those options pdfstartview=FitH,% @@ -73,7 +71,7 @@ \section*{Example for tablefootnote} This example demonstrates the use of package\newline -\textsf{tablefootnote}, v1.0b as of 2011/10/29 (HMM).\newline +\textsf{tablefootnote}, v1.0c as of 2011/11/06 (HMM).\newline There were no options used. (The package provides no options.)\newline \textbf{The \texttt{tablefootnote-example.tex} needs to be compiled @@ -95,9 +93,12 @@ Table~\ref{tab.floatH} uses the float specifier~\texttt{H} from the float package.\newline \texttt{Hyperref} option \verb|pdfview=FitH| and \verb|FitBH| do -not work: hyperlinks in sidewaystables aim at the end of the document, -not at the footnote. \verb|pdfview=Fit|, \verb|FitV|, \verb|FitR|, -\verb|FitB|, \verb|FitBV| work, print is OK for all those options. +not work due to a bug in pdf\TeX{}, computing wrong +anchor coordinates (\textsc{Heiko Oberdiek}, 29. October 2011). +Depending on used pdf-viewer, hyperlinks in sidewaystables lead +e.\,g.~at the end of the document, not at the footnote. +\verb|pdfview=Fit|, \verb|FitV|, \verb|FitR|, \verb|FitB|, +\verb|FitBV| work, print is OK for all those options. \bigskip diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf index 48a3efd0969..7f07c6c3c56 100644 Binary files a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf and b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf differ diff --git a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv index ebcfcf8d430..25fe04fdacf 100644 --- a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv +++ b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: tablefootnote -%% Version: 2011/10/29 v1.0b +%% Version: 2011/11/06 v1.0c %% %% Copyright (C) 2011 by %% H.-Martin M"unch @@ -41,7 +41,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2011/06/24]% \ProvidesFile{tablefootnote.drv}% - [2011/10/29 v1.0b Table foot notes (HMM)]% + [2011/11/06 v1.0c Table foot notes (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2011/02/04]% v0.21 %% tablefootnote may work with earlier versions of LaTeX2e and those diff --git a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx index 07aef892a08..f83c17556d5 100644 --- a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx +++ b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: tablefootnote.dtx -% Version: 2011/10/29 v1.0b +% Version: 2011/11/06 v1.0c % % Copyright (C) 2011 by % H.-Martin M"unch @@ -84,7 +84,7 @@ \input docstrip.tex \Msg{******************************************************************} \Msg{* Installation *} -\Msg{* Package: tablefootnote 2011/10/29 v1.0b Table foot notes (HMM) *} +\Msg{* Package: tablefootnote 2011/11/06 v1.0c Table foot notes (HMM) *} \Msg{******************************************************************} \keepsilent @@ -96,7 +96,7 @@ This is a generated file. Project: tablefootnote -Version: 2011/10/29 v1.0b +Version: 2011/11/06 v1.0c Copyright (C) 2011 by H.-Martin M"unch @@ -181,7 +181,7 @@ the README, and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e}[2011/06/24]% \ProvidesFile{tablefootnote.drv}% - [2011/10/29 v1.0b Table foot notes (HMM)]% + [2011/11/06 v1.0c Table foot notes (HMM)]% \documentclass{ltxdoc}[2007/11/11]% v2.0u \usepackage{holtxdoc}[2011/02/04]% v0.21 %% tablefootnote may work with earlier versions of LaTeX2e and those @@ -217,7 +217,7 @@ the README, and the derived files % % \fi % -% \CheckSum{198} +% \CheckSum{229} % % \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 @@ -252,7 +252,7 @@ the README, and the derived files % }%^^A % \expandafter\endgroup\x % -% \DoNotIndex{\\} +% \DoNotIndex{\\,\,} % \DoNotIndex{\documentclass,\usepackage,\ProvidesPackage,\begin,\end} % \DoNotIndex{\message,\MessageBreak} % \DoNotIndex{\NeedsTeXFormat,\DoNotIndex,\verb} @@ -261,13 +261,13 @@ the README, and the derived files % \DoNotIndex{\kvoptions,\SetupKeyvalOptions,\ProcessKeyvalOptions} % \DoNotIndex{\bigskip,\space,\thinspace,\ldots} % \DoNotIndex{\indent,\noindent,\newline,\linebreak,\pagebreak} -% \DoNotIndex{\textbf,\textit,\textsf,\texttt,\textquotedblleft,\textquotedblright} +% \DoNotIndex{\textbf,\textit,\textsf,\texttt,textsc,\textquotedblleft,\textquotedblright} % \DoNotIndex{\plainTeX,\TeX,\LaTeX,\pdfLaTeX} % \DoNotIndex{\chapter,\section,\the,\csname,\endscname} -% \DoNotIndex{\value,\arabic,\hline,\text} +% \DoNotIndex{\value,\arabic,\hline,\text,\caption,\centering,\clear,\url} % % \title{The \xpackage{tablefootnote} package} -% \date{2011/10/29 v1.0b} +% \date{2011/11/06 v1.0c} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}} % % \maketitle @@ -294,7 +294,7 @@ the README, and the derived files % $2\unit{g}$ CO$_{2}$ and $2\unit{g}$ wood:\\ % Therefore please print only if this is really necessary.} % -% \bigskip +% \pagebreak % % \tableofcontents % @@ -333,11 +333,13 @@ the README, and the derived files % over/under another footnote. Thus either do not use a footnote between original and % float position of the (sideways)table, or place the (sideways)table in % \textquotedblleft here\textquotedblright\ position. |\clear(double)page|, |h(!)|, -% |H|~from the \xpackage{float} package, or |\FloatBarrier| from the \xpackage{picins} -% package might help, too. (Or after finishing the document, move the (sideways)table -% in the source code near the position where it floats to.) +% |H|~from the \xpackage{float} package (\url{http://www.ctan.org/pkg/float}), +% or |\FloatBarrier| from the \xpackage{picins} package +% (\url{http://www.ctan.org/pkg/picins}) might help, too. +% (Or after finishing the document, move the (sideways)table in the source code +% near the position where it floats to.) % -% \pagebreak +% \bigskip % % \section{Alternatives\label{sec:Alternatives}} % @@ -383,6 +385,8 @@ the README, and the derived files % \url{http://www.ctan.org/pkg/footnote}\\ % \url{http://www.ctan.org/pkg/mdwtab} % +% \pagebreak +% % \item[-] The \xpackage{tabularx} package does produce footnotes for sidewaystables, % but uses a, b, c instead of 1, 2, 3. The hyperlinks to the footnotes do not work. % Because the footnotes numbering is not included in the continouse numbering of @@ -393,8 +397,6 @@ the README, and the derived files % Therefore there is no float problem (because the footnotes are not continousely % numbered). The hyperlinks to the table notes indeed work. % -% \pagebreak -% % \item[-] The \xpackage{threeparttable} package creates tablenotes again. Therefore % there is no float problem (because the tablenotes are not continousely numbered with % the footnotes). There are no hyperlinks to the table notes (at least not automatically). @@ -444,11 +446,8 @@ the README, and the derived files %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage{float}[2001/11/08]% v1.3d \usepackage{placeins}[2005/04/18]% v2.2 ; for \FloatBarrier - \usepackage{rotating}[2009/03/28]% v2.16a; for sidewaystable-environment - -\usepackage{tablefootnote}[2011/10/29]% v1.0b - +\usepackage{tablefootnote}[2011/11/06]% v1.0c \usepackage[% extension=pdf,% plainpages=false,% @@ -460,7 +459,8 @@ the README, and the derived files pdfsubject={Example for the tablefootnote package},% pdfkeywords={LaTeX, tablefootnote, footnote, table, Hans-Martin Muench},% % pdfview=FitH and FitBH do not work: hyperlinks in sidewaystables - % aim at the end of the document, not at the footnote + % do no lead to the footnotes, due to a bug in pdfTeX, + % computing wrong anchor coordinates (Heiko Oberdiek, 29. October 2011) % pdfview=Fit, FitV, FitR, FitB, FitBV work % print is OK for all those options pdfstartview=FitH,% @@ -474,7 +474,7 @@ the README, and the derived files \section*{Example for tablefootnote} This example demonstrates the use of package\newline -\textsf{tablefootnote}, v1.0b as of 2011/10/29 (HMM).\newline +\textsf{tablefootnote}, v1.0c as of 2011/11/06 (HMM).\newline There were no options used. (The package provides no options.)\newline \textbf{The \texttt{tablefootnote-example.tex} needs to be compiled @@ -495,10 +495,18 @@ normal tables, table~\ref{tab.sideways} depicts a sidewaystable. Table~\ref{tab.floatH} uses the float specifier~\texttt{H} from the float package.\newline +% \end{macrocode} +% +% \pagebreak +% +% \begin{macrocode} \texttt{Hyperref} option \verb|pdfview=FitH| and \verb|FitBH| do -not work: hyperlinks in sidewaystables aim at the end of the document, -not at the footnote. \verb|pdfview=Fit|, \verb|FitV|, \verb|FitR|, -\verb|FitB|, \verb|FitBV| work, print is OK for all those options. +not work due to a bug in pdf\TeX{}, computing wrong +anchor coordinates (\textsc{Heiko Oberdiek}, 29. October 2011). +Depending on used pdf-viewer, hyperlinks in sidewaystables lead +e.\,g.~at the end of the document, not at the footnote. +\verb|pdfview=Fit|, \verb|FitV|, \verb|FitR|, \verb|FitB|, +\verb|FitBV| work, print is OK for all those options. \bigskip @@ -551,11 +559,6 @@ Some text.\footnote{This is just another text footnote.} \pagebreak -% \end{macrocode} -% -% \pagebreak -% -% \begin{macrocode} \FloatBarrier \begin{sidewaystable} @@ -614,7 +617,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{tablefootnote}[2011/10/29 v1.0b +\ProvidesPackage{tablefootnote}[2011/11/06 v1.0c Table foot notes (HMM)] % \end{macrocode} @@ -630,7 +633,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % We need the \xpackage{ltxcmds} package by \textsc{Heiko Oberdiek}: % % \begin{macrocode} -\RequirePackage{ltxcmds}[2011/04/18]% v1.20 +\RequirePackage{ltxcmds}[2011/04/18]% v1.20 % \end{macrocode} % @@ -640,7 +643,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % \begin{macrocode} \@ifpackageloaded{rotating}{% \gdef\tfn@rotating{1} - \@ifpackagelater{rotating}{2009/03/28}% 2009/03/28 v2.16a + \@ifpackagelater{rotating}{2009/03/28}% v2.16a {% >= 2009/03/28, OK }{% else \PackageWarningNoLine{tablefootnote}{% @@ -763,7 +766,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. \ifx\tfn@swt\tfn@footnotezero% \footnotetext{#1}% \else% - \footnotetext{$^{\text{\thefootnote}}$\thinspace #1}% + \footnotetext{${}^{\text{\textup{\thefootnote}}}$\thinspace #1}% \fi% % \end{macrocode} % @@ -835,7 +838,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % % \begin{macrocode} \IfFileExists{etoolbox.sty}{% - \RequirePackage{etoolbox} + \RequirePackage{etoolbox}[2011/01/03]% v2.1 \AfterEndEnvironment{table}{% \tfn@tablefootnoteprintout% \gdef\tfn@fnt{0}% @@ -880,15 +883,71 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. substituting commands \string\AtEndEnvironment\space % and\MessageBreak% \string\AfterEndEnvironment\space for tablefootnotes% + \MessageBreak% }% - \let\tfnorigtable\table - \let\tfnendorigtable\endtable + \RequirePackage{letltxmacro}[2010/09/02]% v1.4 + \@ifpackagelater{letltxmacro}{2010/09/02}% + {% >= 2010/09/02, OK + \GlobalLetLtxMacro{\tfnorigtable}{\table} + \GlobalLetLtxMacro{\tfnendorigtable}{\endtable} +% \end{macrocode} +% +% |\GlobalLetLtxMacro| was introduced in version 2010/09/02 v1.4 of the +% \xpackage{letltxmacro} package. +% +% \begin{macrocode} + }{% else + \PackageError{tablefootnote}{% + Outdated version of letltxmacro package used% + }{Version 2010/09/02 v1.4 or newer needed but not found!% + \MessageBreak% + Update the used letltxmacro package.} + \LetLtxMacro{\tfnorigtable}{\table} + \LetLtxMacro{\tfnendorigtable}{\endtable} + } + \ltx@ifpackageloaded{float}{% + \@ifpackagelater{float}{2001/11/08}% v1.3d + {% >= 2001/11/08, OK + }{% else + \PackageWarningNoLine{tablefootnote}{% + It is required version\MessageBreak + 2001/11/08 v1.3d (or later) of package float,\MessageBreak + but only version\MessageBreak + `\csname ver@float.sty\endcsname'\MessageBreak + is available}% + }% + }{\relax} \renewenvironment{table}{% + \ltx@ifpackageloaded{float}{% +% \end{macrocode} +% +% When \xpackage{etoolbox.sty} was not found, and the \xpackage{float} package +% has been loded, and the float specifier is \texttt{H}, then |\endtable| was +% let to |\float@endH| by the \xpackage{float} package (line~79 of +% \xpackage{float.sty}, 2001/11/08 v1.3d:\\ +% |\expandafter\let\csname end#1\endcsname\float@endH|), i.\,e.~appending\\ +% |\tfn@tablefootnoteprintout \gdef\tfn@fnt{0}| to |\endtable| is useless. +% Instead of this, it must be appended to |\float@endH|.\\ +% (Why is this not necessary when \xpackage{etoolbox} is used? +% That is a good question, answers are welcome.) +% +% \begin{macrocode} + \ltx@LocalAppendToMacro{\float@endH}{% + \tfn@tablefootnoteprintout% + \gdef\tfn@fnt{0}% + }% + }{\relax} \tfnorigtable% - }{% - \tfnendorigtable% - \tfn@tablefootnoteprintout% - } + }{% + \tfnendorigtable% + \tfn@tablefootnoteprintout% + \gdef\tfn@fnt{0}% + }% +% \end{macrocode} +% +% The |sidewaystable|-environment must be treated separately: +% +% \begin{macrocode} \ltx@ifpackageloaded{rotating}{% \let\tfnorigsidewaystable\sidewaystable \let\tfnendorigsidewaystable\endsidewaystable @@ -990,7 +1049,14 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % \item[-] package \xpackage{subcaption}, 2011/09/12, v1.1b, % \url{http://ctan.org/pkg/subcaption} % \end{description} -% (loading themselfes further packages). +% (loading themselfes further packages).\\ +% When the \xpackage{etoolbox} package is not available, the +% \xpackage{letltxmacro} package is used: +% \begin{description} +% \item[-] package \xpackage{letltxmacro}, 2010/09/02, v1.4, +% \url{http://ctan.org/pkg/letltxmacro} +% \end{description} +% (possibly loading further packages).\\ % % \DescribeMacro{tablefootnote-example.tex} % The \texttt{tablefootnote-example.tex} requires the same files as all @@ -1013,7 +1079,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % \item[-] package \xpackage{hyperref}, 2011/10/01, v6.82j, % \url{http://ctan.org/pkg/hyperref} % -% \item[-] package \xpackage{tablefootnote}, 2011/10/29, v1.0b,\\ +% \item[-] package \xpackage{tablefootnote}, 2011/11/06, v1.0c,\\ % \url{http://ctan.org/pkg/tablefootnote}\\ % (Well, it is the example file for this package, and because you % are reading the documentation for the \xpackage{tablefootnote} package, @@ -1023,9 +1089,10 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % % \DescribeMacro{Oberdiek} % \DescribeMacro{holtxdoc} +% \DescribeMacro{letltxmacro} % \DescribeMacro{ltxcmds} % All packages of \textsc{Heiko Oberdiek's} bundle `oberdiek' -% (especially \xpackage{holtxdoc} and \xpackage{ltxcmds}) +% (especially \xpackage{holtxdoc}, \xpackage{letltxmacro}, and \xpackage{ltxcmds}) % 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 @@ -1203,18 +1270,19 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % |(pdf)latex tablefootnote-example.tex| (and needs at least two compiler runs % to get the references right!).\\ % -% \pagebreak +% \bigskip % % \section{Acknowledgements} % % I would like to thank \textsc{Heiko Oberdiek} for providing -% the \xpackage{hyperref}, \xpackage{ltxcmds}, as well as +% the \xpackage{hyperref}, \xpackage{letltxmacro}, \xpackage{ltxcmds}, as well as % a~lot~(!) of other useful packages (from which I also got everything % I know about creating a file in \xext{dtx} format, ok, say it: copying), +% and for information about the \pdfTeX{}-bug, % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} % newsgroups for their help in all things \TeX{}. % -% \bigskip +% \pagebreak % % \phantomsection % \begin{History}\label{History} @@ -1227,6 +1295,13 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % \xpackage{rotating} package. % \item Diverse changes in documentation and README. % \end{Version} +% \begin{Version}{2011/11/06 v1.0c} +% \item Replaced |^{\text{\thefootnote}}| by |{}^{\text{\textup{\thefootnote}}}|. +% \item Bug fix: When \xpackage{etoolbox.sty} was not found, and the \xpackage{float} +% package had been loded, and the float specifier was \texttt{H}, +% then the |\tablefootnote|s were not printed for that table. Fixed. +% \item Minor details. +% \end{Version} % \end{History} % % \bigskip @@ -1234,7 +1309,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package. % When you find a mistake or have a suggestion for an improvement of this package, % please send an e-mail to the maintainer, thanks! (Please see BUG REPORTS in the README.) % -% \pagebreak +% \bigskip % % \PrintIndex % diff --git a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins index a575b0d97c6..874f4ee4013 100644 --- a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins +++ b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: tablefootnote -%% Version: 2011/10/29 v1.0b +%% Version: 2011/11/06 v1.0c %% %% Copyright (C) 2011 by %% H.-Martin M"unch @@ -42,7 +42,7 @@ \input docstrip.tex \Msg{******************************************************************} \Msg{* Installation *} -\Msg{* Package: tablefootnote 2011/10/29 v1.0b Table foot notes (HMM) *} +\Msg{* Package: tablefootnote 2011/11/06 v1.0c Table foot notes (HMM) *} \Msg{******************************************************************} \keepsilent @@ -54,7 +54,7 @@ This is a generated file. Project: tablefootnote -Version: 2011/10/29 v1.0b +Version: 2011/11/06 v1.0c Copyright (C) 2011 by H.-Martin M"unch diff --git a/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty b/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty index c2135189c59..470650c6c2c 100644 --- a/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty +++ b/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: tablefootnote -%% Version: 2011/10/29 v1.0b +%% Version: 2011/11/06 v1.0c %% %% Copyright (C) 2011 by %% H.-Martin M"unch @@ -40,17 +40,17 @@ %% tablefootnote-example.tex, tablefootnote-example.pdf. %% \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{tablefootnote}[2011/10/29 v1.0b +\ProvidesPackage{tablefootnote}[2011/11/06 v1.0c Table foot notes (HMM)] %% Provides the \tablefootnoteote{...} command %% for footnotes in (sideways)tables. -\RequirePackage{ltxcmds}[2011/04/18]% v1.20 +\RequirePackage{ltxcmds}[2011/04/18]% v1.20 \@ifpackageloaded{rotating}{% \gdef\tfn@rotating{1} - \@ifpackagelater{rotating}{2009/03/28}% 2009/03/28 v2.16a + \@ifpackagelater{rotating}{2009/03/28}% v2.16a {% >= 2009/03/28, OK }{% else \PackageWarningNoLine{tablefootnote}{% @@ -108,7 +108,7 @@ \ifx\tfn@swt\tfn@footnotezero% \footnotetext{#1}% \else% - \footnotetext{$^{\text{\thefootnote}}$\thinspace #1}% + \footnotetext{${}^{\text{\textup{\thefootnote}}}$\thinspace #1}% \fi% \count255=\tfn@footnotetablecount \relax% \count255=\numexpr \count255 + 1 \relax% @@ -137,7 +137,7 @@ } \IfFileExists{etoolbox.sty}{% - \RequirePackage{etoolbox} + \RequirePackage{etoolbox}[2011/01/03]% v2.1 \AfterEndEnvironment{table}{% \tfn@tablefootnoteprintout% \gdef\tfn@fnt{0}% @@ -161,15 +161,47 @@ substituting commands \string\AtEndEnvironment\space % and\MessageBreak% \string\AfterEndEnvironment\space for tablefootnotes% + \MessageBreak% }% - \let\tfnorigtable\table - \let\tfnendorigtable\endtable + \RequirePackage{letltxmacro}[2010/09/02]% v1.4 + \@ifpackagelater{letltxmacro}{2010/09/02}% + {% >= 2010/09/02, OK + \GlobalLetLtxMacro{\tfnorigtable}{\table} + \GlobalLetLtxMacro{\tfnendorigtable}{\endtable} + }{% else + \PackageError{tablefootnote}{% + Outdated version of letltxmacro package used% + }{Version 2010/09/02 v1.4 or newer needed but not found!% + \MessageBreak% + Update the used letltxmacro package.} + \LetLtxMacro{\tfnorigtable}{\table} + \LetLtxMacro{\tfnendorigtable}{\endtable} + } + \ltx@ifpackageloaded{float}{% + \@ifpackagelater{float}{2001/11/08}% v1.3d + {% >= 2001/11/08, OK + }{% else + \PackageWarningNoLine{tablefootnote}{% + It is required version\MessageBreak + 2001/11/08 v1.3d (or later) of package float,\MessageBreak + but only version\MessageBreak + `\csname ver@float.sty\endcsname'\MessageBreak + is available}% + }% + }{\relax} \renewenvironment{table}{% + \ltx@ifpackageloaded{float}{% + \ltx@LocalAppendToMacro{\float@endH}{% + \tfn@tablefootnoteprintout% + \gdef\tfn@fnt{0}% + }% + }{\relax} \tfnorigtable% - }{% - \tfnendorigtable% - \tfn@tablefootnoteprintout% - } + }{% + \tfnendorigtable% + \tfn@tablefootnoteprintout% + \gdef\tfn@fnt{0}% + }% \ltx@ifpackageloaded{rotating}{% \let\tfnorigsidewaystable\sidewaystable \let\tfnendorigsidewaystable\endsidewaystable -- cgit v1.2.3