footmisc update (16jun08)

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

1 files changed, 184 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
index 35ab7d7a5ca..06f2874e772 100644
--- a/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
+++ b/Master/texmf-dist/tex/latex/footmisc/footmisc.sty
@@ -5,27 +5,28 @@
 %% The original source files were:
 %%
 %% footmisc.dtx  (with options: `package')
+%% ----------------------------------------------------------------------
+%% The footmisc package -- variations of footnote typesetting
+%% Copyright (c) 2008 Robin Fairbairns
 %% 
-%% IMPORTANT NOTICE:
+%% This work may be distributed and/or modified under the conditions of the
+%% LaTeX Project Public License, either version 1.3c of this license or (at
+%% your option) any later version. The latest version of this license is in:
+%% http://www.latex-project.org/lppl.txt, and version 1.3c or later is part
+%% of all distributions of LaTeX version 2005/12/01 or later.
 %% 
-%% For the copyright see the source file.
+%% This work has the LPPL maintenance status `author-maintained'.
 %% 
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from footmisc.sty.
+%% This work consists of the files footmisc.dtx, footmisc.ins, and README
+%% and the derived files footmisc.sty and footmisc.pdf.
+%% -----------------------------------------------------------------------
 %% 
-%% For distribution of the original source see the terms
-%% for copying and modification in the file footmisc.dtx.
-%% 
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
 %% This is footmisc.dtx, and it's -*-LaTeX-*- text
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{footmisc}%
-        [2005/03/17 v5.3d
+        [2007/06/12 v5.4a
      a miscellany of footnote facilities%
-                   ]% $Id: footmisc.dtx,v 4.20 2005/03/17 13:41:58 rf Exp rf $
+                   ]% $Id: footmisc.dtx,v 4.20 2005/03/17 13:41:58 rf Exp rf10 $
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \newtoks\FN@temptoken
 \providecommand\protected@writeaux{%
@@ -68,11 +69,11 @@
     \FN@sidefntrue
   \fi
 }
-\let\footnotelayout\relax
+\let\footnotelayout\@empty
 \DeclareOption{ragged}{%
   \@ifundefined{RaggedRight}%
-    {\def\footnotelayout{\linepenalty50 \raggedright}}%
-    {\def\footnotelayout{\linepenalty50 \RaggedRight}}%
+    {\renewcommand\footnotelayout{\linepenalty50 \raggedright}}%
+    {\renewcommand\footnotelayout{\linepenalty50 \RaggedRight}}%
 }
 \newif\ifFN@perpage
 \FN@perpagefalse
@@ -125,13 +126,12 @@
 \let  \if@tempswa  \ifFN@bottom
 \ifFN@para    \@tempswatrue \fi
 \if@tempswa
-  \@ifl@t@r\fmtversion{2003/12/01}{%
+  \@ifl@t@r\fmtversion{2005/12/01}{%
     \CheckCommand*\@makecol{\ifvoid \footins
         \setbox\@outputbox \box\@cclv
       \else
         \setbox\@outputbox \vbox{%
-          \boxmaxdepth\@maxdepth
-          \@tempdima\dp\@cclv
+          \boxmaxdepth \@maxdepth
           \unvbox\@cclv
           \vskip \skip\footins
           \color@begingroup
@@ -156,6 +156,40 @@
       \global\maxdepth\@maxdepth
     }
   }{%
+  \@ifl@t@r\fmtversion{2003/12/01}{%
+    \CheckCommand*\@makecol{\ifvoid \footins
+        \setbox\@outputbox \box\@cclv
+      \else
+        \setbox\@outputbox \vbox{%
+          \boxmaxdepth\@maxdepth
+          \@tempdima\dp\@cclv
+          \unvbox\@cclv
+          \vskip \skip\footins
+          \color@begingroup
+            \normalcolor
+            \footnoterule
+            \unvbox\footins
+          \color@endgroup
+        }%
+      \fi
+      \let \@elt \relax
+      \xdef\@freelist{\@freelist\@midlist}%
+      \global\let\@midlist\@empty
+      \@combinefloats
+      \ifvbox\@kludgeins
+        \@makespecialcolbox
+      \else
+        \setbox\@outputbox \vbox to\@colht{%
+          \@texttop
+          \dimen@\dp\@outputbox
+          \unvbox\@outputbox
+          \vskip -\dimen@
+          \@textbottom
+        }%
+      \fi
+      \global\maxdepth\@maxdepth
+    }%
+  }{%
     \@ifl@t@r\fmtversion{1999/12/01}{%
       \CheckCommand*\@makecol{\ifvoid \footins
           \setbox\@outputbox \box\@cclv
@@ -184,8 +218,9 @@
           }%
         \fi
         \global\maxdepth\@maxdepth
-      }
-    }{%
+      }%
+    }%
+  }{%
       \CheckCommand*\@makecol{\ifvoid \footins
         \setbox\@outputbox \box\@cclv
       \else
@@ -212,8 +247,8 @@
         }%
       \fi
       \global\maxdepth\@maxdepth
-    }
-  }
+    }%
+  }%
 }
   \ifFN@para
     \FN@temptoken{%
@@ -757,7 +792,7 @@
 }
 \newcommand{\@DefineFNsymbols}[1]{%
   \@ifnextchar[% ]
-    {\@DefineFNsymbols@{#1}}{\@DefineFNsymbols@{#1}[math]}%
+    {\@DefineFNsymbols@{#1}}{\@DefineFNsymbols@{#1}[text]}%
 }
 \def\@DefineFNsymbols@#1[#2]#3{%
   \expandafter\ifx\csname FN@fnsymbol@#1\endcsname\relax
@@ -797,6 +832,54 @@
     \expandafter\FN@build@symboldef
   \fi
 }
+\newcommand{\DefineFNsymbolsTM}{%
+        \@ifstar{\@tempswbtrue\@DefineFNsymbolsTM}%
+                {\@tempswbfalse\@DefineFNsymbolsTM}}%
+\newcommand{\@DefineFNsymbolsTM}[2]{%
+  \expandafter\ifx\csname FN@fnsymbol@#1\endcsname\relax
+    \PackageInfo{footmisc}{Declaring symbol style #1}%
+  \else
+    \PackageWarning{footmisc}{Redeclaring symbol style #1}%
+  \fi
+  \toks@{}%
+  \def\@tempb{\end}%
+  \FN@build@symboldefTM#2\end\@null
+  \expandafter\xdef\csname FN@fnsymbol@#1\endcsname##1{%
+    \noexpand\ifcase##1%
+      \the\toks@
+    \noexpand\else
+      \if@tempswb
+        \noexpand\@ctrerr
+      \else
+        \noexpand\@arabic##1\noexpand\FN@orange##1%
+      \fi
+    \noexpand\fi
+  }%
+}%
+\def\FN@build@symboldefTM#1#2{%
+  \def\@tempa{#1}%
+  \ifx\@tempa\@tempb
+  \else
+    \toks@\expandafter{\the\toks@\or\TextOrMath{#1}{#2}}%
+    \expandafter\FN@build@symboldefTM
+  \fi
+}
+\@ifundefined{TextOrMath}{%
+  \@ifundefined{eTeXversion}{%
+    \PackageError{footmisc}{Can't define commands for footnote symbol}%
+                           {Use e-LaTeX, or load package fixltx2e before
+                             footmisc}%
+  }{%
+    \protected\expandafter\def\csname TextOrMath\space\endcsname{%
+      \ifmmode \expandafter\@secondoftwo
+      \else    \expandafter\@firstoftwo   \fi
+    }
+    \edef\TextOrMath#1#2{%
+      \expandafter\noexpand\csname TextOrMath\space\endcsname
+{#1}{#2}%
+    }%
+  }%
+}{}
 \def\FN@orange#1{%
   \@bsphack
   \PackageInfo{footmisc}{Footnote number \number#1 out of range}%
@@ -814,29 +897,85 @@
     }%
   }%
 }
-\DefineFNsymbols*{bringhurst}{*\dagger\ddagger\S\|\P}%
-\DefineFNsymbols*{chicago}{*\dagger\ddagger\S\|\#}%
-\DefineFNsymbols*{wiley}{*{**}\dagger\ddagger\S\P\|}%
-\DefineFNsymbols{lamport-robust}{*\dagger\ddagger
-  \mathsection\mathparagraph\|%
-  {**}{\dagger\dagger}{\ddagger\ddagger}%
-}
-\DefineFNsymbols*{lamport*}{*\dagger\ddagger
-  \mathsection\mathparagraph\|%
-  {**}{\dagger\dagger}{\ddagger\ddagger}%
-  {\mathsection\mathsection}{\mathparagraph\mathparagraph}%
-  {*{*}*}{\dagger\dagger\dagger}{\ddagger\ddagger\ddagger}%
-  {\mathsection\mathsection\mathsection}%
-  {\mathparagraph\mathparagraph\mathparagraph}%
+\@ifundefined{textbardbl}{%
+  \DeclareTextSymbol{\textbardbl}{OMS}{107}%
+  \DeclareTextSymbolDefault{\textbardbl}{TS1}}{}%
+\DefineFNsymbolsTM*{bringhurst}{%
+  \textasteriskcentered *
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textbardbl    \|%
+  \textparagraph \mathparagraph
+}%
+\DefineFNsymbolsTM*{chicago}{%
+  \textasteriskcentered *
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textbardbl    \|%
+  \#\#%
+}%
+\DefineFNsymbolsTM*{wiley}{
+  \textasteriskcentered *
+  {\textasteriskcentered\textasteriskcentered}{**}%
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textparagraph \mathparagraph
+  \textbardbl    \|%
+}%
+\DefineFNsymbolsTM{lamport-robust}{
+  \textasteriskcentered *
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textparagraph \mathparagraph
+  \textbardbl    \|%
+  {\textasteriskcentered\textasteriskcentered}{**}%
+  {\textdagger\textdagger}{\dagger\dagger}%
+  {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}%
+}
+\DefineFNsymbolsTM*{lamport*}{%
+  \textasteriskcentered *
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textparagraph \mathparagraph
+  \textbardbl    \|%
+  {\textasteriskcentered\textasteriskcentered}{**}%
+  {\textdagger\textdagger}{\dagger\dagger}%
+  {\textdaggerdbl\textdaggerdbl}{\dagger\dagger}%
+  {\textsection\textsection}{\mathsection\mathsection}%
+  {\textparagraph\textparagraph}{\mathparagraph\mathparagraph}%
+  {\textasteriskcentered\textasteriskcentered\textasteriskcentered}{***}%
+  {\textdagger\textdagger\textdagger}{\dagger\dagger\dagger}%
+  {\textdaggerdbl\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger\ddagger}%
+  {\textsection\textsection\textsection}%%
+    {\mathsection\mathsection\mathsection}%
+  {\textparagraph\textparagraph\textparagraph}%%
+    {\mathparagraph\mathparagraph\mathparagraph}%
 }
 \setfnsymbol{lamport*}
-\DefineFNsymbols{lamport*-robust}{*\dagger\ddagger
-  \mathsection\mathparagraph\|%
-  {**}{\dagger\dagger}{\ddagger\ddagger}%
-  {\mathsection\mathsection}{\mathparagraph\mathparagraph}%
-  {*{*}*}{\dagger\dagger\dagger}{\ddagger\ddagger\ddagger}%
-  {\mathsection\mathsection\mathsection}%
-  {\mathparagraph\mathparagraph\mathparagraph}%
+\DefineFNsymbolsTM{lamport*-robust}{%
+  \textasteriskcentered *
+  \textdagger    \dagger
+  \textdaggerdbl \ddagger
+  \textsection   \mathsection
+  \textparagraph \mathparagraph
+  \textbardbl    \|%
+  {\textasteriskcentered\textasteriskcentered}{**}%
+  {\textdagger\textdagger}{\dagger\dagger}%
+  {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}%
+  {\textsection\textsection}{\mathsection\mathsection}%
+  {\textparagraph\textparagraph}{\mathparagraph\mathparagraph}%
+  {\textasteriskcentered\textasteriskcentered\textasteriskcentered}{***}%
+  {\textdagger\textdagger\textdagger}{\dagger\dagger\dagger}%
+  {\textdaggerdbl\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger\ddagger}%
+  {\textsection\textsection\textsection}%%
+    {\mathsection\mathsection\mathsection}%
+  {\textparagraph\textparagraph\textparagraph}%%
+    {\mathparagraph\mathparagraph\mathparagraph}%
 }
 \providecommand*{\footref}[1]{%
   \begingroup