5 files changed, 79 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/fink/NEWS b/Master/texmf-dist/doc/latex/fink/NEWS
index 26aa3b70e32..bb787d7040e 100644
--- a/Master/texmf-dist/doc/latex/fink/NEWS
+++ b/Master/texmf-dist/doc/latex/fink/NEWS
@@ -1,7 +1,7 @@
 			      WHAT'S NEW IN FINK
 
 
-Copyright (C) 2000, 2001, 2002, 2007 Didier Verna
+Copyright (C) 2000, 2001, 2002, 2007, 2008 Didier Verna
 
 This file is part of FiNK.
 
@@ -16,11 +16,18 @@ version 1999/06/01 or later.
 FiNK consists of the files listed in the file `README'.
 
 
+* Version 2.1.1
+===============
+** Fix trailing whitespace in \fink@restore
+reported by Maverick Woo
+** Added some hints about filenames with special characters
+suggested by David P. Goodall
+
 * 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.
+raise my little finger
 
 * Version 2.0
 =============
diff --git a/Master/texmf-dist/doc/latex/fink/THANKS b/Master/texmf-dist/doc/latex/fink/THANKS
new file mode 100644
index 00000000000..ea384b714ff
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fink/THANKS
@@ -0,0 +1,38 @@
+
+				 THANK YOU!
+
+
+Copyright (C) 2008 Didier Verna
+
+This file is part of FiNK.
+
+FiNK may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.1
+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.1 or later is part of all distributions of LaTeX
+version 1999/06/01 or later.
+
+FiNK consists of the files listed in the file `README'.
+
+
+* Contributors
+
+** The following persons have contributed code, bug reports, localization,
+** suggestions, feedback etc:
+
+David P. Goodall, Maverick Woo, Alain Schremmer, Morten Hoegholm, Jim Crumley.
+
+
+* Generous donators
+
+** The following persons have made a donation, bought me a present, taken care
+** of my belly with chocolate or beer etc:
+
+
+
+
+Local Variables:
+mode: outline
+End:
diff --git a/Master/texmf-dist/doc/latex/fink/fink.pdf b/Master/texmf-dist/doc/latex/fink/fink.pdf
index 1ff233eabb6..1f173444d01 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 eec06bcd5b1..2032dbddd1c 100644
--- a/Master/texmf-dist/source/latex/fink/fink.dtx
+++ b/Master/texmf-dist/source/latex/fink/fink.dtx
@@ -63,9 +63,10 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %
-% \newcommand\version{2.1}
-% \newcommand\releasedate{2007/11/14}
-% \newcommand\packagecopyright{Copyright \copyright{} 1999, 2000, 2001, 2002, 2007 Didier Verna}
+% \newcommand\version{2.1.1}
+% \newcommand\releasedate{2008/02/27}
+% \newcommand\packagecopyright{Copyright \copyright{} 1999, 2000, 2001, 2002,
+%   2007, 2008 Didier Verna}
 % \newcommand\auctex{AUC-\TeX}
 % \MakeShortVerb{\|}
 % \date{\today}
@@ -146,8 +147,32 @@
 % syntax (one would have to parse the characters one by one, and I'm not ready
 % to do so\ldots). \fink{} currently does not follow auxiliary files either.
 %
+% \section{Hints, Tricks, Tips}
+%
+% \subsection{File names with special characters}
+% Here, ``special'' is to be taken in the \LaTeX{} sense, for instance, a
+% directory or file name containing an underscore. If this situation occurs,
+% you're likely to face problems with \fink{} macros because they don't try to
+% properly escape those characters. So for instance, an underscore alone will
+% make \LaTeX{} think that you forgot the math mode |$| sign before it. There
+% are actually two problems that you may encounter:
+% \begin{description}
+% \item[Characters not displayed properly] Try to change your font encoding by
+%   putting this in your document's preamble: |\usepackage[T1]{fontenc}|.
+% \item[Compilation breakage] The |url| package might be of some help here.
+%   Put |\usepackage{url}| in your document's preamble first. Then (assuming
+%   that |\finkfile| is the culprit), instead of using |\finkfile| directly,
+%   use this instead: |\expandafter\url\expandafter{\finkfile}|. You might
+%   also want to play with |\urlstyle| to have your file name displayed in
+%   the font you prefer.
+% \end{description}
+%
 % \section{Changes}
 % \begin{itemize}
+% \item[v2.1.1] Fix trailing whitespace in |\fink@restore|, reported by
+%   Maverick Woo\\
+%   Added some hints about filenames with special characters, suggested by
+%   David P. Goodall
 % \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.
@@ -166,7 +191,7 @@
 % \section{The Code}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fink}[2007/11/14 v2.1
+\ProvidesPackage{fink}[2008/02/27 v2.1.1
                        Keep track of the current filename]
 
 \RequirePackage{kvoptions}
@@ -284,7 +309,7 @@
     \xdef\finkdir{\filename@area}%
     \xdef\finkbase{\filename@base}%
     \xdef\finkext{\filename@ext}%
-    \xdef\finkfile{\fink@file{\finkbase}{\finkext}}
+    \xdef\finkfile{\fink@file{\finkbase}{\finkext}}%
     \xdef\finkpath{\finkdir\finkfile}%
   \endgroup}
 
diff --git a/Master/texmf-dist/tex/latex/fink/fink.sty b/Master/texmf-dist/tex/latex/fink/fink.sty
index 4b763d9e7df..03c6b6e877a 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/11/14 v2.1
+\ProvidesPackage{fink}[2008/02/27 v2.1.1
                        Keep track of the current filename]
 
 \RequirePackage{kvoptions}
@@ -104,7 +104,7 @@
     \xdef\finkdir{\filename@area}%
     \xdef\finkbase{\filename@base}%
     \xdef\finkext{\filename@ext}%
-    \xdef\finkfile{\fink@file{\finkbase}{\finkext}}
+    \xdef\finkfile{\fink@file{\finkbase}{\finkext}}%
     \xdef\finkpath{\finkdir\finkfile}%
   \endgroup}