summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/embedfile.sty')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/embedfile.sty59
1 files changed, 39 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
index 833c0c2215f..25e7b2c9ef2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty
@@ -45,6 +45,9 @@
\fi
\fi
\else
+ \catcode35 6 % #
+ \catcode123 1 % {
+ \catcode125 2 % }
\expandafter\ifx\csname PackageInfo\endcsname\relax
\def\x#1#2{%
\immediate\write-1{Package #1 Info: #2.}%
@@ -58,6 +61,7 @@
\fi
\endgroup
\begingroup
+ \catcode35 6 % #
\catcode40 12 % (
\catcode41 12 % )
\catcode44 12 % ,
@@ -66,6 +70,8 @@
\catcode47 12 % /
\catcode58 12 % :
\catcode64 11 % @
+ \catcode123 1 % {
+ \catcode125 2 % }
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
\def\x#1#2#3[#4]{\endgroup
\immediate\write-1{Package: #3 #4}%
@@ -81,11 +87,23 @@
\fi
\expandafter\x\csname ver@embedfile.sty\endcsname
\ProvidesPackage{embedfile}%
- [2007/10/29 v2.1 embed files into PDF (HO)]
-\expandafter\edef\csname EmFi@AtEnd\endcsname{%
- \catcode64 \the\catcode64\relax
-}
+ [2007/11/11 v2.2 embed files into PDF (HO)]
+\begingroup
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \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
+ }%
+ }%
+\x
+\catcode35 6 % #
\catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
\def\TMP@EnsureCode#1#2{%
\edef\EmFi@AtEnd{%
\EmFi@AtEnd
@@ -130,8 +148,9 @@
\EmFi@AtEnd
\expandafter\endinput
\fi
+\EmFi@RequirePackage{pdftexcmds}[2007/11/11]
\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdffilesize\endcsname\relax
+\expandafter\ifx\csname pdf@filesize\endcsname\relax
\EmFi@Error{%
Unsupported pdfTeX version%
}{%
@@ -140,7 +159,7 @@
\EmFi@AtEnd
\expandafter\endinput
\fi
-\EmFi@RequirePackage{pdfescape}[2007/10/27]
+\EmFi@RequirePackage{pdfescape}[2007/11/11]
\def\EmFi@temp#1{%
\expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}%
}
@@ -369,7 +388,7 @@
\EmFi@convert\EmFi@title\EmFi@title
\xdef\EmFi@schema{%
\EmFi@schema
- /\pdfescapename{\EmFi@key}<<%
+ /\pdf@escapename{\EmFi@key}<<%
/Subtype/%
\ifx\EmFi@type\EmFi@S@date D%
\else\ifx\EmFi@type\EmFi@S@number N%
@@ -448,7 +467,7 @@
\else
\xdef\EmFi@sortkeys{%
\EmFi@sortkeys
- /\pdfescapename{#1}%
+ /\pdf@escapename{#1}%
}%
\ifx\EmFi@sortorders\empty
\global\let\EmFi@sortorders\EmFi@temp
@@ -544,7 +563,7 @@
\global\EmFi@initialfiletrue
\fi
\setkeys{EmFi}{#1}%
- \expandafter\ifx\expandafter\\\pdffilesize{\EmFi@file}\\%
+ \expandafter\ifx\expandafter\\\pdf@filesize{\EmFi@file}\\%
\EmFi@Error{%
File `\EmFi@file' not found%
}{%
@@ -570,12 +589,12 @@
/Type/EmbeddedFile%
\ifx\EmFi@mimetype\empty
\else
- /Subtype/\pdfescapename{\EmFi@mimetype}%
+ /Subtype/\pdf@escapename{\EmFi@mimetype}%
\fi
/Params<<%
- /ModDate(\pdffilemoddate{\EmFi@file})%
- /Size \pdffilesize{\EmFi@file}%
- /CheckSum<\pdfmdfivesum file{\EmFi@file}>%
+ /ModDate(\pdf@filemoddate{\EmFi@file})%
+ /Size \pdf@filesize{\EmFi@file}%
+ /CheckSum<\pdf@filemdfivesum{\EmFi@file}>%
>>%
}file{\EmFi@file}\relax
\EmFi@defobj{EmbeddedFile}%
@@ -584,7 +603,7 @@
/Type/Filespec%
\ifx\EmFi@filesystem\empty
\else
- /FS/\pdfescapename{\EmFi@filesystem}%
+ /FS/\pdf@escapename{\EmFi@filesystem}%
\fi
/F(\EmFi@@filespec)%
\ifx\EmFi@@desc\empty
@@ -611,10 +630,10 @@
\expandafter\ifx\csname EmFi@P@#1\endcsname\relax
\expandafter\ifx\csname EmFi@V@#1\endcsname\relax
\else
- /\pdfescapename{#1}\csname EmFi@V@#1\endcsname
+ /\pdf@escapename{#1}\csname EmFi@V@#1\endcsname
\fi
\else
- /\pdfescapename{#1}<<%
+ /\pdf@escapename{#1}<<%
\expandafter\ifx\csname EmFi@V@#1\endcsname\relax
\else
/D\csname EmFi@V@#1\endcsname
@@ -624,22 +643,22 @@
\fi
}
\def\EmFi@convert#1#2{%
- \ifnum\pdfstrcmp{\EmFi@stringmethod}{psd}=0 %
+ \ifnum\pdf@strcmp{\EmFi@stringmethod}{psd}=0 %
\pdfstringdef\EmFi@temp{#1}%
\let#2\EmFi@temp
\else
- \edef#2{\pdfescapestring{#1}}%
+ \edef#2{\pdf@escapestring{#1}}%
\fi
}
\global\let\EmFi@list\empty
\def\EmFi@add#1#2{%
\begingroup
- \edef\key{\pdfescapehex{#1}}%
+ \edef\key{\pdf@escapehex{#1}}%
\ifx\EmFi@list\empty
\xdef\EmFi@list{\noexpand\do{\key}{#2}}%
\else
\def\do##1##2{%
- \ifnum\pdfstrcmp{##1}{\key}>0 %
+ \ifnum\pdf@strcmp{##1}{\key}>0 %
\edef\x{%
\toks@{%
\the\toks@%