4 files changed, 37 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/fink/NEWS b/Master/texmf-dist/doc/latex/fink/NEWS
index 38272faf78b..26aa3b70e32 100644
--- a/Master/texmf-dist/doc/latex/fink/NEWS
+++ b/Master/texmf-dist/doc/latex/fink/NEWS
@@ -16,6 +16,12 @@ version 1999/06/01 or later.
 FiNK consists of the files listed in the file `README'.
 
 
+* Version 2.1
+=============
+** Fix bug preventing expansion in math mode
+reported by Alain Schremmer, fixed by Morten Hoegholm before I could even
+raise my little finger.
+
 * Version 2.0
 =============
 ** New macros \finkdir, \finkbase, \finkext and \finkpath
diff --git a/Master/texmf-dist/doc/latex/fink/fink.pdf b/Master/texmf-dist/doc/latex/fink/fink.pdf
index d0c32367102..1ff233eabb6 100644
--- a/Master/texmf-dist/doc/latex/fink/fink.pdf
+++ b/Master/texmf-dist/doc/latex/fink/fink.pdf
diff --git a/Master/texmf-dist/source/latex/fink/fink.dtx b/Master/texmf-dist/source/latex/fink/fink.dtx
index 0c74adfb7e6..eec06bcd5b1 100644
--- a/Master/texmf-dist/source/latex/fink/fink.dtx
+++ b/Master/texmf-dist/source/latex/fink/fink.dtx
@@ -46,7 +46,7 @@
 % \fi
 %
 % \catcode`\Ą=14
-% ^^A\CheckSum{152}
+% \CheckSum{153}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -63,18 +63,18 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %
-% \newcommand{\version}{2.0}
-% \newcommand{\releasedate}{2007/06/11}
-% \newcommand{\packagecopyright}{Copyright \copyright{} 1999, 2000, 2001, 2002, 2007 Didier Verna}
-% \newcommand{\auctex}{AUC-\TeX}
+% \newcommand\version{2.1}
+% \newcommand\releasedate{2007/11/14}
+% \newcommand\packagecopyright{Copyright \copyright{} 1999, 2000, 2001, 2002, 2007 Didier Verna}
+% \newcommand\auctex{AUC-\TeX}
 % \MakeShortVerb{\|}
 % \date{\today}
-% \title{\fink{} -- the \LaTeXe{} \textbf{Fi}le \textbf{N}ame \textbf{K}eeper
-% \thanks{This document describes \fink{} \version, release date
-% \releasedate.}}
+% \title{\fink{} -- the \LaTeXe{} \textbf{Fi}le \textbf{N}ame
+%   \textbf{K}eeper\thanks{This document describes \fink{} \version, release
+%     date \releasedate.}}
 % \author{Didier Verna\\
-% \texttt{mailto:didier@lrde.epita.fr}\\
-% \texttt{http://www.lrde.epita.fr/\~{}didier/}}
+%   \texttt{mailto:didier@lrde.epita.fr}\\
+%   \texttt{http://www.lrde.epita.fr/\~{}didier/}}
 % \maketitle
 %
 % \section{Description}
@@ -148,6 +148,9 @@
 %
 % \section{Changes}
 % \begin{itemize}
+% \item[v2.1] Fix bug preventing expansion in math mode, reported by Alain
+%   Schremmer, fixed by Morten Hoegholm before I could even raise my little
+%   finger.
 % \item[v2.0] New macros |\finkdir|, |\finkbase|, |\finkext| and |\finkpath|
 %   suggested by Alain Schremmer\\
 %   New options |mainext| and |maindir|, use |kvoptions| for options
@@ -163,7 +166,7 @@
 % \section{The Code}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fink}[2007/06/11 2.0
+\ProvidesPackage{fink}[2007/11/14 v2.1
                        Keep track of the current filename]
 
 \RequirePackage{kvoptions}
@@ -245,7 +248,8 @@
 % \end{macro}
 %    \begin{macrocode}
 \newcommand*\fink@prepare[1]{%
-  {\filename@parse{#1}%
+  \begingroup%
+    \filename@parse{#1}%
     \xdef\fink@nextdir{%
       \ifx\filename@area\@empty%
         \fnk@maindir%
@@ -255,7 +259,8 @@
     \xdef\fink@nextbase{\filename@base}%
     \xdef\fink@nextext{\ifx\filename@ext\relax tex\else\filename@ext\fi}%
     \xdef\fink@nextfile{\fink@file{\fink@nextbase}{\fink@nextext}}%
-    \xdef\fink@nextpath{\fink@nextdir\fink@nextfile}}}
+    \xdef\fink@nextpath{\fink@nextdir\fink@nextfile}%
+  \endgroup}
 
 %    \end{macrocode}
 % \begin{macro}{\fink@input}
@@ -274,12 +279,14 @@
   \xdef\finkpath{\fink@nextpath}%
   \@@input\@filef@und}
 \newcommand*\fink@restore[1]{%
-  {\filename@parse{#1}%
+  \begingroup%
+    \filename@parse{#1}%
     \xdef\finkdir{\filename@area}%
     \xdef\finkbase{\filename@base}%
     \xdef\finkext{\filename@ext}%
     \xdef\finkfile{\fink@file{\finkbase}{\finkext}}
-    \xdef\finkpath{\finkdir\finkfile}}}
+    \xdef\finkpath{\finkdir\finkfile}%
+  \endgroup}
 
 %    \end{macrocode}
 % Note: in earlier versions, we redefined |\IfFileExists| to prepare the
diff --git a/Master/texmf-dist/tex/latex/fink/fink.sty b/Master/texmf-dist/tex/latex/fink/fink.sty
index b628b16d57d..4b763d9e7df 100644
--- a/Master/texmf-dist/tex/latex/fink/fink.sty
+++ b/Master/texmf-dist/tex/latex/fink/fink.sty
@@ -38,7 +38,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fink}[2007/06/11 2.0
+\ProvidesPackage{fink}[2007/11/14 v2.1
                        Keep track of the current filename]
 
 \RequirePackage{kvoptions}
@@ -77,7 +77,8 @@
 \PackageInfo{FiNK}{main file set to "\finkpath"}
 
 \newcommand*\fink@prepare[1]{%
-  {\filename@parse{#1}%
+  \begingroup%
+    \filename@parse{#1}%
     \xdef\fink@nextdir{%
       \ifx\filename@area\@empty%
         \fnk@maindir%
@@ -87,7 +88,8 @@
     \xdef\fink@nextbase{\filename@base}%
     \xdef\fink@nextext{\ifx\filename@ext\relax tex\else\filename@ext\fi}%
     \xdef\fink@nextfile{\fink@file{\fink@nextbase}{\fink@nextext}}%
-    \xdef\fink@nextpath{\fink@nextdir\fink@nextfile}}}
+    \xdef\fink@nextpath{\fink@nextdir\fink@nextfile}%
+  \endgroup}
 
 \newcommand*\fink@input{%
   \xdef\finkdir{\fink@nextdir}%
@@ -97,12 +99,14 @@
   \xdef\finkpath{\fink@nextpath}%
   \@@input\@filef@und}
 \newcommand*\fink@restore[1]{%
-  {\filename@parse{#1}%
+  \begingroup%
+    \filename@parse{#1}%
     \xdef\finkdir{\filename@area}%
     \xdef\finkbase{\filename@base}%
     \xdef\finkext{\filename@ext}%
     \xdef\finkfile{\fink@file{\finkbase}{\finkext}}
-    \xdef\finkpath{\finkdir\finkfile}}}
+    \xdef\finkpath{\finkdir\finkfile}%
+  \endgroup}
 
 \long\def\InputIfFileExists#1#2{%
   \IfFileExists{#1}{%