summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-28 23:45:05 +0000
committerKarl Berry <karl@freefriends.org>2011-11-28 23:45:05 +0000
commit1d273d082e34905bef6b7f40252ae11bbad167f3 (patch)
treea33a7e46dfa61d43973fc75c1ed39a5fd7966cce
parenteab43500db8fdd78f70d0eaff72729a7cdaeea92 (diff)
tablefootnote (28nov11)
git-svn-id: svn://tug.org/texlive/trunk@24681 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/README23
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdfbin144633 -> 144633 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex15
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdfbin341017 -> 341914 bytes
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv4
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx215
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins6
-rw-r--r--Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty75
8 files changed, 175 insertions, 163 deletions
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/README b/Master/texmf-dist/doc/latex/tablefootnote/README
index 26cf4140ae3..971b6823041 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/11/19, v1.0d
+README for tablefootnote package, 2011/11/26, v1.0e
TABLE OF CONTENTS
@@ -102,18 +102,11 @@ e) Update the databases if necessary, e.g. for teTeX:
tablefootnote loads other packages:
* ltxcmds, http://ctan.org/pkg/ltxcmds
-When the rotating package is used (for its sidewaystable
-environment; http://ctan.org/pkg/rotating), and additionally
-the hyperref package, also the ifluatex package is needed
-(it will be loaded automatically by the tablefootnote
-package, if rotating and hyperref are loaded before
-tablefootnote).
-* ifluatex, 2010/03/01, v1.3, http://ctan.org/pkg/ifluatex
When the etoolbox package is available, it is used
* etoolbox, http://ctan.org/pkg/etoolbox
otherwise the package
* letltxmacro, http://ctan.org/pkg/letltxmacro
-is used. (All packages probably load further packages.
+is used. (All packages possibly load further packages.
See the result of the \listfiles command in the log-file
of the example.)
@@ -122,7 +115,7 @@ of the example.)
=======================
- Using the hyperref-option pdfview=FitH or FitBH makes the
- hyperlinks of footnotes in sidewaystables do no lead
+ hyperlinks of footnotes in sidewaystables to not lead
to the footnotes, due to a bug in pdfTeX,
computing wrong anchor coordinates (Heiko Oberdiek,
29. October 2011) The printed version is OK.
@@ -130,10 +123,10 @@ of the example.)
other, even if the footmisc package with option "para"
is used.
- When LuaTeX is used to compile a document with
- sidewaystables, the hyperreferences therein are
+ rotated content, the hyperreferences therein are
misplaced (regardless of loaded tablefootnote-package
or footnotes at all - all hyperreferences in
- sidewaystables are misplaced). Using pdflatex does not
+ rotated content are misplaced). Using pdflatex does not
result in any problem here.
@@ -174,7 +167,7 @@ Bug reports can be send to the maintainer:
=================
- Using the hyperref-option pdfview=FitH or FitBH makes the
- hyperlinks of footnotes in sidewaystables do no lead
+ hyperlinks of footnotes in sidewaystables to not lead
to the footnotes, due to a bug in pdfTeX,
computing wrong anchor coordinates (Heiko Oberdiek,
29. October 2011) The printed version is OK.
@@ -183,10 +176,10 @@ Bug reports can be send to the maintainer:
- When a table with (table)footnotes floates to another place,
its footnotenumbers are not automatically adapted.
- When LuaTeX is used to compile a document with
- sidewaystables, the hyperreferences therein are
+ rotated content, the hyperreferences therein are
misplaced (regardless of loaded tablefootnote-package
or footnotes at all - all hyperreferences in
- sidewaystables are misplaced). Using pdflatex does not
+ rotated content are misplaced). Using pdflatex does not
result in any problem here.
Problem found by Arno Trautmann, 2011/11/15.
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf
index ecad47bee0e..90ae2f5eac6 100644
--- a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf
+++ b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex
index 9fce55a6be7..c45e5583070 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/11/19 v1.0d
+%% Version: 2011/11/26 v1.0e
%%
%% Copyright (C) 2011 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -62,8 +62,10 @@
pdfstartview=FitH,%
pdfpagelayout=OneColumn%
]{hyperref}[2011/10/01]% v6.82j
+ % Due to the urls used in the example, either the hyperref or the url
+ % package are needed (or the urls must be removed before compiling).
-\usepackage{tablefootnote}[2011/11/19]% v1.0d
+\usepackage{tablefootnote}[2011/11/26]% v1.0e
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
@@ -72,7 +74,7 @@
\section*{Example for tablefootnote}
This example demonstrates the use of package\newline
-\textsf{tablefootnote}, v1.0d as of 2011/11/19 (HMM).\newline
+\textsf{tablefootnote}, v1.0e as of 2011/11/26 (HMM).\newline
There were no options used. (The package provides no options.)\newline
\textbf{The \texttt{tablefootnote-example.tex} needs to be compiled
@@ -119,8 +121,8 @@ Another\tablefootnote{A table footnote.} & %
text\tablefootnote{Another table footnote.} & %
in a table\tablefootnote{A third table footnote.}
\end{tabular}
-\caption[A footnotesymbol table]{A table with footnote-symbol-footnotes.%
- \label{tab.symbol}}
+\caption[A footnotesymbol table]{%
+A table with footnote-symbol-footnotes.\label{tab.symbol}}
\end{table}
Some text.\footnote{A text footnote.}
@@ -181,7 +183,8 @@ Some text.\footnote{This is just another text footnote.}
\begin{sidewaystable}
\centering%
\begin{tabular}{ccc}
-Text\tablefootnote{Please rotate the view for testing the hyperlinks.} & %
+Text\tablefootnote{Please rotate the view for testing the %
+hyperlinks.} & %
in a\tablefootnote{Another sidewaystable footnote.} & %
sidewaystable%
\tablefootnote{Sidewaystable-environment provided by %
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf
index 85453a35b9a..4d4cb8669a4 100644
--- a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf
+++ b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv
index c265c726dad..c9e3975375d 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/11/19 v1.0d
+%% Version: 2011/11/26 v1.0e
%%
%% Copyright (C) 2011 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/24]%
\ProvidesFile{tablefootnote.drv}%
- [2011/11/19 v1.0d Table foot notes (HMM)]%
+ [2011/11/26 v1.0e 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 0a828f7ba25..f76b0db3d38 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/11/19 v1.0d
+% Version: 2011/11/26 v1.0e
%
% Copyright (C) 2011 by
% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -84,7 +84,7 @@
\input docstrip.tex
\Msg{******************************************************************}
\Msg{* Installation *}
-\Msg{* Package: tablefootnote 2011/11/19 v1.0d Table foot notes (HMM) *}
+\Msg{* Package: tablefootnote 2011/11/26 v1.0e Table foot notes (HMM) *}
\Msg{******************************************************************}
\keepsilent
@@ -96,7 +96,7 @@
This is a generated file.
Project: tablefootnote
-Version: 2011/11/19 v1.0d
+Version: 2011/11/26 v1.0e
Copyright (C) 2011 by
H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -181,7 +181,7 @@ the README, and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}[2011/06/24]%
\ProvidesFile{tablefootnote.drv}%
- [2011/11/19 v1.0d Table foot notes (HMM)]%
+ [2011/11/26 v1.0e 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
@@ -221,7 +221,7 @@ the README, and the derived files
%
% \fi
%
-% \CheckSum{263}
+% \CheckSum{268}
%
% \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
@@ -271,7 +271,7 @@ the README, and the derived files
% \DoNotIndex{\value,\arabic,\hline,\text,\caption,\centering,\clear,\url}
%
% \title{The \xpackage{tablefootnote} package}
-% \date{2011/11/19 v1.0d}
+% \date{2011/11/26 v1.0e}
% \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
%
% \maketitle
@@ -325,6 +325,7 @@ the README, and the derived files
% \begin{quote}
% |\usepackage{tablefootnote}|
% \end{quote}
+% \enlargethispage{\baselineskip}
% \noindent in the preamble of your \LaTeXe{} source file and use
% |\tablefootnote{...}| instead of |\footnote{...}| in (sideways)tabels.
% If |\tablefootnote{...}| is used in a tabular environment, which is inside
@@ -479,8 +480,10 @@ the README, and the derived files
pdfstartview=FitH,%
pdfpagelayout=OneColumn%
]{hyperref}[2011/10/01]% v6.82j
+ % Due to the urls used in the example, either the hyperref or the url
+ % package are needed (or the urls must be removed before compiling).
-\usepackage{tablefootnote}[2011/11/19]% v1.0d
+\usepackage{tablefootnote}[2011/11/26]% v1.0e
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
@@ -489,7 +492,7 @@ the README, and the derived files
\section*{Example for tablefootnote}
This example demonstrates the use of package\newline
-\textsf{tablefootnote}, v1.0d as of 2011/11/19 (HMM).\newline
+\textsf{tablefootnote}, v1.0e as of 2011/11/26 (HMM).\newline
There were no options used. (The package provides no options.)\newline
\textbf{The \texttt{tablefootnote-example.tex} needs to be compiled
@@ -510,11 +513,6 @@ Tables \ref{tab.symbol}, \ref{tab.normal}, \ref{tab.another} and
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 due to a bug in pdf\TeX{}, computing wrong
anchor coordinates (\textsc{Heiko Oberdiek}, 29. October 2011).
@@ -541,8 +539,8 @@ Another\tablefootnote{A table footnote.} & %
text\tablefootnote{Another table footnote.} & %
in a table\tablefootnote{A third table footnote.}
\end{tabular}
-\caption[A footnotesymbol table]{A table with footnote-symbol-footnotes.%
- \label{tab.symbol}}
+\caption[A footnotesymbol table]{%
+A table with footnote-symbol-footnotes.\label{tab.symbol}}
\end{table}
Some text.\footnote{A text footnote.}
@@ -608,7 +606,8 @@ Some text.\footnote{This is just another text footnote.}
\begin{sidewaystable}
\centering%
\begin{tabular}{ccc}
-Text\tablefootnote{Please rotate the view for testing the hyperlinks.} & %
+Text\tablefootnote{Please rotate the view for testing the %
+hyperlinks.} & %
in a\tablefootnote{Another sidewaystable footnote.} & %
sidewaystable%
\tablefootnote{Sidewaystable-environment provided by %
@@ -666,9 +665,8 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{tablefootnote}[2011/11/19 v1.0d
+\ProvidesPackage{tablefootnote}[2011/11/26 v1.0e
Table foot notes (HMM)]
-
% \end{macrocode}
%
% A short description of the \xpackage{tablefootnote} package:
@@ -683,7 +681,6 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
%
% \begin{macrocode}
\RequirePackage{ltxcmds}[2011/04/18]% v1.20
-
% \end{macrocode}
%
% A last information for the user:
@@ -699,7 +696,8 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \indent See subsection~\ref{ss:Downloads} about how to get them.\\
%
% When the \xpackage{rotating} package (for |sidewaystable|s) is used,
-% it must be recent:
+% it must be loaded before the \xpackage{tablefootnote} package and it must be
+% a recent version:
%
% \begin{macrocode}
\@ifpackageloaded{rotating}{%
@@ -714,28 +712,6 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
`\csname ver@rotating.sty\endcsname'\MessageBreak%
is available}%
}%
- \@ifpackageloaded{hyperref}{%
- \gdef\tfn@rotating{2}
- \RequirePackage{ifluatex}[2010/03/01]% v1.3
- \ifluatex%
- \PackageError{tablefootnote}{%
- LuaTeX & rotating & hyperref used%
- }{LuaTeX and the rotating package are used.\MessageBreak%
- Hyperreferences in sidewaystables will be misplaced%
- \MessageBreak%
- regardless of tablefootnote package\MessageBreak%
- (even without footnotes at all).\MessageBreak%
-% \end{macrocode}
-%
-% Bug reported by \textsc{Arno Trautmann}, 2011/11/15 - thanks!
-%
-% \begin{macrocode}
- Do not use sidewaystables with hyperreferences\MessageBreak%
- or use pdflatex instead of LuaTeX.\MessageBreak%
- (Or fix the LuaTeX/rotating/hyperref error...)\MessageBreak%
- }%
- \fi%
- }{}% else \relax
}{% else
\gdef\tfn@rotating{0}%
}
@@ -752,6 +728,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\def\tfn@footnotezero{0}
\def\tfn@fnt{0}
\def\tfn@swt{0}% _s_ide_w_ays_t_able
+\def\tfn@fmpw{\relax}% f_oot_m_isc_p_ara_w_arn-switch
% \end{macrocode}
%
@@ -783,9 +760,10 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\ifFN@para%
\PackageWarning{tablefootnote}{%
Package footmisc with option para used.\MessageBreak%
- Unfortunately package tablefootnote is not yet able\MessageBreak%
- to regard this in sidewaystables. Here the footnotes\MessageBreak%
- are printed one below the other. Sorry.\MessageBreak%
+ Unfortunately package tablefootnote is not yet\MessageBreak%
+ able to regard this in sidewaystables.\MessageBreak%
+ Here the footnotes are printed one below\MessageBreak%
+ the other. Sorry.\MessageBreak%
}%
\fi%
}
@@ -812,14 +790,6 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\ltx@ifpackageloaded{hyperref}{%
\addtocounter{Hfootnote}{\tfn@footnotetablecount}%
}{}%
-% \end{macrocode}
-%
-% For further footnotes in that table this must not be repeated, therefore
-% we deactivate this by defining |\tfn@footnotetableprint| to something other
-% than |0| (here |1| is used).
-%
-% \begin{macrocode}
- \gdef\tfn@footnotetableprint{1}%
\fi%
% \end{macrocode}
%
@@ -858,12 +828,31 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\ifx\tfn@swt\tfn@footnotezero%
\footnotetext{#1}%
\else%
- \ltx@ifpackageloaded{footmisc}{\tfn@footmiscparawarn}{\relax}%
% \end{macrocode}
%
-% |\@makefnmark| is |\hbox {\@textsuperscript {\normalfont \@thefnmark }}|,
+% If there is more than one tablefootnote in the |sidewaystable|, \\
+% the |\tfn@footmiscparawarn| shall be given,
+%
+% \begin{macrocode}
+ \ifx\tfn@footnotetableprint\tfn@footnotezero%
+ \gdef\tfn@fmpw{\tfn@footmiscparawarn}%
+ \else%
+ \ltx@ifpackageloaded{footmisc}{\tfn@fmpw}{\relax}%
+% \end{macrocode}
+%
+% but we do not want to repeat the message for a third(, forth,\ldots)
+% tablefootnote in the |sidewaystable|.
+%
+% \begin{macrocode}
+ \gdef\tfn@fmpw{relax}%
+ \fi%
+% \end{macrocode}
+%
+% |\@makefnmark| is \\
+% |\hbox {\@textsuperscript {\normalfont \@thefnmark }}|,
% but according to |\show\@thefnmark| here |\@thefnmark| is
-% |{\protect \itshape}| instead of |\thefootnote| (Why?!).
+% |{\protect \itshape}| instead of \\
+% |\thefootnote| (Why?!).
%
% \begin{macrocode}
\footnotetext{\hbox {\@textsuperscript {\normalfont \thefootnote %
@@ -871,6 +860,16 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\fi%
% \end{macrocode}
%
+% For further footnotes in the table the \\
+% |\ifx\tfn@footnotetableprint\tfn@footnotezero|\ldots|\fi| form the beginning
+% of this |\tfn@footnotetext| macro must not be repeated, therefore we deactivate
+% this by defining |\tfn@footnotetableprint| to something other than |0|
+% (here |1| is used).
+%
+% \begin{macrocode}
+ \gdef\tfn@footnotetableprint{1}%
+% \end{macrocode}
+%
% |\tfn@footnotetablecount| contains the negative number of footnote texts
% to be printed, therefore it is increase by one (i.\,e.~the negative number
% decreases, i.\,e.~$-3$ becomes~$-2$).
@@ -921,12 +920,16 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \end{macrocode}
%
% \DescribeMacro{\tfn@swtbox}
-% For |sidewaystable|s the |\tfn@tablefootnoteprintout| is placed in a
-% |\parbox|, which can be placed at the same place as the |sidewaystable|:
+% For |sidewaystable|s the |\tfn@tablefootnoteprintout| is placed in a \\
+% |\parbox|, which can be placed at the end of the |sidewaystable|:
%
% \begin{macrocode}
\newcommand{\tfn@swtbox}{%
-\vspace{2\baselineskip}%
+\ifvoid \footins%
+\vskip 2\baselineskip%
+\else%
+\vskip \skip\footins%
+\fi%
\parbox[b][][t]{\linewidth}{\raggedright \tfn@tablefootnoteprintout}%
}
@@ -1073,11 +1076,11 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \end{macrocode}
%
% \DescribeMacro{\AtBeginDocument}
-% When the \xpackage{rotating} package has been loaded after the
-% \xpackage{tablefootnote} package, there was no check of its required version.
-% If additionally the \xpackage{hyperref} package was loaded, there was no check
-% for \LuaTeX{}, and the according error message was never given. Therefore here
-% an error message is given.
+% When the \xpackage{rotating} package (for |sidewaystable|s) is used,
+% it must be loaded before the \xpackage{tablefootnote} package.
+% (If it is loaded |\AtBeginDocument| after this check, the error message
+% will not be given, but packages really should be loaded before
+% |\AtBeginDocument|.)
%
% \begin{macrocode}
\AtBeginDocument{%
@@ -1091,22 +1094,32 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
\space package!\MessageBreak%
}%
\fi%
- \ltx@ifpackageloaded{hyperref}{%
- \def\tfn@footnoteone{1}%
- \ifx\tfn@rotating\tfn@footnoteone%
- \PackageError{tablefootnote}{%
- Package hyperref loaded after tablefootnote}{%
- When using the rotating, hyperref, and the tablefootnote%
- \MessageBreak%
- packages, the hyperref package MUST be loaded before%
- \MessageBreak%
- the tablefootnote package!\MessageBreak%
- }%
- \fi%
- }{}%
- }{}%
+ }{% else \relax
+ }
+% \end{macrocode}
+%
+% \pagebreak
+%
+% When the document is compiled with \LuaLaTeX{}, hyperlinks in rotated content
+% will be misplaced, regardless of the use of the \xpackage{tablefootnote} package
+% (or of tables or footnotes). The text to be printed will be OK.
+% This problem of \LuaLaTeX{} (not \xpackage{tablefootnote}) was found and reported
+% by \textsc{Arno Trautmann}, 2011/11/15 - thanks!
+%
+% \begin{macrocode}
+ \ltx@ifpackageloaded{hyperref}{%
+ \ifluatex%
+ \PackageWarningNoLine{tablefootnote}{%
+ LuaTeX & hyperref used:\MessageBreak%
+ Hyperreferences in rotated content\MessageBreak%
+ will be misplaced\MessageBreak%
+ regardless of tablefootnote package.\MessageBreak%
+ The text to be printed will be OK%
+ }%
+ \fi%
+ }{% else \relax
+ }%
}
-
% \end{macrocode}
%
% That's it!
@@ -1140,7 +1153,7 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \end{description}
%
% \DescribeMacro{tablefootnote.sty}
-% The \texttt{tablefootnote.sty} for \LaTeXe\ (i.\,e. each document using
+% The \texttt{tablefootnote.sty} for \LaTeXe\ (i.\,e.~each document using
% the \xpackage{tablefootnote} package) requires:
% \begin{description}
% \item[-] \TeX{} Format \LaTeXe{}, \url{http://www.CTAN.org/}
@@ -1149,23 +1162,15 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \url{http://ctan.org/pkg/ltxcmds}
% \end{description}
%
-% When the \xpackage{rotating} package is used (for its |sidewaystable| environment;
-% 2009/03/28, v2.16a, \url{http://ctan.org/pkg/rotating}), and additionally the
-% \xpackage{hyperref} package, also the \xpackage{ifluatex} package is needed
-% (it will be loaded automatically by the \xpackage{tablefootnote}
-% package, if \xpackage{rotating} and \xpackage{hyperref} are loaded
-% \emph{before} \xpackage{tablefootnote}).
-% \begin{description}
-% \item[-] package \xpackage{ifluatex}, 2010/03/01, v1.3,
-% \url{http://ctan.org/pkg/ifluatex}
-% \end{description}
+% When the \xpackage{hyperref} package is used, also the \xpackage{ifluatex} package
+% is needed, but it is already loaded automatically by the \xpackage{hyperref}
+% package.\\
% When the \xpackage{etoolbox} package is not available, additionally the
% \xpackage{letltxmacro} package is used:
% \begin{description}
% \item[-] package \xpackage{letltxmacro}, 2010/09/02, v1.4,
-% \url{http://ctan.org/pkg/letltxmacro}
+% \url{http://ctan.org/pkg/letltxmacro}.
% \end{description}
-% (both packages probably loading further packages).\\
%
% \DescribeMacro{tablefootnote-example.tex}
% The \texttt{tablefootnote-example.tex} requires the same files as all
@@ -1188,7 +1193,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/11/19, v1.0d,\\
+% \item[-] package \xpackage{tablefootnote}, 2011/11/26, v1.0e,\\
% \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,
@@ -1208,9 +1213,11 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% It is probably best to download and use this, because the packages in there
% are quite probably both recent and compatible among themselves.\\
%
+% \pagebreak
+%
% \DescribeMacro{hyperref}
-% \noindent \xpackage{hyperref} is not included in that bundle and needs to be downloaded
-% separately,\\
+% \noindent \xpackage{hyperref} is not included in that bundle and needs to be
+% downloaded separately,\\
% \url{http://mirror.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
%
% \DescribeMacro{M\"{u}nch}
@@ -1455,6 +1462,24 @@ tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}} package.
% \item Added footnotesymbol-footnote-numbers in the example.
% \item Several details.
% \end{Version}
+% \begin{Version}{2011/11/26 v1.0e}
+% \item Check for \xpackage{hyperref} is only done once.
+% \item Message regarding the misplacement of hyperlinks by \LuaLaTeX{}
+% changed form error to warning.
+% \item Replaced |\vspace{2\baselineskip}| by
+% \begin{verbatim}
+% \ifvoid \footins%
+% \vskip 2\baselineskip%
+% \else%
+% \vskip \skip\footins%
+% \fi%
+% \end{verbatim}
+% between the |sidewaystable|s and their footnotes.
+% \item The warning about un-regarded |para|-option of \xpackage{footmoisc}
+% package is only given at the second |tablefootnote| in a |sidewaystable|,
+% not repeatedly for every |tablefootnote| in a |sidewaystable|.
+% \item Minor details.
+% \end{Version}
% \end{History}
%
% \bigskip
diff --git a/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins b/Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins
index 9c9e2245ec0..e06f8b843a8 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/11/19 v1.0d
+%% Version: 2011/11/26 v1.0e
%%
%% Copyright (C) 2011 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -42,7 +42,7 @@
\input docstrip.tex
\Msg{******************************************************************}
\Msg{* Installation *}
-\Msg{* Package: tablefootnote 2011/11/19 v1.0d Table foot notes (HMM) *}
+\Msg{* Package: tablefootnote 2011/11/26 v1.0e Table foot notes (HMM) *}
\Msg{******************************************************************}
\keepsilent
@@ -54,7 +54,7 @@
This is a generated file.
Project: tablefootnote
-Version: 2011/11/19 v1.0d
+Version: 2011/11/26 v1.0e
Copyright (C) 2011 by
H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
diff --git a/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty b/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty
index 3643a8ed83c..6691b64e5c8 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/11/19 v1.0d
+%% Version: 2011/11/26 v1.0e
%%
%% Copyright (C) 2011 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -40,14 +40,12 @@
%% tablefootnote-example.tex, tablefootnote-example.pdf.
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{tablefootnote}[2011/11/19 v1.0d
+\ProvidesPackage{tablefootnote}[2011/11/26 v1.0e
Table foot notes (HMM)]
-
%% Provides the \tablefootnote{...} command
%% for footnotes in (sideways)tables.
\RequirePackage{ltxcmds}[2011/04/18]% v1.20
-
%% tablefootnote may work with earlier versions of LaTeX and that
%% package, but this was not tested. Please consider updating
%% your LaTeX and packages to the most recent version
@@ -65,23 +63,6 @@
`\csname ver@rotating.sty\endcsname'\MessageBreak%
is available}%
}%
- \@ifpackageloaded{hyperref}{%
- \gdef\tfn@rotating{2}
- \RequirePackage{ifluatex}[2010/03/01]% v1.3
- \ifluatex%
- \PackageError{tablefootnote}{%
- LuaTeX & rotating & hyperref used%
- }{LuaTeX and the rotating package are used.\MessageBreak%
- Hyperreferences in sidewaystables will be misplaced%
- \MessageBreak%
- regardless of tablefootnote package\MessageBreak%
- (even without footnotes at all).\MessageBreak%
- Do not use sidewaystables with hyperreferences\MessageBreak%
- or use pdflatex instead of LuaTeX.\MessageBreak%
- (Or fix the LuaTeX/rotating/hyperref error...)\MessageBreak%
- }%
- \fi%
- }{}% else \relax
}{% else
\gdef\tfn@rotating{0}%
}
@@ -91,6 +72,7 @@
\def\tfn@footnotezero{0}
\def\tfn@fnt{0}
\def\tfn@swt{0}% _s_ide_w_ays_t_able
+\def\tfn@fmpw{\relax}% f_oot_m_isc_p_ara_w_arn-switch
\newcommand{\tfn@footnotemarks}{%
\footnotemark%
@@ -103,9 +85,10 @@
\ifFN@para%
\PackageWarning{tablefootnote}{%
Package footmisc with option para used.\MessageBreak%
- Unfortunately package tablefootnote is not yet able\MessageBreak%
- to regard this in sidewaystables. Here the footnotes\MessageBreak%
- are printed one below the other. Sorry.\MessageBreak%
+ Unfortunately package tablefootnote is not yet\MessageBreak%
+ able to regard this in sidewaystables.\MessageBreak%
+ Here the footnotes are printed one below\MessageBreak%
+ the other. Sorry.\MessageBreak%
}%
\fi%
}
@@ -117,7 +100,6 @@
\ltx@ifpackageloaded{hyperref}{%
\addtocounter{Hfootnote}{\tfn@footnotetablecount}%
}{}%
- \gdef\tfn@footnotetableprint{1}%
\fi%
\addtocounter{footnote}{+1}%
\ltx@ifpackageloaded{hyperref}{%
@@ -133,10 +115,16 @@
\ifx\tfn@swt\tfn@footnotezero%
\footnotetext{#1}%
\else%
- \ltx@ifpackageloaded{footmisc}{\tfn@footmiscparawarn}{\relax}%
+ \ifx\tfn@footnotetableprint\tfn@footnotezero%
+ \gdef\tfn@fmpw{\tfn@footmiscparawarn}%
+ \else%
+ \ltx@ifpackageloaded{footmisc}{\tfn@fmpw}{\relax}%
+ \gdef\tfn@fmpw{relax}%
+ \fi%
\footnotetext{\hbox {\@textsuperscript {\normalfont \thefootnote %
}}\thinspace #1}%
\fi%
+ \gdef\tfn@footnotetableprint{1}%
\@tempcnta=\tfn@footnotetablecount%
\advance\@tempcnta by +1%
\xdef\tfn@footnotetablecount{\the\@tempcnta}%
@@ -157,7 +145,11 @@
}
\newcommand{\tfn@swtbox}{%
-\vspace{2\baselineskip}%
+\ifvoid \footins%
+\vskip 2\baselineskip%
+\else%
+\vskip \skip\footins%
+\fi%
\parbox[b][][t]{\linewidth}{\raggedright \tfn@tablefootnoteprintout}%
}
@@ -256,22 +248,21 @@
\space package!\MessageBreak%
}%
\fi%
- \ltx@ifpackageloaded{hyperref}{%
- \def\tfn@footnoteone{1}%
- \ifx\tfn@rotating\tfn@footnoteone%
- \PackageError{tablefootnote}{%
- Package hyperref loaded after tablefootnote}{%
- When using the rotating, hyperref, and the tablefootnote%
- \MessageBreak%
- packages, the hyperref package MUST be loaded before%
- \MessageBreak%
- the tablefootnote package!\MessageBreak%
- }%
- \fi%
- }{}%
- }{}%
+ }{% else \relax
+ }
+ \ltx@ifpackageloaded{hyperref}{%
+ \ifluatex%
+ \PackageWarningNoLine{tablefootnote}{%
+ LuaTeX & hyperref used:\MessageBreak%
+ Hyperreferences in rotated content\MessageBreak%
+ will be misplaced\MessageBreak%
+ regardless of tablefootnote package.\MessageBreak%
+ The text to be printed will be OK%
+ }%
+ \fi%
+ }{% else \relax
+ }%
}
-
\endinput
%%
%% End of file `tablefootnote.sty'.