filecontents update (18mar09)

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

5 files changed, 56 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/latex/filecontents/README b/Master/texmf-dist/doc/latex/filecontents/README
index 7a0aa7970a5..525ff92d3ca 100644
--- a/Master/texmf-dist/doc/latex/filecontents/README
+++ b/Master/texmf-dist/doc/latex/filecontents/README
@@ -36,14 +36,14 @@ information on installing packages.
 Copyright and license
 ---------------------
 
-Copyright (C) 2006 Scott Pakin, scott+fc@pakin.org
+Copyright (C) 2009 Scott Pakin, scott+fc@pakin.org
 
 This package may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3b of this
+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.3b or later is part of all distributions of LaTeX
-version 2006/01/07 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
diff --git a/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf b/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
index 0249ccf3fbb..d2a95e62a45 100644
--- a/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
+++ b/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
diff --git a/Master/texmf-dist/source/latex/filecontents/filecontents.dtx b/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
index 09c421bc605..fcf311f6b1b 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
@@ -1,17 +1,17 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
+% Copyright (C) 2009 Scott Pakin <scott+fc@pakin.org>
 % -------------------------------------------------------
 %
 % This package may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3b
+% 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.3b or later is part of all distributions of LaTeX
-% version 2006/01/07 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008/05/04 or later.
 %
 % \fi
 %
@@ -22,12 +22,11 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{filecontents}
 %<*package>
-    [2006/03/11 v1.1a Create an external file from within a LaTeX document]
+    [2009/03/17 v1.2 Create an external file from within a LaTeX document]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
-\input{filecontents.inc}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -258,14 +257,18 @@
 % flow then always falls through to what used to be the |\ifeof| case
 % (file does not exist; open it), never the |\else| case (file already
 % exists; do nothing).
+% \changes{v1.2}{2009/03/17}{Added percent signs after the
+%   \texttt{\char`\\else} and \texttt{\char`\\fi}
+%   lines as per Heiko Oberdiek's suggestion for getting \textsf{filecontents}
+%   to work with the \textsf{guitar} package}
 %    \begin{macrocode}
   \ifeof\@inputcheck%
     \@latex@warning@no@line%
         {Writing file `\@currdir#1'}%
-  \else
+  \else %
     \@latex@warning@no@line%
         {Overwriting file `\@currdir#1'}%
-  \fi
+  \fi %
 %    \end{macrocode}
 %    \begin{macrocode}
   \chardef\reserved@c15 %
@@ -296,13 +299,16 @@
 % \changes{v1.1}{2004/08/16}{Made it possible for \textsf{filecontents}
 %   to write \mbox{Latin-1} characters as per Harry Schmidt's feature
 %   request and Frank Mittelbach's suggestion of how to implement it.}
+% \changes{v1.2}{2009/03/17}{Added percent signs after each line in
+%   the loop as per Heiko Oberdiek's suggestion for getting
+%   \textsf{filecontents} to work with the \textsf{guitar} package}
 %    \begin{macrocode}
-  \count0=128\relax
-  \loop
-    \catcode\count0=11\relax
-    \advance\count0 by 1\relax
-    \ifnum\count0<256
-  \repeat
+  \count0=128\relax %
+  \loop %
+    \catcode\count0=11\relax %
+    \advance\count0 by 1\relax %
+    \ifnum\count0<256 %
+  \repeat %
 %    \end{macrocode}
 % \stopfcchanges
 %
diff --git a/Master/texmf-dist/source/latex/filecontents/filecontents.ins b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
index 5800b1bfd20..81c9317447b 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.ins
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
@@ -3,18 +3,18 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2009 Scott Pakin <scott+fc@pakin.org>
 %% -------------------------------------------------------
-%% 
+%%
 %% This package may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3b of this
+%% 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.3b or later is part of all distributions of LaTeX 
-%% version 2006/01/07 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% --------------- start of docstrip commands ------------------
 %%
@@ -28,33 +28,35 @@
 
 This is a generated file.
 
-Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
+Copyright (C) 2009 Scott Pakin <scott+fc@pakin.org>
 -------------------------------------------------------
 
 This package may be distributed and/or modified under the conditions
-of the LaTeX Project Public License, either version 1.3b of this
+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.3b or later is part of all distributions of LaTeX
-version 2006/01/07 or later.
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008/05/04 or later.
 
 \endpreamble
 
 \generate{\file{filecontents.sty}{\from{filecontents.dtx}{package}}}
 
 
+\obeyspaces
 \Msg{***********************************************************}
-\Msg{*}
-\Msg{* To finish the installation, you have to move}
-\Msg{* filecontents.sty into a directory searched by TeX.}
-\Msg{*}
-\Msg{* To produce the documentation, run filecontents.dtx}
-\Msg{* through LaTeX.}
-\Msg{*}
-\Msg{* Happy TeXing!}
+\Msg{*                                                         *}
+\Msg{* To finish the installation, you have to move            *}
+\Msg{* filecontents.sty into a directory searched by TeX.      *}
+\Msg{*                                                         *}
+\Msg{* To produce the documentation, run filecontents.dtx      *}
+\Msg{* through LaTeX.                                          *}
+\Msg{*                                                         *}
+\Msg{* Happy TeXing!                                           *}
+\Msg{*                                                         *}
 \Msg{***********************************************************}
 
 \endbatchfile
diff --git a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
index 8936cc18ebc..65c90973603 100644
--- a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
+++ b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
@@ -8,22 +8,22 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2009 Scott Pakin <scott+fc@pakin.org>
 %% -------------------------------------------------------
 %% 
 %% This package may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3b of this
+%% 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.3b or later is part of all distributions of LaTeX
-%% version 2006/01/07 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filecontents}
-    [2006/03/11 v1.1a Create an external file from within a LaTeX document]
+    [2009/03/17 v1.2 Create an external file from within a LaTeX document]
 \begingroup%
 \catcode`\*=11 %
 \catcode`\^^M\active%
@@ -34,10 +34,10 @@
   \ifeof\@inputcheck%
     \@latex@warning@no@line%
         {Writing file `\@currdir#1'}%
-  \else
+  \else %
     \@latex@warning@no@line%
         {Overwriting file `\@currdir#1'}%
-  \fi
+  \fi %
   \chardef\reserved@c15 %
   \ch@ck7\reserved@c\write%
   \immediate\openout\reserved@c#1\relax%
@@ -52,12 +52,12 @@
       \@percentchar\@percentchar}%
   \fi%
   \let\do\@makeother\dospecials%
-  \count0=128\relax
-  \loop
-    \catcode\count0=11\relax
-    \advance\count0 by 1\relax
-    \ifnum\count0<256
-  \repeat
+  \count0=128\relax %
+  \loop %
+    \catcode\count0=11\relax %
+    \advance\count0 by 1\relax %
+    \ifnum\count0<256 %
+  \repeat %
   \edef\E{\@backslashchar end\string{\@currenvir\string}}%
   \edef\reserved@b{%
     \def\noexpand\reserved@b%