From 5949618821cfe384176ae1a4a7a032a3f6e7ee30 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Nov 2011 00:10:43 +0000 Subject: tablefootnote (21nov11) git-svn-id: svn://tug.org/texlive/trunk@24651 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tablefootnote/tablefootnote.sty | 106 ++++++++++++++------- 1 file changed, 72 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty b/Master/texmf-dist/tex/latex/tablefootnote/tablefootnote.sty index 470650c6c2c..3643a8ed83c 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/06 v1.0c +%% Version: 2011/11/19 v1.0d %% %% Copyright (C) 2011 by %% H.-Martin M"unch @@ -40,38 +40,52 @@ %% tablefootnote-example.tex, tablefootnote-example.pdf. %% \NeedsTeXFormat{LaTeX2e}[2011/06/27] -\ProvidesPackage{tablefootnote}[2011/11/06 v1.0c +\ProvidesPackage{tablefootnote}[2011/11/19 v1.0d Table foot notes (HMM)] -%% Provides the \tablefootnoteote{...} command +%% Provides the \tablefootnote{...} command %% for footnotes in (sideways)tables. -\RequirePackage{ltxcmds}[2011/04/18]% v1.20 +\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 +%% (if they are not already the most recent version). \@ifpackageloaded{rotating}{% \gdef\tfn@rotating{1} - \@ifpackagelater{rotating}{2009/03/28}% v2.16a + \@ifpackagelater{rotating}{2009/03/28}% v2.16a {% >= 2009/03/28, OK }{% else \PackageWarningNoLine{tablefootnote}{% - It is required version\MessageBreak - 2009/03/28 v2.16a (or later) of package rotating,\MessageBreak - but only version\MessageBreak - `\csname ver@rotating.sty\endcsname'\MessageBreak + It is required version\MessageBreak% + 2009/03/28 v2.16a (or later) of package rotating,\MessageBreak% + but only version\MessageBreak% + `\csname ver@rotating.sty\endcsname'\MessageBreak% is available}% }% - \RequirePackage{amstext}[2000/06/29]% v2.01 - \RequirePackage{setspace}[2000/12/01]% v6.7 - \RequirePackage{subcaption}[2011/09/12]% v1.1b + \@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}% } -%% tablefootnote may work with earlier versions of LaTeX and those -%% packages, but this was not tested. Please consider updating -%% your LaTeX and packages to the most recent version -%% (if they are not already the most recent version). - \def\tfn@footnotetablecount{0} \def\tfn@footnotetableprint{0} \def\tfn@footnotezero{0} @@ -80,11 +94,22 @@ \newcommand{\tfn@footnotemarks}{% \footnotemark% - \count255=\tfn@footnotetablecount \relax% - \count255=\numexpr \count255 - 1 \relax% - \xdef\tfn@footnotetablecount{\the\count255}% + \@tempcnta=\tfn@footnotetablecount% + \advance\@tempcnta by -1% + \xdef\tfn@footnotetablecount{\the\@tempcnta}% } +\newcommand{\tfn@footmiscparawarn}{% + \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% + }% + \fi% + } + \newcommand{\tfn@footnotetext}[1]{% \ifx\tfn@footnotetableprint\tfn@footnotezero% % This is the first footnotetext after the (sideways)table. @@ -104,15 +129,17 @@ \global\let\Hy@footnote@currentHref\@currentHref% \global\let\@currentHref\Hy@saved@currentHref% % End of code form the hyperref package - }{}% + }{}% else \relax \ifx\tfn@swt\tfn@footnotezero% \footnotetext{#1}% \else% - \footnotetext{${}^{\text{\textup{\thefootnote}}}$\thinspace #1}% + \ltx@ifpackageloaded{footmisc}{\tfn@footmiscparawarn}{\relax}% + \footnotetext{\hbox {\@textsuperscript {\normalfont \thefootnote % + }}\thinspace #1}% \fi% - \count255=\tfn@footnotetablecount \relax% - \count255=\numexpr \count255 + 1 \relax% - \xdef\tfn@footnotetablecount{\the\count255}% + \@tempcnta=\tfn@footnotetablecount% + \advance\@tempcnta by +1% + \xdef\tfn@footnotetablecount{\the\@tempcnta}% \ifx\tfn@footnotetablecount\tfn@footnotezero% all footnotes placed \gdef\tfn@footnotetableprint{0}% \global\let\tfn@tablefootnoteprintout\relax% brute force @@ -130,10 +157,8 @@ } \newcommand{\tfn@swtbox}{% -\vspace{0.8cm}% -\begin{spacing}{0.1}% -\subcaptionbox*{}[\linewidth][l]{\tfn@tablefootnoteprintout}% -\end{spacing}% +\vspace{2\baselineskip}% +\parbox[b][][t]{\linewidth}{\raggedright \tfn@tablefootnoteprintout}% } \IfFileExists{etoolbox.sty}{% @@ -154,7 +179,7 @@ \gdef\tfn@swt{0}% \gdef\tfn@fnt{0}% }% - }{}% + }{}% else \relax }{% \PackageWarning{tablefootnote}{% Package etoolbox not available, therefore\MessageBreak% @@ -224,14 +249,27 @@ \ltx@ifpackageloaded{rotating}{% \ifx\tfn@rotating\tfn@footnotezero% \PackageError{tablefootnote}{% - Package rotating loaded after package tablefootnote}{% + Package rotating loaded after tablefootnote}{% When using both the rotating and the tablefootnote package,% \MessageBreak% - the rotating package must be loaded before the tablefootnote% - package!% + the rotating package MUST be loaded before the tablefootnote% + \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% + }{}% + }{}% } \endinput -- cgit v1.2.3