new latex package ftnxtra (17oct09)

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

7 files changed, 463 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/ftnxtra/README b/Master/texmf-dist/doc/latex/ftnxtra/README
new file mode 100644
index 00000000000..d55877287d9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/ftnxtra/README
@@ -0,0 +1,13 @@
+_________________
+The ftnxtra package
+v0.1
+
+This package fixes the isuue of footnote inside \caption{},
+tabular environment and \section{} like (\chapter{}, \part{}, \subsection{} and etc) commands.
+
+______________
+Vafa Khalighi
+vafa@users.berlios.de
+
+Copyright 2009
+Distributed under the LaTeX Project Public License
diff --git a/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.dtx b/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.dtx
new file mode 100644
index 00000000000..ec606234ad8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.dtx
@@ -0,0 +1,233 @@
+% \iffalse 
+%<*internal>
+\iffalse
+%</internal>
+%<*readme>
+_________________
+The ftnxtra package
+v0.1
+
+This package fixes the isuue of footnote inside \caption{},
+tabular environment and \section{} like (\chapter{}, \part{}, \subsection{} and etc) commands.
+
+______________
+Vafa Khalighi
+vafa@users.berlios.de
+
+Copyright 2009
+Distributed under the LaTeX Project Public License
+%</readme>
+%<*internal>
+\fi
+\begingroup
+%</internal>
+%<*batchfile>
+\input docstrip.tex
+\keepsilent
+\preamble
+
+  __________________________________
+  Copyright (C) 2009  Vafa Khalighi
+
+  License information appended.
+
+
+\endpreamble
+\postamble
+
+Copyright (C) 2009 by Vafa Khalighi <vafa@users.berlios.de>
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status) 
+by Vafa Khalighi.
+
+This work consists of the file  ftnxtra.dtx
+          and the derived files ftnxtra.sty,
+                                ftnxtra.ins, and
+                                ftnxtra.pdf.
+
+\endpostamble
+\askforoverwritefalse
+\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
+%</batchfile>
+%<batchfile>\endbatchfile
+%<*internal>
+\generate{\file{\jobname.ins}{\from{\jobname.dtx}{batchfile}}}
+\nopreamble\nopostamble
+\generate{\file{README.txt}{\from{\jobname.dtx}{readme}}}
+\endgroup
+\immediate\write18{mv README.txt README}
+\immediate\write18{makeindex -s gind.ist -o \jobname.ind  \jobname.idx}
+\immediate\write18{makeindex -s gglo.ist -o \jobname.gls  \jobname.glo}
+%</internal>
+%
+%<*driver>
+\documentclass{ltxdoc}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\OnlyDescription
+\begin{document}
+  \DocInput{\jobname.dtx}
+\end{document}
+%</driver>
+%
+%
+% \fi
+%
+% \GetFileInfo{\jobname.sty}
+% \CheckSum{0}
+% \makeatletter
+%
+% \title{The \textsf{ftnxtra} package}
+% \author{Vafa Khalighi}
+%
+%
+% \StopEventually{}
+%
+% \part{\textsf{\jobname} implementation}
+%\iffalse
+%<*package>
+%\fi
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ftnxtra}%
+[2009/10/18 footnote fixes for standard LaTeX]
+\newtoks\ftnxtra@p@ftn
+\let\FN@sf@@footnote\footnote
+\def\footnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\edef\FN@sf@gobble@opt{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@opt \endcsname}
+\expandafter\def\csname FN@sf@gobble@opt \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@twobracket
+    \@gobble
+}
+\def\FN@sf@gobble@twobracket[#1]#2{}
+\let\FN@sf@@footnotemark\footnotemark
+\def\footnotemark{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnotemark
+  \else
+    \expandafter\FN@sf@gobble@optonly
+  \fi
+}
+\edef\FN@sf@gobble@optonly{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@optonly \endcsname}
+\expandafter\def\csname FN@sf@gobble@optonly \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@bracket
+    {}%
+}
+\def\FN@sf@gobble@bracket[#1]{}
+\def\@tabular{%
+   \leavevmode \hbox \bgroup
+   \let\@footnotetext\ftnxtra@p@ftntext
+   $\let\@acol\@tabacol
+   \let\@classz\@tabclassz
+   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+\def\endtabular{\crcr\egroup
+                 \egroup $\egroup
+                 \the\ftnxtra@p@ftn
+                 \global\ftnxtra@p@ftn{}%
+                 }
+\long\def\ftnxtra@p@ftntext#1{%
+  \edef\@tempy{\the\ftnxtra@p@ftn\noexpand\footnotetext[\the\c@footnote]}%
+  \global\ftnxtra@p@ftn\expandafter{\@tempy{#1}}}%
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \fi
+           \if \reserved@a t%
+             \@setfpsbit \tw@
+           \fi
+           \if \reserved@a b%
+             \@setfpsbit 4%
+           \fi
+           \if \reserved@a p%
+             \@setfpsbit 8%
+           \fi
+           \if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \fi
+           }%
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+       \let\@footnotetext\ftnxtra@p@ftntext
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+\def \@endfloatbox{%
+      \par\vskip\z@skip      %% \par\vskip\z@ added 15 Dec 87
+      \@minipagefalse
+      \outer@nobreak
+    \egroup                  %% end of vbox
+    \the\ftnxtra@p@ftn
+    \global\ftnxtra@p@ftn{}%
+  \color@endbox
+}
+%    \end{macrocode}
+%\iffalse
+%</package>
+%\fi
+%
+% \typeout{*************************************************************}
+% \typeout{*}
+% \typeout{* To finish the installation you have to move the following}
+% \typeout{* file into a directory searched by TeX:}
+% \typeout{*}
+% \typeout{* \space\space\space ftnxtra.sty}
+% \typeout{*}
+% \typeout{*************************************************************}
+%
+\endinput
diff --git a/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.ins b/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.ins
new file mode 100644
index 00000000000..81e9b7b02ce
--- /dev/null
+++ b/Master/texmf-dist/source/latex/ftnxtra/ftnxtra.ins
@@ -0,0 +1,61 @@
+%%
+%% This is file `ftnxtra.ins',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ftnxtra.dtx  (with options: `batchfile')
+%% 
+%%   __________________________________
+%%   Copyright (C) 2009  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+%% 
+\input docstrip.tex
+\keepsilent
+\preamble
+
+  __________________________________
+  Copyright (C) 2009  Vafa Khalighi
+
+  License information appended.
+
+\endpreamble
+\postamble
+
+Copyright (C) 2009 by Vafa Khalighi <vafa@users.berlios.de>
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status)
+by Vafa Khalighi.
+
+This work consists of the file  ftnxtra.dtx
+          and the derived files ftnxtra.sty,
+                                ftnxtra.ins, and
+                                ftnxtra.pdf.
+
+\endpostamble
+\askforoverwritefalse
+\generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
+\endbatchfile
+%% 
+%% Copyright (C) 2009 by Vafa Khalighi <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% This work consists of the file  ftnxtra.dtx
+%%           and the derived files ftnxtra.sty,
+%%                                 ftnxtra.ins, and
+%%                                 ftnxtra.pdf.
+%% 
+%%
+%% End of file `ftnxtra.ins'.
diff --git a/Master/texmf-dist/tex/latex/ftnxtra/ftnxtra.sty b/Master/texmf-dist/tex/latex/ftnxtra/ftnxtra.sty
new file mode 100644
index 00000000000..3f31417969d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ftnxtra/ftnxtra.sty
@@ -0,0 +1,153 @@
+%%
+%% This is file `ftnxtra.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ftnxtra.dtx  (with options: `package')
+%% 
+%%   __________________________________
+%%   Copyright (C) 2009  Vafa Khalighi
+%% 
+%%   License information appended.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ftnxtra}%
+[2009/10/18 footnote fixes for standard LaTeX]
+\newtoks\ftnxtra@p@ftn
+\let\FN@sf@@footnote\footnote
+\def\footnote{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnote
+  \else
+    \expandafter\FN@sf@gobble@opt
+  \fi
+}
+\edef\FN@sf@gobble@opt{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@opt \endcsname}
+\expandafter\def\csname FN@sf@gobble@opt \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@twobracket
+    \@gobble
+}
+\def\FN@sf@gobble@twobracket[#1]#2{}
+\let\FN@sf@@footnotemark\footnotemark
+\def\footnotemark{\ifx\protect\@typeset@protect
+    \expandafter\FN@sf@@footnotemark
+  \else
+    \expandafter\FN@sf@gobble@optonly
+  \fi
+}
+\edef\FN@sf@gobble@optonly{\noexpand\protect
+  \expandafter\noexpand\csname FN@sf@gobble@optonly \endcsname}
+\expandafter\def\csname FN@sf@gobble@optonly \endcsname{%
+  \@ifnextchar[%]
+    \FN@sf@gobble@bracket
+    {}%
+}
+\def\FN@sf@gobble@bracket[#1]{}
+\def\@tabular{%
+   \leavevmode \hbox \bgroup
+   \let\@footnotetext\ftnxtra@p@ftntext
+   $\let\@acol\@tabacol
+   \let\@classz\@tabclassz
+   \let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
+\def\endtabular{\crcr\egroup
+                 \egroup $\egroup
+                 \the\ftnxtra@p@ftn
+                 \global\ftnxtra@p@ftn{}%
+                 }
+\long\def\ftnxtra@p@ftntext#1{%
+  \edef\@tempy{\the\ftnxtra@p@ftn\noexpand\footnotetext[\the\c@footnote]}%
+  \global\ftnxtra@p@ftn\expandafter{\@tempy{#1}}}%
+\def\@xfloat #1[#2]{%
+  \@nodocument
+  \def \@captype {#1}%
+   \def \@fps {#2}%
+   \@onelevel@sanitize \@fps
+   \def \reserved@b {!}%
+   \ifx \reserved@b \@fps
+     \@fpsadddefault
+   \else
+     \ifx \@fps \@empty
+       \@fpsadddefault
+     \fi
+   \fi
+   \ifhmode
+     \@bsphack
+     \@floatpenalty -\@Mii
+   \else
+     \@floatpenalty-\@Miii
+   \fi
+  \ifinner
+     \@parmoderr\@floatpenalty\z@
+  \else
+    \@next\@currbox\@freelist
+      {%
+       \@tempcnta \sixt@@n
+       \expandafter \@tfor \expandafter \reserved@a
+         \expandafter :\expandafter =\@fps
+         \do
+          {%
+           \if \reserved@a h%
+             \ifodd \@tempcnta
+             \else
+               \advance \@tempcnta \@ne
+             \fi
+           \fi
+           \if \reserved@a t%
+             \@setfpsbit \tw@
+           \fi
+           \if \reserved@a b%
+             \@setfpsbit 4%
+           \fi
+           \if \reserved@a p%
+             \@setfpsbit 8%
+           \fi
+           \if \reserved@a !%
+             \ifnum \@tempcnta>15
+               \advance\@tempcnta -\sixt@@n\relax
+             \fi
+           \fi
+           }%
+       \@tempcntb \csname ftype@\@captype \endcsname
+       \multiply \@tempcntb \@xxxii
+       \advance \@tempcnta \@tempcntb
+       \global \count\@currbox \@tempcnta
+       }%
+    \@fltovf
+  \fi
+  \global \setbox\@currbox
+    \color@vbox
+      \normalcolor
+      \vbox \bgroup
+       \let\@footnotetext\ftnxtra@p@ftntext
+        \hsize\columnwidth
+        \@parboxrestore
+        \@floatboxreset
+}
+\def \@endfloatbox{%
+      \par\vskip\z@skip      %% \par\vskip\z@ added 15 Dec 87
+      \@minipagefalse
+      \outer@nobreak
+    \egroup                  %% end of vbox
+    \the\ftnxtra@p@ftn
+    \global\ftnxtra@p@ftn{}%
+  \color@endbox
+}
+%% 
+%% Copyright (C) 2009 by Vafa Khalighi <vafa@users.berlios.de>
+%% 
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%% 
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vafa Khalighi.
+%% 
+%% This work consists of the file  ftnxtra.dtx
+%%           and the derived files ftnxtra.sty,
+%%                                 ftnxtra.ins, and
+%%                                 ftnxtra.pdf.
+%% 
+%%
+%% End of file `ftnxtra.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 4c8fa1b2979..6e4da16de74 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -114,7 +114,8 @@ my @WorkingTLP = qw(
           footbib footmisc footnpag forarray forloop formular
           fouridx fourier fouriernc
           fp fpl fragmaster fragments frankenstein free-math-font-survey
-          frenchle fribrief frletter frontespizio fullblck fullpict functan
+          frenchle fribrief frletter frontespizio ftnxtra
+          fullblck fullpict functan
         gaceta galois garrigues gastex gatech-thesis
           gb4e gcard gchords gcite gene-logic
           genmisc genmpage gentle geometry germbib germkorr getfiledate
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 948d75daf4e..bade77f4ca0 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -216,6 +216,7 @@ depend formlett
 depend formular
 depend fragments
 depend frankenstein
+depend ftnxtra
 depend fribrief
 depend fullblck
 depend fullpict
diff --git a/Master/tlpkg/tlpsrc/ftnxtra.tlpsrc b/Master/tlpkg/tlpsrc/ftnxtra.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/ftnxtra.tlpsrc