oberdiek (12apr11)

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

1 files changed, 62 insertions, 50 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty
index 818af148638..72647e3ad65 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty
@@ -30,21 +30,24 @@
 %% 
 %% This work consists of the main source file embedfile.dtx
 %% and the derived files
-%%    embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv,
-%%    \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty,
-%%    embedfile-example-plain.tex,
+%%    embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, \immediate \write 18 {mkdir -p texmf/,}\edef {texmf/,}
+%%    dtx-attach.sty, embedfile-example-plain.tex,
 %%    embedfile-example-collection.tex, embedfile-test1.tex,
 %%    embedfile-test2.tex, embedfile-test3.tex,
 %%    embedfile-test4.tex.
 %% 
-\begingroup
-  \catcode44 12 % ,
-  \catcode45 12 % -
-  \catcode46 12 % .
-  \catcode58 12 % :
-  \catcode64 11 % @
-  \catcode123 1 % {
-  \catcode125 2 % }
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+  \catcode13=5 % ^^M
+  \endlinechar=13 %
+  \catcode35=6 % #
+  \catcode39=12 % '
+  \catcode44=12 % ,
+  \catcode45=12 % -
+  \catcode46=12 % .
+  \catcode58=12 % :
+  \catcode64=11 % @
+  \catcode123=1 % {
+  \catcode125=2 % }
   \expandafter\let\expandafter\x\csname ver@embedfile.sty\endcsname
   \ifx\x\relax % plain-TeX, first loading
   \else
@@ -52,7 +55,6 @@
     \ifx\x\empty % LaTeX, first loading,
       % variable is initialized, but \ProvidesPackage not yet seen
     \else
-      \catcode35 6 % #
       \expandafter\ifx\csname PackageInfo\endcsname\relax
         \def\x#1#2{%
           \immediate\write-1{Package #1 Info: #2.}%
@@ -64,21 +66,24 @@
       \aftergroup\endinput
     \fi
   \fi
-\endgroup
-\begingroup
-  \catcode35 6 % #
-  \catcode40 12 % (
-  \catcode41 12 % )
-  \catcode44 12 % ,
-  \catcode45 12 % -
-  \catcode46 12 % .
-  \catcode47 12 % /
-  \catcode58 12 % :
-  \catcode64 11 % @
-  \catcode91 12 % [
-  \catcode93 12 % ]
-  \catcode123 1 % {
-  \catcode125 2 % }
+\endgroup%
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+  \catcode13=5 % ^^M
+  \endlinechar=13 %
+  \catcode35=6 % #
+  \catcode39=12 % '
+  \catcode40=12 % (
+  \catcode41=12 % )
+  \catcode44=12 % ,
+  \catcode45=12 % -
+  \catcode46=12 % .
+  \catcode47=12 % /
+  \catcode58=12 % :
+  \catcode64=11 % @
+  \catcode91=12 % [
+  \catcode93=12 % ]
+  \catcode123=1 % {
+  \catcode125=2 % }
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
     \def\x#1#2#3[#4]{\endgroup
       \immediate\write-1{Package: #3 #4}%
@@ -97,29 +102,38 @@
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2010/03/01 v2.5 embed files into PDF (HO)]
-\begingroup
-  \catcode123 1 % {
-  \catcode125 2 % }
+  [2010/03/01 v2.5 embed files into PDF (HO)]%
+\begingroup\catcode61\catcode48\catcode32=10\relax%
+  \catcode13=5 % ^^M
+  \endlinechar=13 %
+  \catcode123=1 % {
+  \catcode125=2 % }
+  \catcode64=11 % @
   \def\x{\endgroup
     \expandafter\edef\csname EmFi@AtEnd\endcsname{%
-      \catcode35 \the\catcode35\relax
-      \catcode64 \the\catcode64\relax
-      \catcode123 \the\catcode123\relax
-      \catcode125 \the\catcode125\relax
+      \endlinechar=\the\endlinechar\relax
+      \catcode13=\the\catcode13\relax
+      \catcode32=\the\catcode32\relax
+      \catcode35=\the\catcode35\relax
+      \catcode61=\the\catcode61\relax
+      \catcode64=\the\catcode64\relax
+      \catcode123=\the\catcode123\relax
+      \catcode125=\the\catcode125\relax
     }%
   }%
-\x
-\catcode35 6 % #
-\catcode64 11 % @
-\catcode123 1 % {
-\catcode125 2 % }
+\x\catcode61\catcode48\catcode32=10\relax%
+\catcode13=5 % ^^M
+\endlinechar=13 %
+\catcode35=6 % #
+\catcode64=11 % @
+\catcode123=1 % {
+\catcode125=2 % }
 \def\TMP@EnsureCode#1#2{%
   \edef\EmFi@AtEnd{%
     \EmFi@AtEnd
-    \catcode#1 \the\catcode#1\relax
+    \catcode#1=\the\catcode#1\relax
   }%
-  \catcode#1 #2\relax
+  \catcode#1=#2\relax
 }
 \TMP@EnsureCode{39}{12}% '
 \TMP@EnsureCode{40}{12}% (
@@ -129,11 +143,11 @@
 \TMP@EnsureCode{47}{12}% /
 \TMP@EnsureCode{58}{12}% :
 \TMP@EnsureCode{60}{12}% <
-\TMP@EnsureCode{61}{12}% =
 \TMP@EnsureCode{62}{12}% >
 \TMP@EnsureCode{91}{12}% [
 \TMP@EnsureCode{93}{12}% ]
 \TMP@EnsureCode{96}{12}% `
+\edef\EmFi@AtEnd{\EmFi@AtEnd\noexpand\endinput}
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \def\EmFi@RequirePackage#1[#2]{%
@@ -155,9 +169,8 @@
     Currently other drivers are not supported. %
     Package loading is aborted.%
   }%
-  \EmFi@AtEnd
-  \expandafter\endinput
-\fi
+  \expandafter\EmFi@AtEnd
+\fi%
 \EmFi@RequirePackage{pdftexcmds}[2007/11/11]
 \EmFi@RequirePackage{ltxcmds}[2010/03/01]
 \EmFi@RequirePackage{kvsetkeys}[2010/03/01]
@@ -169,9 +182,8 @@
   }{%
     At least version 1.30 is necessary. Package loading is aborted.%
   }%
-  \EmFi@AtEnd
-  \expandafter\endinput
-\fi
+  \expandafter\EmFi@AtEnd
+\fi%
 \EmFi@RequirePackage{pdfescape}[2007/11/11]
 \def\EmFi@temp#1{%
   \expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}%
@@ -735,7 +747,7 @@
 \else
   \AtEndDocument{\embedfilefinish}%
 \fi
-\EmFi@AtEnd
+\EmFi@AtEnd%
 \endinput
 %%
 %% End of file `embedfile.sty'.