1 files changed, 17 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
index e40665308b6..226a9ffbafa 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 % 
-% Copyright (C) 2007 by
+% Copyright (C) 2007, 2010 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 % 
 % This work may be distributed and/or modified under the
@@ -66,6 +66,8 @@
 %
 %<*ignore>
 \begingroup
+  \catcode123=1 %
+  \catcode125=2 %
   \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
@@ -77,7 +79,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: catchfile 2007/11/11 v1.2 Catches the contents of a file (HO)}
+\Msg{* Package: catchfile 2010/03/01 v1.3 Catches the contents of a file (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -88,7 +90,7 @@
 
 This is a generated file.
 
-Copyright (C) 2007 by
+Copyright (C) 2007, 2010 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 
 This work may be distributed and/or modified under the
@@ -128,7 +130,8 @@ and the derived files
   \file{catchfile-test3.tex}{\from{catchfile.dtx}{test3}}%
 }
 
-\obeyspaces
+\catcode32=13\relax% active space
+\let =\space%
 \Msg{************************************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
@@ -155,7 +158,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{catchfile.drv}%
-  [2007/11/11 v1.2 Catches the contents of a file (HO)]%
+  [2010/03/01 v1.3 Catches the contents of a file (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2008/08/11]
 \begin{document}
@@ -185,7 +188,7 @@ and the derived files
 % \GetFileInfo{catchfile.drv}
 %
 % \title{The \xpackage{catchfile} package}
-% \date{2007/11/11 v1.2}
+% \date{2010/03/01 v1.3}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -288,7 +291,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@catchfile.sty\endcsname
 \ProvidesPackage{catchfile}%
-  [2007/11/11 v1.2 Catches the contents of a file (HO)]
+  [2010/03/01 v1.3 Catches the contents of a file (HO)]
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -345,7 +348,7 @@ and the derived files
   \edef\TestMeaning{\meaning\everyeof}%
   \ifx\TestString\TestMeaning
   \else
-    \@PackageErrorNoLine{catchfile}{%
+    \@PackageError{catchfile}{%
       Cannot find e-TeX's \string\everyeof,\MessageBreak
       package loading is aborted%
     }\@ehd
@@ -384,7 +387,7 @@ and the derived files
   \Check\input\input{}%
   \Check\input\@@input{}%
   \Check\pdfprimitive\pdfprimitive\input
-  \@PackageErrorNoLine{%
+  \@PackageError{%
     Cannot find primitive \string\input,\MessageBreak
     package loading is aborted%
   }\@ehd
@@ -621,7 +624,7 @@ and the derived files
 \nofiles
 \listfiles
 \documentclass{minimal}
-\usepackage{catchfile}[2007/11/11]
+\usepackage{catchfile}[2010/03/01]
 \makeatletter
 \def\mysetup{%
   \let\do\@makeother
@@ -870,6 +873,10 @@ and the derived files
 %   \item
 %     Use of package \xpackage{pdftexcmds} for \LuaTeX\ support.
 %   \end{Version}
+%   \begin{Version}{2010/03/01 v1.3}
+%   \item
+%     Fix for unknown \cs{@PackageErrorNoLine}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex