summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-27 21:54:13 +0000
committerKarl Berry <karl@freefriends.org>2014-01-27 21:54:13 +0000
commit5ba332acfa9f18601a255e177dde19553427ba30 (patch)
tree392348ef46edcad173d31f0cbc0e49d38c19f322
parente0fa7cac47b40ea2e80ce307644d3f6d0882d500 (diff)
tablefootnote (27jan14)
git-svn-id: svn://tug.org/texlive/trunk@32804 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/README40
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdfbin146485 -> 146215 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.tex12
-rw-r--r--Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdfbin357543 -> 358656 bytes
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.drv4
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.dtx368
-rw-r--r--Master/texmf-dist/source/latex/tablefootnote/tablefootnote.ins6
-rw-r--r--Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty238
8 files changed, 310 insertions, 358 deletions
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/README b/Master/texmf-dist/doc/latex/tablefootnote/README
index d502fdf5b07..9f208c1ddbb 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, 2014/01/20, v1.1b
+README for tablefootnote package, 2014/01/26, v1.1c
TABLE OF CONTENTS
@@ -36,15 +36,15 @@ footnotebackref package was achieved without redefining
Redefining \footnote was not done as to not create conflicts
with other packages.
This material is subject to the LaTeX Project Public License
-(LPPL). See http://www.ctan.org/tex-archive/help/Catalogue/
-licenses.lppl.html for the details of that license.
+(LPPL). See http://www.ctan.org/license/lppl1.3
+for the details of that license.
2 DOWNLOAD
==========
`tablefootnote' is available on CTAN:
- CTAN:macros/latex/contrib/tablefootnote/
+ http://www.ctan.org/pkg/tablefootnote
Running
tex tablefootnote.dtx
@@ -56,18 +56,8 @@ Also a ZIP file is provided that contains these files,
the manual (tablefootnote.pdf), the compiled example
(tablefootnote-example.pdf), and this README, already
sorted in a TDS tree:
- CTAN:install/macros/latex/contrib/tablefootnote.tds.zip
-
-`CTAN:' means one of the `Comprehensive TeX Archive Network'
-nodes or one of its mirrors. This is explained in
- http://www.tex.ac.uk/cgi-bin/texfaq2html?label=archives
-
-The CTAN stuff will be mirrored automatically from the
-ftp server, so
- ftp://ftp.tug.org/pub/tex/tablefootnote/
-corresponds to
- CTAN:macros/latex/contrib/tablefootnote/
-
+ http://www.ctan.org/install/macros/latex/contrib/
+ tablefootnote.tds.zip
3 INSTALLATION
==============
@@ -118,10 +108,10 @@ g) Copy the documentation files to
=====================
tablefootnote loads other packages:
-* letltxmacro, http://ctan.org/pkg/letltxmacro
-* ltxcmds, http://ctan.org/pkg/ltxcmds
+* letltxmacro, http://www.ctan.org/pkg/letltxmacro
+* ltxcmds, http://www.ctan.org/pkg/ltxcmds
When the etoolbox package is available, it is used:
-* etoolbox, http://ctan.org/pkg/etoolbox
+* etoolbox, http://www.ctan.org/pkg/etoolbox
(All packages possibly load further packages.
See the result of the \listfiles command in the log-file
of the example.)
@@ -182,11 +172,11 @@ Bug reports can be send to the maintainer:
8 KNOWN PROBLEMS
=================
-- Using the hyperref-option pdfview=FitH or FitBH makes the
- hyperlinks of footnotes in sidewaystables to not lead
- to the footnotes, due to a bug in pdfTeX,
+- Using the hyperref-option "pdfview=FitH" or "pdfview=FitBH"
+ makes the 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.
+ 2011/10/29). The printed version is OK.
- Footnotes in sidewaystables are printed one below the other,
even if the footmisc package with option para is used.
- When a table with (table)footnotes floates to another place,
@@ -195,8 +185,8 @@ Bug reports can be send to the maintainer:
rotated content, the hyperreferences therein are
misplaced (regardless of loaded tablefootnote-package
or footnotes at all - all hyperreferences in
- rotated content are misplaced). Using pdflatex does not
- result in any problem here.
+ rotated content are misplaced).
+ Using pdflatex does not result in any problem here.
Problem found by Arno Trautmann, 2011/11/15.
Ideas for solutions are welcome! \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote-example.pdf
index 7b35069f86c..138a83ab624 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 0848d736d5a..1e0eb491759 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: 2014/01/20 v1.1b
+%% Version: 2014/01/26 v1.1c
%%
%% Copyright (C) 2011 - 2014 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -69,7 +69,7 @@
% package are needed (or the urls must be removed before compiling).
\usepackage{footnotebackref}[2012/07/01]% v1.0
-\usepackage{tablefootnote}[2014/01/20]% v1.1b
+\usepackage{tablefootnote}[2014/01/26]% v1.1c
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
@@ -78,7 +78,7 @@
\section*{Example for tablefootnote}
This example demonstrates the use of package\newline
-\textsf{tablefootnote}, v1.1b as of 2014/01/20 (HMM).\newline
+\textsf{tablefootnote}, v1.1c as of 2014/01/26 (HMM).\newline
There were no options used. (The package provides no options.)\newline
\textbf{The \texttt{tablefootnote-example.tex} needs to be compiled
@@ -194,7 +194,7 @@ in a\tablefootnote[98]{Another sidewaystable footnote %
with optional footnote mark.} & %
sidewaystable%
\tablefootnote{Sidewaystable-environment provided by %
-\url{http://CTAN.org/pkg/rotating} package.}
+\url{http://www.ctan.org/pkg/rotating} package.}
\end{tabular}
\caption[A sideways table]{A table in the \texttt{sideways} %
environment\label{tab.sideways}}%
@@ -205,7 +205,7 @@ environment\label{tab.sideways}}%
\pagebreak
A last table, here with float specifier \texttt{H} from the
-float\footnote{\url{http://CTAN.org/pkg/float}} package.
+float\footnote{\url{http://www.ctan.org/pkg/float}} package.
\begin{table}[H]
\centering
@@ -222,7 +222,7 @@ Some text.\footnote{This is just another text footnote.}
\pagebreak
End of the example for the
-tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}}
+tablefootnote\footnote{\url{http://www.ctan.org/pkg/tablefootnote}}
package.
\end{document}
diff --git a/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf b/Master/texmf-dist/doc/latex/tablefootnote/tablefootnote.pdf
index d5203c871c9..b82fe71512f 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 177dbeddaf4..9f6722ec075 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: 2014/01/20 v1.1b
+%% Version: 2014/01/26 v1.1c
%%
%% Copyright (C) 2011 - 2014 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -43,7 +43,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesFile{tablefootnote.drv}%
- [2014/01/20 v1.1b Table foot notes (HMM)]
+ [2014/01/26 v1.1c Table foot notes (HMM)]
\documentclass{ltxdoc}[2007/11/11]% v2.0u
\usepackage{holtxdoc}[2012/03/21]% v0.24
%% 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 1f4227d9280..7834581d296 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: 2014/01/20 v1.1b
+% Version: 2014/01/26 v1.1c
%
% Copyright (C) 2011 - 2014 by
% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -27,12 +27,11 @@
% tablefootnote-example.tex, tablefootnote-example.pdf.
%
% Distribution:
-% CTAN:macros/latex/contrib/tablefootnote/tablefootnote.dtx
-% CTAN:macros/latex/contrib/tablefootnote/tablefootnote.pdf
-% CTAN:install/macros/latex/contrib/tablefootnote.tds.zip
+% http://mirror.ctan.org/macros/latex/contrib/tablefootnote/tablefootnote.dtx
+% http://mirror.ctan.org/macros/latex/contrib/tablefootnote/tablefootnote.pdf
+% http://mirror.ctan.org/install/macros/latex/contrib/tablefootnote.tds.zip
%
-% Cf. http://ctan.org/pkg/tablefootnote and
-% http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/tablefootnote.html
+% See http://www.ctan.org/pkg/tablefootnote (Catalogue)
%
% Unpacking:
% (a) If tablefootnote.ins is present:
@@ -84,7 +83,7 @@
\input docstrip.tex
\Msg{******************************************************************}
\Msg{* Installation *}
-\Msg{* Package: tablefootnote 2014/01/20 v1.1b Table foot notes (HMM) *}
+\Msg{* Package: tablefootnote 2014/01/26 v1.1c Table foot notes (HMM) *}
\Msg{******************************************************************}
\keepsilent
@@ -96,7 +95,7 @@
This is a generated file.
Project: tablefootnote
-Version: 2014/01/20 v1.1b
+Version: 2014/01/26 v1.1c
Copyright (C) 2011 - 2014 by
H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -183,7 +182,7 @@ In memoriam Tommy Muench + 2014/01/02.
%<*driver>
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesFile{tablefootnote.drv}%
- [2014/01/20 v1.1b Table foot notes (HMM)]
+ [2014/01/26 v1.1c Table foot notes (HMM)]
\documentclass{ltxdoc}[2007/11/11]% v2.0u
\usepackage{holtxdoc}[2012/03/21]% v0.24
%% tablefootnote may work with earlier versions of LaTeX2e and those
@@ -223,7 +222,7 @@ In memoriam Tommy Muench + 2014/01/02.
%
% \fi
%
-% \CheckSum{626}
+% \CheckSum{584}
%
% \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
@@ -273,7 +272,7 @@ In memoriam Tommy Muench + 2014/01/02.
% \DoNotIndex{\value,\arabic,\hline,\text,\caption,\centering,\clear,\url}
%
% \title{The \xpackage{tablefootnote} package}
-% \date{2014/01/20 v1.1b}
+% \date{2014/01/26 v1.1c}
% \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}}
%
% \maketitle
@@ -425,7 +424,7 @@ In memoriam Tommy Muench + 2014/01/02.
% Therefore there is no float problem (because the footnotes are not continuously
% numbered). The hyperlinks to the table notes indeed work.
%
-% \pagebreak[3]
+% \pagebreak
%
% \item[-] The \xpackage{threeparttable} package creates tablenotes again. Therefore
% there is no float problem (because the tablenotes are not continuously numbered with
@@ -502,7 +501,7 @@ In memoriam Tommy Muench + 2014/01/02.
% package are needed (or the urls must be removed before compiling).
\usepackage{footnotebackref}[2012/07/01]% v1.0
-\usepackage{tablefootnote}[2014/01/20]% v1.1b
+\usepackage{tablefootnote}[2014/01/26]% v1.1c
\gdef\unit#1{\mathord{\thinspace\mathrm{#1}}}%
\listfiles
@@ -511,7 +510,7 @@ In memoriam Tommy Muench + 2014/01/02.
\section*{Example for tablefootnote}
This example demonstrates the use of package\newline
-\textsf{tablefootnote}, v1.1b as of 2014/01/20 (HMM).\newline
+\textsf{tablefootnote}, v1.1c as of 2014/01/26 (HMM).\newline
There were no options used. (The package provides no options.)\newline
\textbf{The \texttt{tablefootnote-example.tex} needs to be compiled
@@ -632,7 +631,7 @@ in a\tablefootnote[98]{Another sidewaystable footnote %
with optional footnote mark.} & %
sidewaystable%
\tablefootnote{Sidewaystable-environment provided by %
-\url{http://CTAN.org/pkg/rotating} package.}
+\url{http://www.ctan.org/pkg/rotating} package.}
\end{tabular}
\caption[A sideways table]{A table in the \texttt{sideways} %
environment\label{tab.sideways}}%
@@ -648,7 +647,7 @@ environment\label{tab.sideways}}%
%
% \begin{macrocode}
A last table, here with float specifier \texttt{H} from the
-float\footnote{\url{http://CTAN.org/pkg/float}} package.
+float\footnote{\url{http://www.ctan.org/pkg/float}} package.
\begin{table}[H]
\centering
@@ -665,7 +664,7 @@ Some text.\footnote{This is just another text footnote.}
\pagebreak
End of the example for the
-tablefootnote\footnote{\url{http://CTAN.org/pkg/tablefootnote}}
+tablefootnote\footnote{\url{http://www.ctan.org/pkg/tablefootnote}}
package.
\end{document}
@@ -687,14 +686,14 @@ package.
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{tablefootnote}[2014/01/20 v1.1b
+\ProvidesPackage{tablefootnote}[2014/01/26 v1.1c
Table foot notes (HMM)]
% \end{macrocode}
%
% A short description of the \xpackage{tablefootnote} package:
%
% \begin{macrocode}
-%% Provides the \tablefootnote{...} command
+%% Provides the \tablefootnote[...]{...} command
%% for footnotes in (sideways)tables.
% \end{macrocode}
@@ -738,7 +737,7 @@ package.
is available}%
}%
}{% else
- \gdef\tfn@rotating{0}%
+ \gdef\tfn@rotating{0}%
}
% \end{macrocode}
@@ -752,122 +751,27 @@ package.
\def\tfn@footnotetableprint{0}
\def\tfn@footnotezero{0}
\def\tfn@fnt{0}
-\def\tfn@swt{0}% _s_ide_w_ays_t_able
+\def\tfn@swt{0}% _s_ide_w_ays_t_able
\def\tfn@fmpw{\relax}% f_oot_m_isc_p_ara_w_arn-switch
-\def\tfn@fnbr{0}% f_oot_n_ote_b_ack_r_ef(erence package)
+\def\tfn@fnbr{0}% f_oot_n_ote_b_ack_r_ef(erence package)
% \end{macrocode}
%
-% We need some wrappers for the used |\ifHy@hyperfootnotes|:
+% \begin{macro}{\tfn@hyperfootnotes}
+% We need a wrapper for the used |\ifHy@hyperfootnotes|,
+% which is not defined when the \xpackage{hyperref} package has not been loaded:
%
% \begin{macrocode}
-
-\newcommand{\tfnhra}{%
- \ifHy@hyperfootnotes%%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:\theHfootnote}{}}%
- \fi%
- }
-
-\newcommand{\tfnhrb}[1]{%
- \ifHy@hyperfootnotes%
- \edef\tfn@thn{\arabic{Hfootnote}}%
- \fi%
- \setcounter{footnote}{#1}
- \ifHy@hyperfootnotes%
- \setcounter{Hfootnote}{#1}%
- \fi%
- \tfn@updateHyper%
-}
-
-\newcommand{\tfnhrc}[1]{%
- {\ifHy@hyperfootnotes%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}%
- \fi%
- }{}%
-}
-
-\newcommand{\tfnhrd}{%
- \ifHy@hyperfootnotes%
- \setcounter{Hfootnote}{\tfn@thn}%
- \fi%
- \tfn@updateHyper%
-}
-
-\newcommand{\tfnhre}[1]{%
-\ifHy@hyperfootnotes%
- \hyperlink{tfn:#1}{\footnotemark[#1]}%
- \else%
- \footnotemark[#1]%
- \fi%
-}
-
-\newcommand{\tfnhrf}{%
+\DeclareRobustCommand{\tfn@hyperfootnotes}[2]{%
\ifHy@hyperfootnotes%
- \hyper@makecurrent{Hfootnote}%
+ #1%
+ \else%
+ #2%
\fi%
-}
-
-\newcommand{\tfnhrg}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{\tfn@footnotetablecount}%
- \fi%
-}
-
-\newcommand{\tfnhrh}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{+1}%
- \fi%
-}
-
-
-\newcommand{\tfnhri}[2]{%
-\ifHy@hyperfootnotes%
- \footnotetext[#1]{%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}#2}%
- \else%
- \footnotetext[#1]{#2}%
- \fi%
-}
-
-\newcommand{\tfnhrj}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{-1}%
- \fi%
-}
-
-\newcommand{\tfnhrk}{%
- \ifHy@hyperfootnotes%
- \ifluatex%
- \PackageWarningNoLine{tablefootnote}{%
- LuaTeX and hyperref package 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%
- \fi%
-}
-
-\newcommand{\tfnhrl}{%
- \ifHy@hyperfootnotes%
- \relax%
- \else%
- \PackageError{tablefootnote}{%
- footnotebackref but not hyperfootnotes}{%
- The footnotebackref package is used\MessageBreak%
- but the hyperfootnotes option of the hyperref package%
- \MessageBreak%
- was set to false.\MessageBreak%
- Either enable hyperfootnotes or do not use footnotebackref.%
- \MessageBreak%
- Loading of the tablefootnote package will be aborted.%
- }%
- \endinput%
- \fi%
-}
+ }
% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\tablemakefntext}
% |\tablemakefntext| makes the footnotetext for a footnote in a table.
@@ -917,21 +821,19 @@ package.
}
}
-
% \end{macrocode}
%
% \end{macro}
-% \begin{macro}{\swtablemakefntext}
%
+% \pagebreak
+%
+% \begin{macro}{\swtablemakefntext}
% \begin{macrocode}
\newcommand\swtablemakefntext[1]{\noindent\ #1}
-
% \end{macrocode}
% \end{macro}
%
-% \pagebreak
-%
% \begin{macro}{\tfn@footnotemarks}
% |\tfn@footnotemarks| uses the |\footnotemark| command to place a foot note mark
% and decreases the |\tfn@footnotetablecount| (i.\,e.~increases the negative value)
@@ -949,15 +851,17 @@ package.
{% footnotebackref not loaded
}%
}%
- {\ltx@ifpackageloaded{hyperref}{\tfnhre{#1}}{\footnotemark[#1]}%
+ {\ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \hyperlink{tfn:#1}{\footnotemark[#1]}%
+ }{\footnotemark[#1]}}%
+ {\footnotemark[#1]}%
\ltx@ifpackageloaded{footnotebackref}%
- {\raisebox{\ht\strutbox}{\hypertarget{tfn:m#1}{}}}%
- {% footnotebackref not loaded
- }%
+ {\raisebox{\ht\strutbox}{\hypertarget{tfn:m#1}{}}}{}%
}%
}%
\@tempcnta=\tfn@footnotetablecount\relax%
- \advance\@tempcnta by -1%
+ \advance\@tempcnta by -1\relax%
\xdef\tfn@footnotetablecount{\the\@tempcnta}%
}
@@ -988,8 +892,6 @@ package.
% \end{macrocode}
% \end{macro}
%
-% \pagebreak
-%
% \begin{macro}{\tfn@updateHyper}
% |\tfn@updateHyper| updates some \xpackage{hyperref} internals.
%
@@ -997,9 +899,9 @@ package.
\newcommand{\tfn@updateHyper}{%
% The code of this command is partly from the
% hyperref package by Heiko Oberdiek, 2011/10/01, v6.82j.
- % Newer versions of that package are available at CTAN.
+ % Newer versions of that package are available at CTAN.org.
\global\let\Hy@saved@currentHref\@currentHref%
- \tfnhrf%
+ \tfn@hyperfootnotes{\hyper@makecurrent{Hfootnote}}{}%
\global\let\Hy@footnote@currentHref\@currentHref%
\global\let\@currentHref\Hy@saved@currentHref%
}
@@ -1024,7 +926,11 @@ package.
% be reset (when the footnotes are hyperlinked).
%
% \begin{macrocode}
- \ltx@ifpackageloaded{hyperref}{\tfnhrg\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{%
+ \addtocounter{Hfootnote}{\tfn@footnotetablecount}}{}%
+ \tfn@updateHyper%
+ }{}%
\fi%
% \end{macrocode}
%
@@ -1033,20 +939,38 @@ package.
%
% \begin{macrocode}
\addtocounter{footnote}{+1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{+1}}{}%
% \end{macrocode}
%
% The \xpackage{hyperref} package was not expecting this kind of change of the
% |(H)footnote| numbers, therefore some code-lines are missing here which can be
% found at other places in that same package and are called by this command.
+%
+% \begin{macrocode}
+ \tfn@updateHyper%
+% \end{macrocode}
+%
% When \xpackage{hyperref} is not loaded, nothing is to be done here.
%
+% \begin{macrocode}
+ }{}%
+% \end{macrocode}
+%
% The |\footnotetext[...]{...}| places the foot note text as usual.
%
% \begin{macrocode}
\ifx\tfn@swt\tfn@footnotezero%
- \ifthenelse{\isempty{#1}}{\footnotetext{#2}}{%
- \ltx@ifpackageloaded{hyperref}{\tfnhri{#1}{#2}}{\footnotetext[#1]{#2}}}%
+ \ifthenelse{\isempty{#1}}%
+ {\footnotetext{#2}}%
+ {\ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \footnotetext[#1]{%
+ \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}#2}%
+ }{\footnotetext[#1]{#2}%
+ }%
+ }{\footnotetext[#1]{#2}}%
+ }%
\else%
% \end{macrocode}
%
@@ -1083,7 +1007,7 @@ package.
{\footnotetext{%
\raisebox{\ht\strutbox}{\hypertarget{tfn:\theHfootnote}{}}%
\hbox{\@textsuperscript{\normalfont%
- \hyperlink{tfn:m\theHfootnote}{\thefootnote}}}\thinspace%
+ \hyperlink{tfn:m\theHfootnote}{\thefootnote}}}\thinspace%
\ifx\FootnoteBackref@symbol\empty%
\else\hyperlink{tfn:m\theHfootnote}{\FootnoteBackref@symbol}%
\fi%
@@ -1114,18 +1038,41 @@ package.
\ifthenelse{\isempty{#1}}%
{\footnotetext{%
\hbox{\@textsuperscript{\normalfont\thefootnote}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhra}{}%
+ \ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \raisebox{\ht\strutbox}{%
+ \hypertarget{tfn:\theHfootnote}{}}}{}%
+ }{}%
\thinspace%
#2}%
- }{\edef\tfn@tfn{\arabic{footnote}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrb{#1}}{\setcounter{footnote}{#1}}%
+ }{%
+% \end{macrocode}
+%
+% \pagebreak
+%
+% \begin{macrocode}
+ \edef\tfn@tfn{\arabic{footnote}}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\xdef\tfn@thn{\arabic{Hfootnote}}}{}%
+ }{}%
+ \setcounter{footnote}{#1}
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\setcounter{Hfootnote}{#1}}{}%
+ \tfn@updateHyper%
+ }{}%
\footnotetext{%
\hbox{\@textsuperscript{\normalfont #1}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrc{#1}}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\raisebox{\ht\strutbox}{%
+ \hypertarget{tfn:#1}{}}}{}%
+ }{}%
\thinspace%
#2}%
\setcounter{footnote}{\tfn@tfn}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrd}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\setcounter{Hfootnote}{\tfn@thn}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\fi%
@@ -1147,7 +1094,7 @@ package.
%
% \begin{macrocode}
\@tempcnta=\tfn@footnotetablecount\relax%
- \advance\@tempcnta by +1%
+ \advance\@tempcnta by +1\relax%
\xdef\tfn@footnotetablecount{\the\@tempcnta}%
% \end{macrocode}
%
@@ -1167,8 +1114,8 @@ package.
% \end{macro}
%
% \begin{macro}{\tfn@tablefootnoteprintout}
-% When something shall be cleared or redefined, it is a good idea to define it.
-% It~will be later filled with the foot note text to be printed.
+% When something shall be cleared or redefined, it is a good idea
+% to define it. It~will be later filled with the foot note text to be printed.
%
% \begin{macrocode}
\newcommand{\tfn@tablefootnoteprintout}{\relax}
@@ -1176,12 +1123,14 @@ package.
% \end{macrocode}
% \end{macro}
%
+% \pagebreak
+%
% \begin{macro}{\tablefootnote}
% |\tablefootnote[...]{...}| is the command to be used by the user instead of
% |\footnote[...]{...}| in the (sideways)table. It places a foot note mark via
% |\tfn@footnotemarks| and appends a |\tfn@footnotetext{#1}| to the\\
-% |\tfn@tablefootnoteprintout| macro. (And remembers that table foot notes
-% have been used.)
+% |\tfn@tablefootnoteprintout| macro, and remembers that table foot notes
+% have been used.
%
% \begin{macrocode}
\newcommand{\tablefootnote}[2][]{%
@@ -1189,24 +1138,28 @@ package.
\ifthenelse{\isempty{#1}}{\relax}{%
\ltx@GlobalPrependToMacro{\tfn@tablefootnoteprintout}{%
\addtocounter{footnote}{+1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{+1}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\ltx@GlobalAppendToMacro{\tfn@tablefootnoteprintout}{%
\tfn@footnotetext[#1]{#2}%
\ifthenelse{\isempty{#1}}{\relax}{%
\addtocounter{footnote}{-1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrj\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{-1}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\gdef\tfn@fnt{1}%
-}
+ }
% \end{macrocode}
% \end{macro}
%
-% \pagebreak
-%
% \begin{macro}{\tfn@swtbox}
% For |sidewaystable|s the |\tfn@tablefootnoteprintout| is placed in a \\
% |\parbox|, which can be placed at the end of the |sidewaystable|:
@@ -1277,8 +1230,6 @@ package.
}{%
% \end{macrocode}
%
-% \pagebreak
-%
% When the \xpackage{etoolbox} package is not available (e.\,g. because of missing
% \eTeX{}) we~do a workaround:
%
@@ -1308,7 +1259,12 @@ package.
Update the used letltxmacro package.}
\LetLtxMacro{\tfnorigtable}{\table}
\LetLtxMacro{\tfnendorigtable}{\endtable}
- }
+ }%
+% \end{macrocode}
+%
+% \pagebreak
+%
+% \begin{macrocode}
\ltx@ifpackageloaded{float}{%
\@ifpackagelater{float}{2001/11/08}% v1.3d
{% >= 2001/11/08, OK
@@ -1363,6 +1319,8 @@ package.
}%
% \end{macrocode}
%
+% \pagebreak
+%
% The |sidewaystable|-environment must be treated separately:
%
% \begin{macrocode}
@@ -1393,8 +1351,6 @@ package.
% \end{macrocode}
%
-% \pagebreak
-%
% \DescribeMacro{\AtBeginDocument}
% When the \xpackage{rotating} (for |sidewaystable|s) or the
% \xpackage{footnotebackref} (for back references for the footnotes)
@@ -1432,6 +1388,8 @@ package.
}
% \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.
@@ -1439,18 +1397,42 @@ package.
% by \textsc{Arno Trautmann}, 2011/11/15 -- thanks!
%
% \begin{macrocode}
- \ltx@ifpackageloaded{hyperref}{\tfnhrk}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{
+ \ifluatex%
+ \PackageWarningNoLine{tablefootnote}{%
+ LuaTeX and hyperref package 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
+ }%
+ }{% else \relax
+ }%
% \end{macrocode}
%
-% \pagebreak
-%
-% When the \xpackage{footnotebackref}-package is used but the footnotes are not
+% When the \xpackage{footnotebackref} package is used but the footnotes are not
% hyperlinked, neither the back references nor the tablefootnotes will work.
%
% \begin{macrocode}
\ltx@ifpackageloaded{footnotebackref}{%
- \ltx@ifpackageloaded{hyperref}{%
- \tfnhrl%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\relax}{% else
+ \PackageError{tablefootnote}{%
+ footnotebackref but not hyperfootnotes}{%
+ The footnotebackref package is used\MessageBreak%
+ but the hyperfootnotes option of the hyperref package%
+ \MessageBreak%
+ was set to false.\MessageBreak%
+ Either enable hyperfootnotes or do not use footnotebackref.%
+ \MessageBreak%
+ Loading of the tablefootnote package will be aborted.%
+ }%
+ \endinput%
+ }%
}{\PackageError{tablefootnote}{footnotebackref but not hyperref}{%
The footnotebackref package is used\MessageBreak%
but not the hyperref package.\MessageBreak%
@@ -1458,7 +1440,7 @@ package.
\MessageBreak%
Loading of the tablefootnote package will be aborted.%
}%
- \endinput
+ \endinput%
}%
}{}
}
@@ -1475,7 +1457,7 @@ package.
%
% \subsection{Downloads\label{ss:Downloads}}
%
-% Everything is available on \CTAN{}, \url{http://www.ctan.org/tex-archive/},
+% Everything is available on \CTAN{}, \url{http://www.ctan.org/},
% but may need additional packages themselves.\\
%
% \DescribeMacro{tablefootnote.dtx}
@@ -1485,13 +1467,13 @@ package.
% \item[-] \TeX{} Format \LaTeXe{}: \url{http://www.CTAN.org/}
%
% \item[-] document class \xpackage{ltxdoc}, 2007/11/11, v2.0u,
-% \url{http://ctan.org/pkg/ltxdoc}
+% \url{http://www.ctan.org/pkg/ltxdoc}
%
% \item[-] package \xpackage{holtxdoc}, 2012/03/21, v0.24,
-% \url{http://ctan.org/pkg/holtxdoc}
+% \url{http://www.ctan.org/pkg/holtxdoc}
%
% \item[-] package \xpackage{hypdoc}, 2011/08/19, v1.11,
-% \url{http://ctan.org/pkg/hypdoc}
+% \url{http://www.ctan.org/pkg/hypdoc}
% \end{description}
%
% \DescribeMacro{tablefootnote.sty}
@@ -1501,10 +1483,10 @@ package.
% \item[-] \TeX{} Format \LaTeXe{}, \url{http://www.CTAN.org/}
%
% \item[-] package \xpackage{letltxmacro}, 2010/09/02, v1.4,
-% \url{http://ctan.org/pkg/letltxmacro}.
+% \url{http://www.ctan.org/pkg/letltxmacro}.
%
% \item[-] package \xpackage{ltxcmds}, 2011/11/09, v1.22,
-% \url{http://ctan.org/pkg/ltxcmds}
+% \url{http://www.ctan.org/pkg/ltxcmds}
% \end{description}
%
% When the \xpackage{hyperref} package is used, also the \xpackage{ifluatex} package
@@ -1513,7 +1495,7 @@ package.
% When the \xpackage{etoolbox} package is available, it is used:
% \begin{description}
% \item[-] package \xpackage{etoolbox}, 2011/01/03, v2.1,
-% \url{http://ctan.org/pkg/etoolbox}.
+% \url{http://www.ctan.org/pkg/etoolbox}.
% \end{description}
%
% \DescribeMacro{tablefootnote-example.tex}
@@ -1524,20 +1506,20 @@ package.
% \CTAN{macros/latex/base/classes.dtx}
%
% \item[-] package \xpackage{rotating}, 2009/03/28, v2.16a,
-% \url{http://ctan.org/pkg/rotating}
+% \url{http://www.ctan.org/pkg/rotating}
%
% \item[-] package \xpackage{float}, 2001/11/08, v1.3d,
-% \url{http://ctan.org/pkg/float}
+% \url{http://www.ctan.org/pkg/float}
%
% \item[-] package \xpackage{placeins}, 2005/04/18, v2.2,
-% \url{http://ctan.org/pkg/placeins}\\
+% \url{http://www.ctan.org/pkg/placeins}\\
% for |\FloatBarrier|
%
% \item[-] package \xpackage{hyperref}, 2012/11/06, v6.83m,
-% \url{http://ctan.org/pkg/hyperref}
+% \url{http://www.ctan.org/pkg/hyperref}
%
-% \item[-] package \xpackage{tablefootnote}, 2014/01/20, v1.1b,\\
-% \url{http://ctan.org/pkg/tablefootnote}\\
+% \item[-] package \xpackage{tablefootnote}, 2014/01/26, v1.1c,\\
+% \url{http://www.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,
% it can be assumed that you already have some version of it~--
@@ -1561,11 +1543,11 @@ package.
% \DescribeMacro{hyperref}
% \noindent \xpackage{hyperref} is not included in that bundle and needs to be
% downloaded separately,\\
-% \url{http://mirror.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
+% \url{http://www.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\
%
% \DescribeMacro{M\"{u}nch}
% A hyperlinked list of my (other) packages can be found at
-% \url{http://ctan.org/author/muench-hm}.\\
+% \url{http://www.ctan.org/author/muench-hm}.\\
%
% \subsection{Package, unpacking TDS}
% \paragraph{Package.} This package is available on \CTAN{}
@@ -1750,6 +1732,8 @@ package.
% package or footnotes at all,
% \textsc{Thomas~V.} for reporting the bug of not handling the case of
% \xpackage{hyperref} option |hyperfootnotes=false|,
+% \textsc{Sverre Stausland Johnsen} for reporting the bug in case of \emph{not}
+% using \xpackage{hyperref},
% and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} newsgroups
% as well as everybody at \url{http://tex.stackexchange.com}
% for their help in all things \TeX{}.
@@ -1849,9 +1833,17 @@ package.
% \item A lot of details.
% \end{Version}
% \begin{Version}{2014/01/20 v1.1b}
-% \item Bug fix: Package was broken when \xpackage{hyperref} was not used.
+% \item Bug fix: Package was broken when \xpackage{hyperref} was \emph{not} used.
% (Bug reported by \textsc{Sverre Stausland Johnsen} -- thanks!)
% \end{Version}
+% \begin{Version}{2014/01/26 v1.1c}
+% \item The emergency bug fix of version 2014/01/20 v1.1b was replaced by using
+% the new robust macro |\tfn@hyperfootnotes|, which only \emph{internally}
+% uses |\ifHy@hyperfootnotes|. If the \xpackage{hyperref} package is not used,
+% \LaTeX{} now does not see any confusing
+% |\ifHy@hyperfootnotes|\ldots|\else|\ldots|\fi| at all.
+% \item URLs and README updated.
+% \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 5d0f9661ede..b5c6045ed16 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: 2014/01/20 v1.1b
+%% Version: 2014/01/26 v1.1c
%%
%% Copyright (C) 2011 - 2014 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -44,7 +44,7 @@
\input docstrip.tex
\Msg{******************************************************************}
\Msg{* Installation *}
-\Msg{* Package: tablefootnote 2014/01/20 v1.1b Table foot notes (HMM) *}
+\Msg{* Package: tablefootnote 2014/01/26 v1.1c Table foot notes (HMM) *}
\Msg{******************************************************************}
\keepsilent
@@ -56,7 +56,7 @@
This is a generated file.
Project: tablefootnote
-Version: 2014/01/20 v1.1b
+Version: 2014/01/26 v1.1c
Copyright (C) 2011 - 2014 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 a7217741367..2b4b06f36f2 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: 2014/01/20 v1.1b
+%% Version: 2014/01/26 v1.1c
%%
%% Copyright (C) 2011 - 2014 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -42,9 +42,9 @@
%% In memoriam Tommy Muench + 2014/01/02.
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{tablefootnote}[2014/01/20 v1.1b
+\ProvidesPackage{tablefootnote}[2014/01/26 v1.1c
Table foot notes (HMM)]
-%% Provides the \tablefootnote{...} command
+%% Provides the \tablefootnote[...]{...} command
%% for footnotes in (sideways)tables.
\RequirePackage{ltxcmds}[2011/11/09]% v1.22
@@ -68,121 +68,24 @@
is available}%
}%
}{% else
- \gdef\tfn@rotating{0}%
+ \gdef\tfn@rotating{0}%
}
\def\tfn@footnotetablecount{0}
\def\tfn@footnotetableprint{0}
\def\tfn@footnotezero{0}
\def\tfn@fnt{0}
-\def\tfn@swt{0}% _s_ide_w_ays_t_able
+\def\tfn@swt{0}% _s_ide_w_ays_t_able
\def\tfn@fmpw{\relax}% f_oot_m_isc_p_ara_w_arn-switch
-\def\tfn@fnbr{0}% f_oot_n_ote_b_ack_r_ef(erence package)
+\def\tfn@fnbr{0}% f_oot_n_ote_b_ack_r_ef(erence package)
-
-\newcommand{\tfnhra}{%
- \ifHy@hyperfootnotes%%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:\theHfootnote}{}}%
- \fi%
- }
-
-\newcommand{\tfnhrb}[1]{%
- \ifHy@hyperfootnotes%
- \edef\tfn@thn{\arabic{Hfootnote}}%
- \fi%
- \setcounter{footnote}{#1}
- \ifHy@hyperfootnotes%
- \setcounter{Hfootnote}{#1}%
- \fi%
- \tfn@updateHyper%
-}
-
-\newcommand{\tfnhrc}[1]{%
- {\ifHy@hyperfootnotes%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}%
- \fi%
- }{}%
-}
-
-\newcommand{\tfnhrd}{%
- \ifHy@hyperfootnotes%
- \setcounter{Hfootnote}{\tfn@thn}%
- \fi%
- \tfn@updateHyper%
-}
-
-\newcommand{\tfnhre}[1]{%
-\ifHy@hyperfootnotes%
- \hyperlink{tfn:#1}{\footnotemark[#1]}%
- \else%
- \footnotemark[#1]%
- \fi%
-}
-
-\newcommand{\tfnhrf}{%
+\DeclareRobustCommand{\tfn@hyperfootnotes}[2]{%
\ifHy@hyperfootnotes%
- \hyper@makecurrent{Hfootnote}%
+ #1%
+ \else%
+ #2%
\fi%
-}
-
-\newcommand{\tfnhrg}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{\tfn@footnotetablecount}%
- \fi%
-}
-
-\newcommand{\tfnhrh}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{+1}%
- \fi%
-}
-
-\newcommand{\tfnhri}[2]{%
-\ifHy@hyperfootnotes%
- \footnotetext[#1]{%
- \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}#2}%
- \else%
- \footnotetext[#1]{#2}%
- \fi%
-}
-
-\newcommand{\tfnhrj}{%
- \ifHy@hyperfootnotes%
- \addtocounter{Hfootnote}{-1}%
- \fi%
-}
-
-\newcommand{\tfnhrk}{%
- \ifHy@hyperfootnotes%
- \ifluatex%
- \PackageWarningNoLine{tablefootnote}{%
- LuaTeX and hyperref package 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%
- \fi%
-}
-
-\newcommand{\tfnhrl}{%
- \ifHy@hyperfootnotes%
- \relax%
- \else%
- \PackageError{tablefootnote}{%
- footnotebackref but not hyperfootnotes}{%
- The footnotebackref package is used\MessageBreak%
- but the hyperfootnotes option of the hyperref package%
- \MessageBreak%
- was set to false.\MessageBreak%
- Either enable hyperfootnotes or do not use footnotebackref.%
- \MessageBreak%
- Loading of the tablefootnote package will be aborted.%
- }%
- \endinput%
- \fi%
-}
+ }
\ltx@ifpackageloaded{footnotebackref}{%
\gdef\tfn@fnbr{1}%
@@ -239,15 +142,17 @@
{% footnotebackref not loaded
}%
}%
- {\ltx@ifpackageloaded{hyperref}{\tfnhre{#1}}{\footnotemark[#1]}%
+ {\ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \hyperlink{tfn:#1}{\footnotemark[#1]}%
+ }{\footnotemark[#1]}}%
+ {\footnotemark[#1]}%
\ltx@ifpackageloaded{footnotebackref}%
- {\raisebox{\ht\strutbox}{\hypertarget{tfn:m#1}{}}}%
- {% footnotebackref not loaded
- }%
+ {\raisebox{\ht\strutbox}{\hypertarget{tfn:m#1}{}}}{}%
}%
}%
\@tempcnta=\tfn@footnotetablecount\relax%
- \advance\@tempcnta by -1%
+ \advance\@tempcnta by -1\relax%
\xdef\tfn@footnotetablecount{\the\@tempcnta}%
}
@@ -266,9 +171,9 @@
\newcommand{\tfn@updateHyper}{%
% The code of this command is partly from the
% hyperref package by Heiko Oberdiek, 2011/10/01, v6.82j.
- % Newer versions of that package are available at CTAN.
+ % Newer versions of that package are available at CTAN.org.
\global\let\Hy@saved@currentHref\@currentHref%
- \tfnhrf%
+ \tfn@hyperfootnotes{\hyper@makecurrent{Hfootnote}}{}%
\global\let\Hy@footnote@currentHref\@currentHref%
\global\let\@currentHref\Hy@saved@currentHref%
}
@@ -277,13 +182,28 @@
\ifx\tfn@footnotetableprint\tfn@footnotezero%
% This is the first footnotetext after the (sideways)table.
\addtocounter{footnote}{\tfn@footnotetablecount}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrg\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{%
+ \addtocounter{Hfootnote}{\tfn@footnotetablecount}}{}%
+ \tfn@updateHyper%
+ }{}%
\fi%
\addtocounter{footnote}{+1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{+1}}{}%
+ \tfn@updateHyper%
+ }{}%
\ifx\tfn@swt\tfn@footnotezero%
- \ifthenelse{\isempty{#1}}{\footnotetext{#2}}{%
- \ltx@ifpackageloaded{hyperref}{\tfnhri{#1}{#2}}{\footnotetext[#1]{#2}}}%
+ \ifthenelse{\isempty{#1}}%
+ {\footnotetext{#2}}%
+ {\ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \footnotetext[#1]{%
+ \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}#2}%
+ }{\footnotetext[#1]{#2}%
+ }%
+ }{\footnotetext[#1]{#2}}%
+ }%
\else%
\ifx\tfn@footnotetableprint\tfn@footnotezero%
\gdef\tfn@fmpw{\tfn@footmiscparawarn}%
@@ -298,7 +218,7 @@
{\footnotetext{%
\raisebox{\ht\strutbox}{\hypertarget{tfn:\theHfootnote}{}}%
\hbox{\@textsuperscript{\normalfont%
- \hyperlink{tfn:m\theHfootnote}{\thefootnote}}}\thinspace%
+ \hyperlink{tfn:m\theHfootnote}{\thefootnote}}}\thinspace%
\ifx\FootnoteBackref@symbol\empty%
\else\hyperlink{tfn:m\theHfootnote}{\FootnoteBackref@symbol}%
\fi%
@@ -329,24 +249,42 @@
\ifthenelse{\isempty{#1}}%
{\footnotetext{%
\hbox{\@textsuperscript{\normalfont\thefootnote}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhra}{}%
+ \ltx@ifpackageloaded{hyperref}%
+ {\tfn@hyperfootnotes{%
+ \raisebox{\ht\strutbox}{%
+ \hypertarget{tfn:\theHfootnote}{}}}{}%
+ }{}%
\thinspace%
#2}%
- }{\edef\tfn@tfn{\arabic{footnote}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrb{#1}}{\setcounter{footnote}{#1}}%
+ }{%
+ \edef\tfn@tfn{\arabic{footnote}}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\xdef\tfn@thn{\arabic{Hfootnote}}}{}%
+ }{}%
+ \setcounter{footnote}{#1}
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\setcounter{Hfootnote}{#1}}{}%
+ \tfn@updateHyper%
+ }{}%
\footnotetext{%
\hbox{\@textsuperscript{\normalfont #1}}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrc{#1}}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\raisebox{\ht\strutbox}{%
+ \hypertarget{tfn:#1}{}}}{}%
+ }{}%
\thinspace%
#2}%
\setcounter{footnote}{\tfn@tfn}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrd}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\setcounter{Hfootnote}{\tfn@thn}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\fi%
\gdef\tfn@footnotetableprint{1}%
\@tempcnta=\tfn@footnotetablecount\relax%
- \advance\@tempcnta by +1%
+ \advance\@tempcnta by +1\relax%
\xdef\tfn@footnotetablecount{\the\@tempcnta}%
\ifx\tfn@footnotetablecount\tfn@footnotezero% all footnotes placed
\gdef\tfn@footnotetableprint{0}%
@@ -362,18 +300,24 @@
\ifthenelse{\isempty{#1}}{\relax}{%
\ltx@GlobalPrependToMacro{\tfn@tablefootnoteprintout}{%
\addtocounter{footnote}{+1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{+1}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\ltx@GlobalAppendToMacro{\tfn@tablefootnoteprintout}{%
\tfn@footnotetext[#1]{#2}%
\ifthenelse{\isempty{#1}}{\relax}{%
\addtocounter{footnote}{-1}%
- \ltx@ifpackageloaded{hyperref}{\tfnhrj\tfn@updateHyper}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\addtocounter{Hfootnote}{-1}}{}%
+ \tfn@updateHyper%
+ }{}%
}%
}%
\gdef\tfn@fnt{1}%
-}
+ }
\newcommand{\tfn@swtbox}{%
\ifvoid \footins%
@@ -437,7 +381,7 @@
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
@@ -527,10 +471,36 @@
\fi%
}{% else \relax
}
- \ltx@ifpackageloaded{hyperref}{\tfnhrk}{}%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{
+ \ifluatex%
+ \PackageWarningNoLine{tablefootnote}{%
+ LuaTeX and hyperref package 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
+ }%
+ }{% else \relax
+ }%
\ltx@ifpackageloaded{footnotebackref}{%
- \ltx@ifpackageloaded{hyperref}{%
- \tfnhrl%
+ \ltx@ifpackageloaded{hyperref}{%
+ \tfn@hyperfootnotes{\relax}{% else
+ \PackageError{tablefootnote}{%
+ footnotebackref but not hyperfootnotes}{%
+ The footnotebackref package is used\MessageBreak%
+ but the hyperfootnotes option of the hyperref package%
+ \MessageBreak%
+ was set to false.\MessageBreak%
+ Either enable hyperfootnotes or do not use footnotebackref.%
+ \MessageBreak%
+ Loading of the tablefootnote package will be aborted.%
+ }%
+ \endinput%
+ }%
}{\PackageError{tablefootnote}{footnotebackref but not hyperref}{%
The footnotebackref package is used\MessageBreak%
but not the hyperref package.\MessageBreak%
@@ -538,7 +508,7 @@
\MessageBreak%
Loading of the tablefootnote package will be aborted.%
}%
- \endinput
+ \endinput%
}%
}{}
}