tablefootnote (28nov11)

git-svn-id: svn://tug.org/texlive/trunk@24681 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 33 insertions, 42 deletions

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'.