summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-09-16 00:07:34 +0000
committerKarl Berry <karl@freefriends.org>2007-09-16 00:07:34 +0000
commitd85f248e3b38ea0ecda38c5340e3cadd08d65346 (patch)
tree52e17f32b395006895b3917bc7729c7ac1514ae3 /Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
parent2389552f283181e0d8c610037712ade989112da3 (diff)
oberdiek update (14sep07)
git-svn-id: svn://tug.org/texlive/trunk@4947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/oberdiek/catchfile.sty')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/catchfile.sty44
1 files changed, 25 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index a71b8678285..20b21707ce4 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -25,7 +25,8 @@
%% This work consists of the main source file catchfile.dtx
%% and the derived files
%% catchfile.sty, catchfile.pdf, catchfile.ins, catchfile.drv,
-%% catchfile-test1.tex, catchfile-test2.tex.
+%% catchfile-test1.tex, catchfile-test2.tex,
+%% catchfile-test3.tex.
%%
\begingroup
\catcode44 12 % ,
@@ -79,27 +80,30 @@
\fi
\expandafter\x\csname ver@catchfile.sty\endcsname
\ProvidesPackage{catchfile}%
- [2007/05/30 v1.0 Catches the contents of a file (HO)]
-\expandafter\edef\csname CatchFile@End\endcsname{%
- \catcode44 \the\catcode44\relax % ,
- \catcode45 \the\catcode45\relax % -
- \catcode46 \the\catcode46\relax % .
- \catcode61 \the\catcode61\relax % =
- \catcode64 \the\catcode64\relax % @
- \catcode96 \the\catcode96\relax % `
- \noexpand\endinput
+ [2007/09/09 v1.1 Catches the contents of a file (HO)]
+\expandafter\edef\csname CatchFile@AtEnd\endcsname{%
+ \catcode64 \the\catcode64\relax
}
-\catcode44 12 % ,
-\catcode45 12 % -
-\catcode46 12 % .
-\catcode61 12 % =
\catcode64 11 % @
-\catcode96 12 % `
+\def\TMP@EnsureCode#1#2{%
+ \edef\CatchFile@AtEnd{%
+ \CatchFile@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{96}{12}% `
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
\else
- \RequirePackage{infwarerr}%
+ \RequirePackage{infwarerr}[2007/09/09]%
\fi
\begingroup
\escapechar=92\relax
@@ -112,7 +116,8 @@
package loading is aborted%
}\@ehd
\endgroup
- \expandafter\CatchFile@End
+ \CatchFile@AtEnd
+ \expandafter\endinput
\fi
\endgroup
\begingroup
@@ -135,7 +140,8 @@
package loading is aborted%
}\@ehd
\csname endgroup\endcsname
- \CatchFile@End
+ \CatchFile@AtEnd
+ \endinput
\endgroup
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname IfFileExists\endcsname\relax
@@ -226,7 +232,7 @@
\lowercase{\endgroup
\def\CatchFile@EOF{AB}%
}
-\CatchFile@End
+\CatchFile@AtEnd
\endinput
%%
%% End of file `catchfile.sty'.