filecontents (31may18)

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

5 files changed, 17 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/filecontents/README b/Master/texmf-dist/doc/latex/filecontents/README
index 3b7b94c9ec4..4c62bef6267 100644
--- a/Master/texmf-dist/doc/latex/filecontents/README
+++ b/Master/texmf-dist/doc/latex/filecontents/README
@@ -36,7 +36,7 @@ information on installing packages.
 Copyright and license
 ---------------------
 
-Copyright (C) 2011 Scott Pakin, scott+fc@pakin.org
+Copyright (C) 2018 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.3c of this
diff --git a/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf b/Master/texmf-dist/doc/latex/filecontents/filecontents.pdf
index e75a2b7fad3..a2340ef3453 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 a342cc92638..0fc96c45a10 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2011 Scott Pakin <scott+fc@pakin.org>
+% Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
 % -------------------------------------------------------
 %
 % This package may be distributed and/or modified under the
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{filecontents}
 %<*package>
-    [2011/10/08 v1.3 Create an external file from within a LaTeX document]
+    [2018/05/30 v1.4 Create an external file from within a LaTeX document]
 %</package>
 %
 %<*driver>
@@ -38,7 +38,7 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-% \CheckSum{175}
+% \CheckSum{184}
 %
 % \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
@@ -61,7 +61,7 @@
 % \title{The \textsf{filecontents} package\thanks{This file
 %         has version number \fileversion, last
 %         revised \filedate.}}
-% \author{Scott Pakin\\scott+fc@pakin.org}
+% \author{Scott Pakin \\ \textit{scott+fc@pakin.org}}
 % \maketitle
 %
 % \changes{v1.0}{2001/07/31}{Initial version}
@@ -352,13 +352,17 @@
     ^^M}%
 %    \end{macrocode}
 %
+% \changes{v1.4}{2018/05/30}{Update definitions of
+%   \string\texttt{\string\^{}\string\^{}L} and
+%   \string\texttt{\string\^{}\string\^{}I} for compatibility with the
+%   2018-04-01 \string\LaTeX\ release}
 %    \begin{macrocode}
   \catcode`\^^L\active%
   \let\L\@undefined%
-  \def^^L{\@ifundefined L^^J^^J^^J}%
+  \def^^L{\expandafter\ifx\csname L\endcsname\relax\fi ^^J^^J}%
   \catcode`\^^I\active%
   \let\I\@undefined%
-  \def^^I{\@ifundefined I\space\space}%
+  \def^^I{\expandafter\ifx\csname I\endcsname\relax\fi\space}%
   \catcode`\^^M\active%
   \edef^^M##1^^M{%
     \noexpand\reserved@b##1\E\E\relax}}%
diff --git a/Master/texmf-dist/source/latex/filecontents/filecontents.ins b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
index 6738fe42f2d..6471069dcf5 100644
--- a/Master/texmf-dist/source/latex/filecontents/filecontents.ins
+++ b/Master/texmf-dist/source/latex/filecontents/filecontents.ins
@@ -3,7 +3,7 @@
 %% driver files from the doc files in this package when run through
 %% LaTeX or TeX.
 %%
-%% Copyright (C) 2011 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
 %% -------------------------------------------------------
 %%
 %% This package may be distributed and/or modified under the conditions
@@ -28,7 +28,7 @@
 
 This is a generated file.
 
-Copyright (C) 2011 Scott Pakin <scott+fc@pakin.org>
+Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
 -------------------------------------------------------
 
 This package may be distributed and/or modified under the conditions
diff --git a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
index 191f19e50fa..a8190ab6eca 100644
--- a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
+++ b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2011 Scott Pakin <scott+fc@pakin.org>
+%% Copyright (C) 2018 Scott Pakin <scott+fc@pakin.org>
 %% -------------------------------------------------------
 %% 
 %% This package may be distributed and/or modified under the conditions
@@ -23,7 +23,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{filecontents}
-    [2011/10/08 v1.3 Create an external file from within a LaTeX document]
+    [2018/05/30 v1.4 Create an external file from within a LaTeX document]
 \begingroup%
 \catcode`\*=11 %
 \catcode`\^^M\active%
@@ -83,10 +83,10 @@
     ^^M}%
   \catcode`\^^L\active%
   \let\L\@undefined%
-  \def^^L{\@ifundefined L^^J^^J^^J}%
+  \def^^L{\expandafter\ifx\csname L\endcsname\relax\fi ^^J^^J}%
   \catcode`\^^I\active%
   \let\I\@undefined%
-  \def^^I{\@ifundefined I\space\space}%
+  \def^^I{\expandafter\ifx\csname I\endcsname\relax\fi\space}%
   \catcode`\^^M\active%
   \edef^^M##1^^M{%
     \noexpand\reserved@b##1\E\E\relax}}%