footmisc 5.5 (16sep09)

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

1 files changed, 11 insertions, 66 deletions

diff --git a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
index 06f2874e772..1d4ecf223f7 100644
--- a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
+++ b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
@@ -24,9 +24,9 @@
 %% This is footmisc.dtx, and it's -*-LaTeX-*- text
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{footmisc}%
-        [2007/06/12 v5.4a
+        [2009/09/15 v5.5
      a miscellany of footnote facilities%
-                   ]% $Id: footmisc.dtx,v 4.20 2005/03/17 13:41:58 rf Exp rf10 $
+                   ]% $Id: footmisc.dtx,v 4.21 2009/07/29 09:37:58 rf10 Exp rf10 $
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \newtoks\FN@temptoken
 \providecommand\protected@writeaux{%
@@ -320,74 +320,19 @@
 \newif\ifFN@setspace
 \@ifpackageloaded{setspace}{%
   \FN@setspacetrue
-  \CheckCommand\@footnotetext[1]{%
-    \insert\footins{%
-      \def\baselinestretch {\setspace@singlespace}%
-      \reset@font\footnotesize
-      \interlinepenalty\interfootnotelinepenalty
-      \splittopskip\footnotesep
-      \splitmaxdepth \dp\strutbox
-      \floatingpenalty\@MM
-      \hsize\columnwidth
-      \@parboxrestore
-      \protected@edef\@currentlabel{%
-        \csname p@footnote\endcsname\@thefnmark
-      }%
-      \color@begingroup
-        \@makefntext{\rule\z@\footnotesep
-          \ignorespaces#1\@finalstrut\strutbox
-        }%
-      \color@endgroup
-    }%
+  \@ifclassloaded{memoir}{%
+    \let\FN@baselinestretch\m@m@singlespace
+  }{%
+    \let\FN@baselinestretch\setspace@singlespace
   }%
 }{%
   \FN@setspacefalse
-  \@ifl@t@r\fmtversion{1997/12/01}{%
-    \CheckCommand\@footnotetext[1]{%
-      \insert\footins{%
-        \reset@font\footnotesize
-        \interlinepenalty\interfootnotelinepenalty
-        \splittopskip\footnotesep
-        \splitmaxdepth \dp\strutbox
-        \floatingpenalty\@MM
-        \hsize\columnwidth
-        \@parboxrestore
-        \protected@edef\@currentlabel{%
-          \csname p@footnote\endcsname\@thefnmark
-        }%
-        \color@begingroup
-        \@makefntext{\rule\z@\footnotesep
-          \ignorespaces#1\@finalstrut\strutbox
-        }%
-        \color@endgroup
-      }%
-    }%
-  }{%
-    \CheckCommand\@footnotetext[1]{%
-      \insert\footins{%
-        \reset@font\footnotesize
-        \interlinepenalty\interfootnotelinepenalty
-        \splittopskip\footnotesep
-        \splitmaxdepth \dp\strutbox
-        \floatingpenalty\@MM
-        \hsize\columnwidth
-        \@parboxrestore
-        \protected@edef\@currentlabel
-        {\csname p@footnote\endcsname\@thefnmark}%
-        \color@begingroup
-          \@makefntext{\rule\z@\footnotesep
-            \ignorespaces#1\@finalstrut\strutbox
-          }
-        \color@endgroup
-      }%
-    }%
-  }%
 }
 \ifFN@para
   \renewcommand\@footnotetext[1]{%
     \insert\footins{%
       \ifFN@setspace
-        \def\baselinestretch {\setspace@singlespace}%
+        \let\baselinestretch\FN@baselinestretch
       \fi
       \reset@font\footnotesize
       \interlinepenalty\interfootnotelinepenalty
@@ -421,7 +366,7 @@
     \renewcommand\@footnotetext[1]{%
       \marginpar{%
         \ifFN@setspace
-          \def\baselinestretch {\setspace@singlespace}%
+          \let\baselinestretch\FN@baselinestretch
         \fi
         \reset@font\footnotesize
         \protected@edef\@currentlabel{%
@@ -439,7 +384,7 @@
     \renewcommand\@footnotetext[1]{%
       \insert\footins{%
         \ifFN@setspace
-          \def\baselinestretch {\setspace@singlespace}%
+          \let\baselinestretch\FN@baselinestretch
         \fi
         \reset@font\footnotesize
         \interlinepenalty\interfootnotelinepenalty
@@ -675,11 +620,11 @@
       \advance \linewidth -\leftmargin
       \parshape \@ne \leftmargin \linewidth
       \footnotesize
-      \parskip\hangfootparskip\relax
-      \parindent\hangfootparindent\relax
       \@setpar{{\@@par}}%
       \leavevmode
       \llap{\box\@tempboxa}%
+      \parskip\hangfootparskip\relax
+      \parindent\hangfootparindent\relax
     \else
       \parindent1em
       \noindent