From 9de72d0a6eb200219df4ab55cdf3e4a3b8101dae Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Jan 2014 01:15:59 +0000 Subject: tablefootnote (21jan14) git-svn-id: svn://tug.org/texlive/trunk@32752 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tablefootnote/tablefootnote.sty | 230 +++++++++++---------- 1 file changed, 122 insertions(+), 108 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 4d958b32486..a7217741367 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/08 v1.1a +%% Version: 2014/01/20 v1.1b %% %% Copyright (C) 2011 - 2014 by %% H.-Martin M"unch @@ -42,7 +42,7 @@ %% In memoriam Tommy Muench + 2014/01/02. %% \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{tablefootnote}[2014/01/08 v1.1a +\ProvidesPackage{tablefootnote}[2014/01/20 v1.1b Table foot notes (HMM)] %% Provides the \tablefootnote{...} command %% for footnotes in (sideways)tables. @@ -79,6 +79,111 @@ \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) + +\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}{% + \ifHy@hyperfootnotes% + \hyper@makecurrent{Hfootnote}% + \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}% \ifx\FootnoteBackref@symbol\empty% @@ -134,14 +239,7 @@ {% footnotebackref not loaded }% }% - {\ltx@ifpackageloaded{hyperref}% - {\ifHy@hyperfootnotes% - \hyperlink{tfn:#1}{\footnotemark[#1]}% - \else% - \footnotemark[#1]% - \fi% - }% - {\footnotemark[#1]}% + {\ltx@ifpackageloaded{hyperref}{\tfnhre{#1}}{\footnotemark[#1]}% \ltx@ifpackageloaded{footnotebackref}% {\raisebox{\ht\strutbox}{\hypertarget{tfn:m#1}{}}}% {% footnotebackref not loaded @@ -170,9 +268,7 @@ % hyperref package by Heiko Oberdiek, 2011/10/01, v6.82j. % Newer versions of that package are available at CTAN. \global\let\Hy@saved@currentHref\@currentHref% - \ifHy@hyperfootnotes% - \hyper@makecurrent{Hfootnote}% - \fi% + \tfnhrf% \global\let\Hy@footnote@currentHref\@currentHref% \global\let\@currentHref\Hy@saved@currentHref% } @@ -181,32 +277,13 @@ \ifx\tfn@footnotetableprint\tfn@footnotezero% % This is the first footnotetext after the (sideways)table. \addtocounter{footnote}{\tfn@footnotetablecount}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \addtocounter{Hfootnote}{\tfn@footnotetablecount}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrg\tfn@updateHyper}{}% \fi% \addtocounter{footnote}{+1}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \addtocounter{Hfootnote}{+1}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}% \ifx\tfn@swt\tfn@footnotezero% - \ifthenelse{\isempty{#1}}% - {\footnotetext{#2}}% - {\ltx@ifpackageloaded{hyperref}% - {\ifHy@hyperfootnotes% - \footnotetext[#1]{% - \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}#2}% - \else% - \footnotetext[#1]{#2}% - \fi% - }{\footnotetext[#1]{#2}}% - }% + \ifthenelse{\isempty{#1}}{\footnotetext{#2}}{% + \ltx@ifpackageloaded{hyperref}{\tfnhri{#1}{#2}}{\footnotetext[#1]{#2}}}% \else% \ifx\tfn@footnotetableprint\tfn@footnotezero% \gdef\tfn@fmpw{\tfn@footmiscparawarn}% @@ -252,44 +329,18 @@ \ifthenelse{\isempty{#1}}% {\footnotetext{% \hbox{\@textsuperscript{\normalfont\thefootnote}}% - \ltx@ifpackageloaded{hyperref}% - {\ifHy@hyperfootnotes%% - \raisebox{\ht\strutbox}{% - \hypertarget{tfn:\theHfootnote}{}}% - \fi% - }% - {\relax}% + \ltx@ifpackageloaded{hyperref}{\tfnhra}{}% \thinspace% #2}% }{\edef\tfn@tfn{\arabic{footnote}}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \edef\tfn@thn{\arabic{Hfootnote}}% - \fi% - }{}% else \relax - \setcounter{footnote}{#1} - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \setcounter{Hfootnote}{#1}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrb{#1}}{\setcounter{footnote}{#1}}% \footnotetext{% \hbox{\@textsuperscript{\normalfont #1}}% - \ltx@ifpackageloaded{hyperref}% - {\ifHy@hyperfootnotes% - \raisebox{\ht\strutbox}{\hypertarget{tfn:#1}{}}% - \fi% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrc{#1}}{}% \thinspace% #2}% \setcounter{footnote}{\tfn@tfn}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \setcounter{Hfootnote}{\tfn@thn}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrd}{}% }% }% \fi% @@ -311,24 +362,14 @@ \ifthenelse{\isempty{#1}}{\relax}{% \ltx@GlobalPrependToMacro{\tfn@tablefootnoteprintout}{% \addtocounter{footnote}{+1}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \addtocounter{Hfootnote}{+1}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrh\tfn@updateHyper}{}% }% }% \ltx@GlobalAppendToMacro{\tfn@tablefootnoteprintout}{% \tfn@footnotetext[#1]{#2}% \ifthenelse{\isempty{#1}}{\relax}{% \addtocounter{footnote}{-1}% - \ltx@ifpackageloaded{hyperref}{% - \ifHy@hyperfootnotes% - \addtocounter{Hfootnote}{-1}% - \fi% - \tfn@updateHyper% - }{}% + \ltx@ifpackageloaded{hyperref}{\tfnhrj\tfn@updateHyper}{}% }% }% \gdef\tfn@fnt{1}% @@ -486,37 +527,10 @@ \fi% }{% else \relax } - \ltx@ifpackageloaded{hyperref}{% - \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% - }{% else \relax - }% + \ltx@ifpackageloaded{hyperref}{\tfnhrk}{}% \ltx@ifpackageloaded{footnotebackref}{% - \ltx@ifpackageloaded{hyperref}{ - \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{hyperref}{% + \tfnhrl% }{\PackageError{tablefootnote}{footnotebackref but not hyperref}{% The footnotebackref package is used\MessageBreak% but not the hyperref package.\MessageBreak% -- cgit v1.2.3