footmisc 5.5 (16sep09)

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

3 files changed, 36 insertions, 158 deletions

diff --git a/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
index 6a9297ed6a8..b245686fb29 100644
--- a/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
+++ b/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
diff --git a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
index 81cdf956fd8..7bab79b96a9 100644
--- a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
+++ b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
@@ -13,14 +13,14 @@
 %</dtx>
 %<package>\ProvidesPackage{footmisc}%
 %<*!debugins>
-        [2007/06/12 v5.4a
+        [2009/09/15 v5.5
 %</!debugins>
 %<package>     a miscellany of footnote facilities%
 %<*dtx>
                footmisc package source file%
 %</dtx>
 %<*!debugins>
-                   ]% $Id: footmisc.dtx,v 4.20 2005/03/17 13:41:58 rf Exp rf10 $
+                   ]% $Id: footmisc.dtx,v 4.22 2009/09/16 09:22:55 rf10 Exp rf10 $
 %</!debugins>
 %    \end{macrocode}
 %
@@ -65,7 +65,7 @@
 %    \end{macrocode}
 % \fi
 %
-% \CheckSum{1814}
+% \CheckSum{1711}
 %
 % \title{\texttt{footmisc} ---\\
 %        a portmanteau package\\
@@ -442,9 +442,8 @@
 %   However, you \emph{must} load \textsf{setspace} \emph{before}
 %   \textsf{footmisc}.
 % \item[\normalfont\textsf{memoir} class] The class emulates
-%   \textsf{setspace}, but there may be problems with that emulation.
-%   If this happens, \textsf{footmisc} may produce warning messages:
-%   please notify the author of \textsf{footmisc} about such warnings.
+%   \textsf{setspace}, and we detect that emulation and deal with it
+%   in the same way as \textsf{setspace}.
 % \item[\normalfont\textsf{hyperref}] The \textsf{hyperref} package
 %   has ambitions to make hyperlinks from footnote marks to the
 %   corresponding footnote body; naturally this causes grief to
@@ -1087,7 +1086,8 @@
 %
 % \subsection{The requirements of \cs{@footnotetext}}
 %
-% \begin{macro}{\ifFN@setspace}
+% \begin{macro}{\ifFN@baselinestretch}
+% \begin{macro}{\FN@singlespace}
 % Whatever we do, we are going to patch \cs{@footnotetext}; so first
 % of all, we'll check it's not been hacked by anyone other than
 % \texttt{setspace.sty} (while we're at it we also record whether
@@ -1097,91 +1097,23 @@
 \newif\ifFN@setspace
 \@ifpackageloaded{setspace}{%
   \FN@setspacetrue
-%   \@ifundefined{setspace@singlespace}{%
-%     \@ifclassloaded{memoir}{%
-%       @ifundefined{m@m@singlespace}{%
-%         \PackageWarning{footmisc}{Memoir class setspace problem
-% 				  \MessageBreak
-% 				  see footmisc documentation}%
-%       }{%
-% 	\let\setspace@singlespace\m@m@singlespace
-%       }%
-%     }{}%
-%   }{%
-%     \PackageWarning{footmisc}{Setspace package spacing problem
-% 			      \MessageBreak
-% 			      see footmisc documentation}%
-%   }%
-  \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
-    }%
-  }%
-}{%
-  \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
-      }%
-    }%
+  \@ifclassloaded{memoir}{%
+%    \end{macrocode}
+% we're seeing \textsf{memoir}'s emulation of \textsf{setspace}
+%    \begin{macrocode}
+    \let\FN@baselinestretch\m@m@singlespace
   }{%
-    \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
-          }
 %    \end{macrocode}
-%
-% \noindent (The 1997/06/01 \LaTeX{} source really doesn't have a
-% comment mark after that closing brace.)
+% we're seeing \textsf{setspace} in its own right
 %    \begin{macrocode}
-        \color@endgroup
-      }%
-    }%
+    \let\FN@baselinestretch\setspace@singlespace
   }%
+}{%
+  \FN@setspacefalse
 }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % There's substantial patching to be done if we're doing paragraph
 % footnotes:
@@ -1193,7 +1125,7 @@
 % insert compatibility code with |setspace.sty| if necessary
 %    \begin{macrocode}
       \ifFN@setspace
-        \def\baselinestretch {\setspace@singlespace}%
+        \let\baselinestretch\FN@baselinestretch
       \fi
       \reset@font\footnotesize
       \interlinepenalty\interfootnotelinepenalty
@@ -1256,7 +1188,7 @@
 % insert compatibility code with |setspace.sty| if necessary
 %    \begin{macrocode}
         \ifFN@setspace
-          \def\baselinestretch {\setspace@singlespace}%
+          \let\baselinestretch\FN@baselinestretch
         \fi
         \reset@font\footnotesize
         \protected@edef\@currentlabel{%
@@ -1274,10 +1206,10 @@
     \renewcommand\@footnotetext[1]{%
       \insert\footins{%
 %    \end{macrocode}
-% insert compatibility code with |setspace.sty| if necessary
+% insert compatibility code with \textsf{setspace} if necessary
 %    \begin{macrocode}
         \ifFN@setspace
-          \def\baselinestretch {\setspace@singlespace}%
+          \let\baselinestretch\FN@baselinestretch
         \fi
         \reset@font\footnotesize
         \interlinepenalty\interfootnotelinepenalty
@@ -1813,7 +1745,8 @@
 %    \end{macrocode}
 %
 % use the width of the box to set up hanging (potentially for more
-% than one paragraph) 
+% than one paragraph); note that the hanging \cs{parskip} and
+% \cs{parindent} are set \emph{after} we've executed \cs{leavevmode}(!)
 %    \begin{macrocode}
       \leftmargin\wd\@tempboxa
       \rightmargin\z@
@@ -1821,8 +1754,6 @@
       \advance \linewidth -\leftmargin
       \parshape \@ne \leftmargin \linewidth
       \footnotesize
-      \parskip\hangfootparskip\relax
-      \parindent\hangfootparindent\relax
 %    \end{macrocode}
 %
 % stop the \cs{parshape} being overwritten:
@@ -1834,6 +1765,8 @@
 %    \begin{macrocode}
       \leavevmode
       \llap{\box\@tempboxa}%
+      \parskip\hangfootparskip\relax
+      \parindent\hangfootparindent\relax
     \else
 %    \end{macrocode}
 %
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