summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/footmisc/README9
-rw-r--r--Master/texmf-dist/doc/latex/footmisc/footmisc.pdfbin328650 -> 215367 bytes
-rw-r--r--Master/texmf-dist/source/latex/footmisc/footmisc.dtx377
-rw-r--r--Master/texmf-dist/source/latex/footmisc/footmisc.ins28
-rw-r--r--Master/texmf-dist/tex/latex/footmisc/footmisc.sty229
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
6 files changed, 512 insertions, 133 deletions
diff --git a/Master/texmf-dist/doc/latex/footmisc/README b/Master/texmf-dist/doc/latex/footmisc/README
new file mode 100644
index 00000000000..f513bc4a720
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/footmisc/README
@@ -0,0 +1,9 @@
+This package is long-established and widely used. It derives from
+several pieces of work done in pre-LaTeX 2e days by other authors;
+over the years, there is none of that basis that I have not developed
+and/or improved.
+
+A .tds.zip file is available on CTAN.
+
+Robin Fairbairns
+rf10<snail-shape>cam.ac.uk
diff --git a/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf b/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
index dca8b295f43..6a9297ed6a8 100644
--- a/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
+++ b/Master/texmf-dist/doc/latex/footmisc/footmisc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/footmisc/footmisc.dtx b/Master/texmf-dist/source/latex/footmisc/footmisc.dtx
index 64da416c137..81cdf956fd8 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>
- [2005/03/17 v5.3d
+ [2007/06/12 v5.4a
%</!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 rf $
+ ]% $Id: footmisc.dtx,v 4.20 2005/03/17 13:41:58 rf Exp rf10 $
%</!debugins>
% \end{macrocode}
%
@@ -65,7 +65,7 @@
% \end{macrocode}
% \fi
%
-% \CheckSum{1559}
+% \CheckSum{1814}
%
% \title{\texttt{footmisc} ---\\
% a portmanteau package\\
@@ -74,27 +74,33 @@
% \author{Robin Fairbairns\thanks{University of Cambridge Computer
% Laboratory, William Gates Building, J.\,J. Thompson Avenue,
% Cambridge, CB2 0FD, UK
-% (\texttt{rf10<at>cam.ac.uk})}}
+% (\texttt{rf10<snail-shape>cam.ac.uk})}}
% \maketitle
%
-% \section*{Support}
-%
-% Some support of this package is available \emph{for unchanged copies
-% of the package} via email to me at the address given in the
-% footnote. Support will remain available at least as long as the
-% address remains valid. I don't guarantee anything, but I will
-% probably look at any bug reports you may submit, and may correct
-% problems reported (either in my code or in yours\dots).
-%
% \section*{Copyright statement}
%
% \noindent Program: \texttt{footmisc.dtx}\par
% \noindent Copyright 1995 1996 1998 1999 2001--2003 Robin Fairbairns
%
-% This program may redistributed and/or modified under the terms
-% of the LaTeX Project Public License in file \texttt{lppl.txt}
-% (available from CTAN directory \texttt{macros/latex/base}; either
-% version 1.2 of the License, or (at your option) any later version.
+% This program is offered under the terms
+% of the LaTeX Project Public License, 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.
+%
+% This work has the LPPL maintenance status `author-maintained'.
+%
+% \section*{History}
+%
+% This package originated as support of a personal project, which i
+% was switching to \LaTeX{} 2e over the Christmas holiday period of
+% 1993, using the first \ensuremath{\beta} release.
+%
+% In its first form, it was known as the ``footnote'' package, but by
+% the time I had released it to CTAN, that name had already been
+% used by a package written by Mark Wooding. So the package is now
+% known (as you can see) as ``footmisc''.
%
% \section{User interface~--- package options}
%
@@ -145,7 +151,7 @@
% with the algorithm for \texttt{para} footnotes on very wide pages
% (for example, those used by the \textsf{a0poster} class). Recent
% \LaTeX{} installations use an improved technique that is believed
-% not to be susceptible to this problem.i
+% not to be susceptible to this problem.
%
% \subsection{Option \texttt{side}}
%
@@ -177,18 +183,20 @@
%
% If you want to use some special effect other than ragged right, feel
% free to change \cs{footnotelayout} yourself: some intriguing (and
-% completely undesirable) results are no doubt available. The
-% \texttt{ragged} option simply sets \cs{footnotelayout} to
-% \cs{raggedright}. (Hint: if you intend to use the \textsf{ragged2e}
-% package, load it before \textsf{footmisc}~--- if \textsf{footmisc}
-% finds \cs{RaggedRight} available, it uses it in place of
-% \cs{raggedright}.)
+% completely undesirable) results are no doubt available. Change the
+% setting simply by use of
+% \cs{renewcommand}\cs{footnotelayout}\texttt{\dots}\@. The
+% \texttt{ragged} option simply sets \cs{footnotelayout} to set
+% \cs{raggedright} or \cs{RaggedRight} as appropriate. (If you intend
+% to use the \textsf{ragged2e} package, load it before
+% \textsf{footmisc}~--- if \textsf{footmisc} finds \cs{RaggedRight} is
+% available, it automatically uses it in place of \cs{raggedright}.)
%
% \subsection{Option \texttt{symbol}}
%
-% This option simply establishes that footnotes are ``labelled'' by
+% This option simply establishes that footnotes are `labelled' by
% a symbol sequence. The command used is equivalent to that
-% suggested in \LaTeX{} manuals such as Lamport's )the job performed
+% suggested in \LaTeX{} manuals such as Lamport's (the job performed
% by the option is very simple, and doesn't really need a package).
%
% Using symbols to `number' your footnotes can be problematic: there
@@ -250,7 +258,7 @@
% \texttt{wiley} & $*\,\mathop{**}\,\dagger\,\ddagger\,\S\,\P\,\|$
% \end{tabular}
% \end{center}
-% together with a version of Lamport's original set that (with doubled
+% together with a version of Lamport's original set that, with doubled
% versions of $\S$ and $\P$, and tripled versions of everything but
% the vertical bars, provides a symbol range to cover counters up to
% 16.
@@ -303,17 +311,19 @@
% so, the paragraphs will be separated by the vertical space specified
% by \cs{hangfootparskip}, and the second and subsequent paragraphs
% are indented by \cs{hangfootparindent}. Default values are:
-%
-% \leavevmode\begin{tabular}{ll}
+% \begin{center}
+% \begin{tabular}{ll}
% \cs{hangfootparskip} & 0.5\cs{baselineskip} \\
% \cs{hangfootparindent} & 0em
% \end{tabular}
-% The user may redefine these values (using \cs{renewcommand}): it is
-% best to use the font-size-dependent measures (multiples of
-% \cs{baselineskip} for the skip, multiples of |em| for the indent).
-% Note that the default has only one of the two values non-zero; both
-% zero may result in easily-missed paragraph breaks, and both non-zero
-% is not generally thought to be a good-looking option.
+% \end{center}
+% The user may redefine these values (using
+% \cs{renewcommand}): it is best to use the font-size-dependent
+% measures (multiples of \cs{baselineskip} for the skip, multiples of
+% |em| for the indent). Note that the default has only one of the two
+% values non-zero; both zero may result in easily-missed paragraph
+% breaks, and both non-zero is not generally thought to be a
+% good-looking option.
%
% \subsection{Option \texttt{norule}}
%
@@ -326,12 +336,14 @@
% a split footnote. (Remember that split footnotes don't happen if
% you're doing paragraph footnotes.)
%
-% The option provides three different \cs{footnoterule} commands:\\
+% The option provides three different \cs{footnoterule} commands:
+% \begin{center}
% \begin{tabular}{ll}
% \cs{mpfootnoterule} & for use in minipages \\
% \cs{pagefootnoterule} & for normal footnotes on regular pages \\
% \cs{splitfootnoterule} & for the tail of a split footnote
-% \end{tabular}\\
+% \end{tabular}
+% \end{center}
% By default, \cs{mpfootnoterule} and \cs{pagefootnoterule} retain the
% original definition of \cs{footnoterule} (which nay have been
% modified by a \texttt{norule} option), while \cs{splitfootnoterule}
@@ -425,10 +437,14 @@
% Known interactions are:
% \begin{description}
% \item[\normalfont\textsf{setspace}] The \textsf{setspace} package
-% modifies the line spacing is calculated in footnotes.
+% modifies the way line spacing is calculated in footnotes.
% \textsf{Footmisc} knows about this, and preserves the change.
% 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.
% \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
@@ -607,11 +623,11 @@
% macro. Note detection of the presence of the \textsf{ragged2e}
% package.
% \begin{macrocode}
-\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}}%
}
% \end{macrocode}
% \end{macro}
@@ -827,13 +843,12 @@
% as I can tell make any difference to the semantics of the definition
% we base our patch on.)
% \begin{macrocode}
- \@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
@@ -858,6 +873,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
@@ -886,8 +935,9 @@
}%
\fi
\global\maxdepth\@maxdepth
- }
- }{%
+ }%
+ }%
+ }{%
\CheckCommand*\@makecol{\ifvoid \footins
\setbox\@outputbox \box\@cclv
\else
@@ -914,8 +964,8 @@
}%
\fi
\global\maxdepth\@maxdepth
- }
- }
+ }%
+ }%
}
% \end{macrocode}
%
@@ -1047,6 +1097,21 @@
\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}%
@@ -1954,9 +2019,9 @@
%
% Lamport's choice of symbols for \cs{fnsymbol} wasn't entirely
% ``traditional'', so we (now) provide alternatives. The
-% \cs{setfnsymbol} command offers a small number of choices (perhaps
-% there's a future in letting the user loose here \dots\ can't think
-% of a syntax just now).
+% \cs{setfnsymbol} command offers a small number of choices, and the
+% user may define more still, using the \cs{DefineFNsymbols} or
+% \cs{DefineFNsymbolsTM} commands, defined below.
% \begin{macrocode}
\newcommand\setfnsymbol[1]{%
\@bsphack
@@ -1970,6 +2035,12 @@
}%
\@esphack
}
+% \end{macrocode}
+%
+% The default selection is Lamport's original, as represented in
+% current \LaTeX{}~--- we preserve it in case we need to ``get back''
+% to it.
+% \begin{macrocode}
\let\FN@fnsymbol@lamport\@fnsymbol
%</package>
% \end{macrocode}
@@ -2000,20 +2071,22 @@
% error if the symbol number is too large; otherwise it will quietly
% change to numbering in place of symbol use (a warning is produced at
% the end of the document). The set name is the future argument of
-% \cs{setfnsymbol}). The style (default \texttt{math}) gives the style
-% the symbols are typeset (in principle, the \emph{correct} method is
-% to use |text| more, but not even Lamport's original set for \LaTeX{}
-% \cs{fnsymbol} may be expressed this way. The symbol list is a set
-% of objects to be used when the set is selected.
-%
-% Example of use\,--\,define a replacement for Lamport's original
-% \cs{fnsymbol} command:
+% \cs{setfnsymbol}). The style (default \texttt{text}) gives the style
+% the symbols are typeset (this is the \emph{correct} method, but
+% unfortunately not all symbols, even for Lamport's original set for
+% \LaTeX{} \cs{fnsymbol} may be expressed this way in a sufficiently
+% old \LaTeX{} distribution). The symbol list is a set of objects to
+% be used when the set is selected.
+%
+% Example of use:\par\noindent define a direct replacement for
+% Lamport's original \cs{fnsymbol} command ---
%\begin{verbatim}
-%\DefineFNsymbols*{lamport}{*\dagger\ddagger\mathsection
+%\DefineFNsymbols*{lamport}[math]{*\dagger\ddagger\mathsection
% \mathparagraph\|{**}{\dagger\dagger}{\ddagger\ddagger}%
%}
%\end{verbatim}
-% Note that doubled-up symbols need braces around them.
+% Note that doubled-up (and worse\,---\,see below) symbols need braces
+% around them.
% \begin{macrocode}
\newcommand{\DefineFNsymbols}{%
\@ifstar{\@tempswbtrue\@DefineFNsymbols}%
@@ -2021,7 +2094,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
@@ -2067,6 +2140,78 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\DefineFNsymbolsTM}
+% \begin{macro}{\@DefineFNsymbolsTM}
+% \begin{macro}{\FN@build@symboldefTM}
+%
+% Now do the same job for the ``modern'' way of having both text and
+% maths variants of everything.
+% \begin{macrocode}
+\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
+ }%
+}%
+% \end{macrocode}
+% Note that this version has two variants of every definition, so
+% needs two stopper codes above.
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\TextOrMath}
+% This is a stripped down (e-\TeX{} only) version of what appears in
+% fixltx2e. If the command's already defined, we assume it's that
+% version.
+% \begin{macrocode}
+\@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}%
+ }%
+ }%
+}{}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\FN@orange}
% \begin{macro}{\@fnsymbol@orange}
% \begin{macro}{\@diagnose@fnsymbol@orange}
@@ -2094,7 +2239,20 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+%
+% \begin{macro}{\textbardbl}
+% This is defined in recent \LaTeX{} releases, but not in (for
+% example) that distributed with the last release of te\TeX{}. Since
+% it's needed in some symbol set definitions (including Lamport's) we
+% define it here.
+% \begin{macrocode}
+\@ifundefined{textbardbl}{%
+ \DeclareTextSymbol{\textbardbl}{OMS}{107}%
+ \DeclareTextSymbolDefault{\textbardbl}{TS1}}{}%
+% \end{macrocode}
+% (This definition comes from the \LaTeX{} sources.)
+% \end{macro}
+%
% \begin{macro}{\FN@fnsymbol@bringhurst}
% \begin{macro}{\FN@fnsymbol@chicago}
% \begin{macro}{\FN@fnsymbol@wiley}
@@ -2104,29 +2262,82 @@
% footnote symbols, plus a robust version of the original Lamport set,
% and an extended version of Lamport's original
% \begin{macrocode}
-\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}%
+\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}%
}
-\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}%
+\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}%
}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/footmisc/footmisc.ins b/Master/texmf-dist/source/latex/footmisc/footmisc.ins
index cddb0ef45a6..aace7a9c565 100644
--- a/Master/texmf-dist/source/latex/footmisc/footmisc.ins
+++ b/Master/texmf-dist/source/latex/footmisc/footmisc.ins
@@ -1,12 +1,32 @@
-\def\batchfile{footmisc.ins}
\input docstrip.tex
+
+\preamble
+----------------------------------------------------------------------
+The footmisc package -- variations of footnote typesetting
+Copyright (c) 2008 Robin Fairbairns
+
+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.
+
+This work has the LPPL maintenance status `author-maintained'.
+
+This work consists of the files footmisc.dtx, footmisc.ins, and README
+and the derived files footmisc.sty and footmisc.pdf.
+-----------------------------------------------------------------------
+
+\endpreamble
+
+\def\batchfile{footmisc.ins}
\keepsilent
\Msg{*** Generating the footmisc package ***}
\askforoverwritefalse
\generate{%
\file{footmisc.sty}{\from{footmisc.dtx}{package}}%
}
-
+
\ifToplevel{
\Msg{***********************************************************}
@@ -15,11 +35,11 @@
\Msg{* footmisc.sty into a directory searched by TeX}
\Msg{*}
\Msg{* Usual TDS location:}
-\Msg{* \space\space tex/latex/misc}
+\Msg{* \space\space tex/latex/footmisc}
\Msg{*}
\Msg{* Happy TeXing}
\Msg{*}
\Msg{***********************************************************}
}
-\endinput
+\endbatchfile
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
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 39b49e1776c..822de1d7c17 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -82,7 +82,7 @@ my @WorkingTLP = qw(
flagderiv flippdf float floatrow flowfram fltpoint
fmtcount fnbreak
fncychap foekfont fontch fontspec fonttable fontwrap
- footbib forloop formular
+ footbib footmisc forloop formular
fouridx fourier fouriernc
fp fpl frankenstein free-math-font-survey
frenchle fribrief frletter frontespizio fullpict functan
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 00:48:59 +0000