From 5ba332acfa9f18601a255e177dde19553427ba30 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Jan 2014 21:54:13 +0000 Subject: tablefootnote (27jan14) git-svn-id: svn://tug.org/texlive/trunk@32804 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tablefootnote/tablefootnote.sty | 238 +++++++++------------ 1 file changed, 104 insertions(+), 134 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tablefootnote') 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 @@ -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% }% }{} } -- cgit v1.2.3