6 files changed, 62 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/attachfile/README b/Master/texmf-dist/doc/latex/attachfile/README
index 82c25210a41..4ca81b1effc 100644
--- a/Master/texmf-dist/doc/latex/attachfile/README
+++ b/Master/texmf-dist/doc/latex/attachfile/README
@@ -46,6 +46,5 @@ pdflatex attachfile.dtx  <== Merges index + change log into the documentation
 pdflatex attachfile.dtx  <== Produces final version of attachfile.pdf
 
 Note that attachfile comes with pre-built documentation (PDF format,
-U.S. letter-sized paper, 25 pages), so you really need to perform only
-the first step above unless you're unhappy with the documentation as
-provided.
+U.S. letter-sized paper), so you really need to perform only the first
+step above unless you're unhappy with the documentation as provided.
diff --git a/Master/texmf-dist/doc/latex/attachfile/attachfile.pdf b/Master/texmf-dist/doc/latex/attachfile/attachfile.pdf
index fc5d1ebb2db..e45ffb666f5 100644
--- a/Master/texmf-dist/doc/latex/attachfile/attachfile.pdf
+++ b/Master/texmf-dist/doc/latex/attachfile/attachfile.pdf
diff --git a/Master/texmf-dist/source/latex/attachfile/attachfile.bib b/Master/texmf-dist/source/latex/attachfile/attachfile.bib
deleted file mode 100644
index 6afbbe0be15..00000000000
--- a/Master/texmf-dist/source/latex/attachfile/attachfile.bib
+++ /dev/null
@@ -1,31 +0,0 @@
-@Book{PDFRef,
-  author =	 {{Adobe Systems Incorporated}},
-  title = 	 {{PDF} Reference Version~1.6},
-  publisher = 	 {Adobe Press},
-  year = 	 2004,
-  key =		 {PDF},
-  edition =	 {Fifth},
-  month =	 dec # {~3,},
-  note =	 {ISBN~\mbox{0321304748}.  Available from \url{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}}
-}
-
-@Unpublished{MediaTypes,
-  author = 	 {{Internet Assigned Numbers Authority}},
-  title =	 {{MIME} Media Types},
-  note =	 {Available from \url{http://www.iana.org/assignments/media-types/}},
-  key =		 {IANA}
-}
-
-@TechReport{Freed1996,
-  author = 	 {N. Freed and N. Borenstein},
-  title = 	 {{M}ultipurpose {I}nternet {M}ail {E}xtensions {(MIME)}
-                  Part Two: Media Types},
-  institution =  {Internet Engineering Task Force (IETF),
-                  Network Working Group},
-  year = 	 1996,
-  type =	 {Request for Comments (RFC)},
-  number =	 2046,
-  month =	 nov,
-  note =	 {Available from
-                  \url{http://www.rfc-editor.org/rfc/rfc2046.txt}}
-}
diff --git a/Master/texmf-dist/source/latex/attachfile/attachfile.dtx b/Master/texmf-dist/source/latex/attachfile/attachfile.dtx
index fae747cc855..51870e52b79 100644
--- a/Master/texmf-dist/source/latex/attachfile/attachfile.dtx
+++ b/Master/texmf-dist/source/latex/attachfile/attachfile.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{attachfile}
 %<*package>
-    [2010/08/14 v1.4 PDF 1.3+ file attachment]
+    [2010/09/14 v1.5a PDF 1.3+ file attachment]
 %</package>
 %
 %<*driver>
@@ -41,7 +41,50 @@
 %</driver>
 % \fi
 %
-% \CheckSum{485}
+% \changes{v1.5a}{2010/09/14}{Modified the package to generate
+%   \texttt{attachfile.bib} automatically from the \texttt{.dtx}
+%   and \texttt{.ins} files}
+% \iffalse
+%<*attachment>
+@Book{PDFRef,
+  author =       {{Adobe Systems Incorporated}},
+  title =        {{PDF} Reference Version~1.6},
+  publisher =    {Adobe Press},
+  year =         2004,
+  key =          {PDF},
+  edition =      {Fifth},
+  month =        dec # {~3,},
+  note =         {ISBN~\mbox{0321304748}.  Available from \url{http://partners.adobe.com/public/developer/en/pdf/PDFReference16.pdf}}
+}
+
+@Unpublished{MediaTypes,
+  author =       {{Internet Assigned Numbers Authority}},
+  title =        {{MIME} Media Types},
+  note =         {Available from \url{http://www.iana.org/assignments/media-types/}},
+  key =          {IANA}
+}
+
+@TechReport{Freed1996,
+  author =       {N. Freed and N. Borenstein},
+  title =        {{M}ultipurpose {I}nternet {M}ail {E}xtensions {(MIME)}
+                  Part Two: Media Types},
+  institution =  {Internet Engineering Task Force (IETF),
+                  Network Working Group},
+  year =         1996,
+  type =         {Request for Comments (RFC)},
+  number =       2046,
+  month =        nov,
+  note =         {Available from
+                  \url{http://www.rfc-editor.org/rfc/rfc2046.txt}}
+}
+%</attachment>
+% \fi
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \CheckSum{489}
 %
 % \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
@@ -1147,7 +1190,7 @@
 % |\atfi@set@appearance| stores its argument as a \acronym{PDF}
 % \pdfname{XObject} for later referral by the file annotation's
 % appearance dictionary.  This serves two purposes:
-% 
+%
 % \begin{enumerate}
 %   \item It enables a \tex\ box with arbitrary contents to serve as the
 %     file attachment icon.
@@ -1664,11 +1707,16 @@
 % |\atfi@attachfile|.  |\attachfile| merely sets up the category codes
 % in such a way as to allow filenames to contain special characters such
 % as underscores.
+% \changes{v1.5}{2010/08/27}{Reset ``\texttt{\char`\\}''
+%   to category code~0 to enable the use of
+%   \texttt{\string\string\string\jobname} in the name of the file
+%   attachment (suggested by Felix Mueller-Sarnowski)}
 %    \begin{macrocode}
 \DeclareRobustCommand{\attachfile}[1][]{%
   \begingroup
     \let\do\@makeother
     \dospecials
+    \catcode`\\=0\relax
     \catcode`\{=1\relax
     \catcode`\}=2\relax
     \atfi@attachfile{#1}%
@@ -1808,5 +1856,9 @@
 \fi
 %    \end{macrocode}
 %
+% \iffalse
+%</package>
+% \fi
+%
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/attachfile/attachfile.ins b/Master/texmf-dist/source/latex/attachfile/attachfile.ins
index 66575decc8a..ecdac280fbe 100644
--- a/Master/texmf-dist/source/latex/attachfile/attachfile.ins
+++ b/Master/texmf-dist/source/latex/attachfile/attachfile.ins
@@ -44,6 +44,9 @@ LaTeX version 2006/05/20 or later.
 \endpreamble
 
 \generate{\file{attachfile.sty}{\from{attachfile.dtx}{package}}}
+\nopreamble
+\nopostamble
+\generate{\file{attachfile.bib}{\from{attachfile.dtx}{attachment}}}
 
 \obeyspaces
 \Msg{******************************************************}
diff --git a/Master/texmf-dist/tex/latex/attachfile/attachfile.sty b/Master/texmf-dist/tex/latex/attachfile/attachfile.sty
index 3d37cb34bb6..d60499363f5 100644
--- a/Master/texmf-dist/tex/latex/attachfile/attachfile.sty
+++ b/Master/texmf-dist/tex/latex/attachfile/attachfile.sty
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{attachfile}
-    [2010/08/14 v1.4 PDF 1.3+ file attachment]
+    [2010/09/14 v1.5a PDF 1.3+ file attachment]
 \RequirePackage{ifpdf}
 \ifpdf
 \else
@@ -333,6 +333,7 @@
   \begingroup
     \let\do\@makeother
     \dospecials
+    \catcode`\\=0\relax
     \catcode`\{=1\relax
     \catcode`\}=2\relax
     \atfi@attachfile{#1}%