diff options
author | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
commit | 55ae6e504d04d806c4c5ac253dedb98196fc1c35 (patch) | |
tree | 5200a08eba158000f26a357a2a54a0923dd189de /Master/texmf-dist/tex | |
parent | a7dfc63af349a5ea5fb37b110f584cc878308ea7 (diff) |
oberdiek update 11/11
git-svn-id: svn://tug.org/texlive/trunk@5458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
81 files changed, 1399 insertions, 349 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index e40fda0fc14..e75b5796f3d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@alphalph.sty\endcsname \ProvidesPackage{alphalph}% [2007/09/09 v2.0 Converting numbers to letters (HO)] -\expandafter\edef\csname AlPh@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AlPh@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\AlPh@AtEnd{% \AlPh@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 3ff4abf7d23..22323890b13 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% [2007/09/09 v1.6 At begin shipout hook (HO)] -\expandafter\edef\csname AtBegShi@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AtBegShi@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\AtBegShi@AtEnd{% \AtBegShi@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty index 664b8e46a12..16927659a5c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2007/09/27 v1.0 Expandable big integer calculations (HO)] -\expandafter\edef\csname BIC@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.1 Expandable big integer calculations (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BIC@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\BIC@AtEnd{% \BIC@AtEnd @@ -100,6 +118,7 @@ \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{43}{12}% + \TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{11}% : (letter!) \TMP@EnsureCode{60}{12}% < @@ -128,7 +147,13 @@ }% \x{ } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \def\BIC@Expand#1{% \romannumeral0% \BIC@@Expand#1!\@nil{}% @@ -160,8 +185,10 @@ \fi \else \def\BIC@Expand#1{% - \pdfunescapehex{% - \expandafter\BIC@StripHexSpace\pdfescapehex{#1}20\@nil + \romannumeral0\expandafter\expandafter\expandafter\BIC@Space + \pdf@unescapehex{% + \expandafter\expandafter\expandafter + \BIC@StripHexSpace\pdf@escapehex{#1}20\@nil }% }% \def\BIC@StripHexSpace#120#2\@nil{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty index 4536394a322..8acfd4d4bb8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty @@ -43,6 +43,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.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,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}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@bitset.sty\endcsname \ProvidesPackage{bitset}% [2007/09/28 v1.0 Data type bit set (HO)] -\expandafter\edef\csname BitSet@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BitSet@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\BitSet@AtEnd{% \BitSet@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index 20b21707ce4..4ee5e898fd6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2007/09/09 v1.1 Catches the contents of a file (HO)] -\expandafter\edef\csname CatchFile@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.2 Catches the contents of a file (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname CatchFile@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\CatchFile@AtEnd{% \CatchFile@AtEnd @@ -145,8 +163,9 @@ \endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\CatchFile@CheckFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -161,7 +180,8 @@ }% \else \def\CatchFile@CheckFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\expandafter\expandafter\ifx + \expandafter\expandafter\expandafter\relax\pdf@filesize{#1}\relax \let\CatchFile@File\relax \else \def\CatchFile@File{#1}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty index 334a7c4bc17..0063472ef1b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@engord.sty\endcsname \ProvidesPackage{engord}% [2007/09/20 v1.6 Provides English ordinal numbers (HO)] -\expandafter\edef\csname EO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname EO@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\EO@AtEnd{% \EO@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty index 1d0c163fa55..0389fbc2ccb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@etexcmds.sty\endcsname \ProvidesPackage{etexcmds}% [2007/09/09 v1.1 Prefix for e-TeX command names (HO)] -\expandafter\edef\csname etexcmds@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname etexcmds@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\etexcmds@AtEnd{% \etexcmds@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index 3823e4329ea..91519efa6f8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/09/09 v1.4 Language checks (HO)] -\expandafter\edef\csname IfLang@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.5 Language checks (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname IfLang@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\IfLang@AtEnd{% \IfLang@AtEnd @@ -141,8 +159,10 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input pdftexcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{pdftexcmds}[2007/11/11]% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname uselanguage\endcsname\relax @@ -199,7 +219,7 @@ \fi } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfstrcmp\endcsname\relax +\expandafter\ifx\csname pdf@strcmp\endcsname\relax \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -249,7 +269,7 @@ }{% \def\IfLanguageName#1{% \ifnum\IfLang@IfDefined{languagename}{% - \pdfstrcmp{#1}{\languagename}% + \pdf@strcmp{#1}{\languagename}% }{1}=0 % \expandafter\@firstoftwo \else diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index e8fc6a89aa6..0631342265c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@ifpdf.sty\endcsname \ProvidesPackage{ifpdf}% [2007/09/09 v1.5 Provides the ifpdf switch (HO)] -\expandafter\edef\csname ifpdf@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifpdf@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\ifpdf@AtEnd{% \ifpdf@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index 08cfc14c54a..a883c678e14 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% [2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO)] -\expandafter\edef\csname ifvtex@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifvtex@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\ifvtex@AtEnd{% \ifvtex@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty index 7458694f251..43ff35f4409 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% [2007/09/09 v1.2 Providing info/warning/message (HO)] -\expandafter\edef\csname InfWarErr@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InfWarErr@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\InfWarErr@AtEnd{% \InfWarErr@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty index 8e1e5d1e860..ce7154b6d26 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@intcalc.sty\endcsname \ProvidesPackage{intcalc}% [2007/09/27 v1.1 Expandable integer calculations (HO)] -\expandafter\edef\csname InCa@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InCa@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\InCa@AtEnd{% \InCa@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index a6b3ae92413..46278fdfc6a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% [2007/09/29 v1.3 Key value parser with default handler support (HO)] -\expandafter\edef\csname KVS@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVS@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\KVS@AtEnd{% \KVS@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index 22de5ac04b1..ef9e7c5fda6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty @@ -43,6 +43,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.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,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}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)] -\expandafter\edef\csname PDFCOL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname PDFCOL@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\PDFCOL@AtEnd{% \PDFCOL@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index f4ffe6090aa..e897304c64e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -26,7 +26,8 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% \begingroup \catcode44 12 % , @@ -44,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.}% @@ -57,6 +61,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,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}% @@ -80,7 +87,7 @@ \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)] + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)] \expandafter\edef\csname PE@AtEnd\endcsname{% \catcode64 \the\catcode64\relax } @@ -98,6 +105,7 @@ \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - \TMP@EnsureCode\catcode{46}{12}% . +\TMP@EnsureCode\catcode{47}{12}% / \TMP@EnsureCode\catcode{60}{12}% < \TMP@EnsureCode\catcode{61}{12}% = \TMP@EnsureCode\catcode{62}{12}% > @@ -391,7 +399,13 @@ \PE@DeString } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \long\def\EdefEscapeHex#1#2{% \EdefSanitize#1{#2}% \PE@SanitizeSpaceOther#1% @@ -420,16 +434,16 @@ \expandafter\def\expandafter#1\expandafter{#1}% }% \long\def\EdefEscapeHex#1#2{% - \PE@edefbabel#1\pdfescapehex{#2}% + \PE@edefbabel#1\pdf@escapehex{#2}% }% \def\EdefUnescapeHex#1#2{% - \PE@edefbabel#1\pdfunescapehex{#2}% + \PE@edefbabel#1\pdf@unescapehex{#2}% }% \long\def\EdefEscapeName#1#2{% - \PE@edefbabel#1\pdfescapename{#2}% + \PE@edefbabel#1\pdf@escapename{#2}% }% \long\def\EdefEscapeString#1#2{% - \PE@edefbabel#1\pdfescapestring{#2}% + \PE@edefbabel#1\pdf@escapestring{#2}% }% \PE@AtEnd \expandafter\endinput diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty new file mode 100644 index 00000000000..f9a16b5bc2e --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -0,0 +1,584 @@ +%% +%% This is file `pdftexcmds.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdftexcmds.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file pdftexcmds.dtx +%% and the derived files +%% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv. +%% +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname + \ifcase 0% + \ifx\x\relax % plain + \else + \ifx\x\empty % LaTeX + \else + 1% + \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.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pdftexcmds}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \catcode35 6 % # + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \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}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pdftexcmds.sty\endcsname +\ProvidesPackage{pdftexcmds}% + [2007/11/12 v0.2 LuaTeX support for pdfTeX utility functions (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname pdftexcmds@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\pdftexcmds@AtEnd{% + \pdftexcmds@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{95}{12}% _ (other) +\TMP@EnsureCode{126}{12}% ~ (other) +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax +\else + \RequirePackage{infwarerr}[2007/09/09]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname directlua\endcsname\relax + \@PackageInfo{pdftexcmds}{LuaTeX not detected}% + \def\pdftexcmds@nopdftex{% + \@PackageInfoNoLine{pdftexcmds}{pdfTeX >= 1.30 not detected}% + \let\pdftexcmds@nopdftex\relax + }% + \def\pdftexcmds@temp#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf#1\endcsname\relax + \pdftexcmds@nopdftex + \else + \expandafter\def\csname pdf@#1\expandafter\endcsname + \expandafter##\expandafter{% + \csname pdf#1\endcsname + }% + \fi + }% + \pdftexcmds@temp{strcmp}% + \pdftexcmds@temp{escapehex}% + \let\pdf@escapehexnative\pdf@escapehex + \pdftexcmds@temp{unescapehex}% + \let\pdf@unescapehexnative\pdf@unescapehex + \pdftexcmds@temp{escapestring}% + \pdftexcmds@temp{escapename}% + \pdftexcmds@temp{filesize}% + \pdftexcmds@temp{filemoddate}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfshellescape\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@shellescape{% + \pdfshellescape + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdffiledump\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@filedump#1#2#3{% + \pdffiledump offset#1 length#2{#3}% + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfmdfivesum\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@mdfivesum#{\pdfmdfivesum}% + \let\pdf@mdfivesumnative\pdf@mdfivesum + \def\pdf@filemdfivesum#{\pdfmdfivesum file}% + \fi + \def\pdf@system#{% + \immediate\write18% + }% + \pdftexcmds@AtEnd + \expandafter\endinput +\fi +\chardef\pdftexcmds@luastate=0 % +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newtoks\endcsname\relax + \toksdef\pdftexcmds@toks=0 % +\else + \csname newtoks\endcsname\pdftexcmds@toks +\fi +\begingroup + \escapechar=92 % + \edef\\{\string\\}% + \catcode35=12 % # + \catcode37=12\relax + \directlua\pdftexcmds@luastate{ + pdftexcmds = {} + function pdftexcmds.strcmp(A, B) + if A == B then + tex.write("0") + elseif A < B then + tex.write("-1") + else + tex.write("1") + end + end + function pdftexcmds.utf8_to_byte(str) + local i = 0 + local n = string.len(str) + local t = {} + while i < n do + i = i + 1 + local a = string.byte(str, i) + if a < 128 then + table.insert(t, string.char(a)) + else + if a >= 192 and i < n then + i = i + 1 + local b = string.byte(str, i) + if b < 128 or b >= 192 then + i = i - 1 + elseif a == 194 then + table.insert(t, string.char(b)) + elseif a == 195 then + table.insert(t, string.char(b + 64)) + end + end + end + end + return table.concat(t) + end + function pdftexcmds.escapehex(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + return string.format("%02X", string.byte(ch)) + end + ))) + end + function pdftexcmds.unescapehex(str, mode) + local a = 0 + local first = true + local result = {} + for i = 1, string.len(str), 1 do + local ch = string.byte(str, i) + if ch >= 48 and ch <= 57 then + ch = ch - 48 + elseif ch >= 65 and ch <= 70 then + ch = ch - 55 + elseif ch >= 97 and ch <= 102 then + ch = ch - 87 + else + ch = nil + end + if ch then + if first then + a = ch * 16 + first = false + else + table.insert(result, a + ch) + first = true + end + end + end + if not first then + table.insert(result, a) + end + if mode == "byte" then + local utf8 = {} + for i, a in ipairs(result) do + if a < 128 then + table.insert(utf8, a) + else + if a < 192 then + table.insert(utf8, 194) + a = a - 128 + else + table.insert(utf8, 195) + a = a - 192 + end + table.insert(utf8, a + 128) + end + end + result = utf8 + end + tex.settoks(pdftexcmds.toks, string.char(unpack(result))) + end + function pdftexcmds.escapestring(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b < 33 or b > 126 then + return string.format("\\%.3o", b) + end + if b == 40 or b == 41 or b == 92 then + return "\\" .. ch + end + return nil + end + ))) + end + function pdftexcmds.escapename(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b == 0 then + return "" + end + if b <= 32 or b >= 127 + or b == 35 or b == 37 or b == 40 or b == 41 + or b == 47 or b == 60 or b == 62 or b == 91 + or b == 93 or b == 123 or b == 125 then + return string.format("#%.2X", b) + else + return nil + end + end + ))) + end + function pdftexcmds.filesize(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local size = lfs.attributes(foundfile, "size") + if size then + tex.write(size) + end + end + end + function pdftexcmds.filemoddate(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local date = lfs.attributes(foundfile, "modification") + if date then + local d = os.date("*t", date) + if d.sec >= 60 then + d.sec = 59 + end + local u = os.date("!*t", date) + local off = 60 * (d.hour - u.hour) + d.min - u.min + if d.year ~= u.year then + if d.year > u.year then + off = off + 1440 + else + off = off - 1440 + end + elseif d.yday ~= u.yday then + if d.yday > u.yday then + off = off + 1440 + else + off = off - 1440 + end + end + local timezone + if off == 0 then + timezone = "Z" + else + local hours = math.floor(off / 60) + local mins = math.abs(off - hours * 60) + timezone = string.format("%+03d'%02d'", hours, mins) + end + tex.write(string.format("D:%04d%02d%02d%02d%02d%02d%s", + d.year, d.month, d.day, d.hour, d.min, d.sec, timezone)) + end + end + end + function pdftexcmds.filedump(offset, length, filename) + length = tonumber(length) + if length and length > 0 then + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + offset = tonumber(offset) + if not offset then + offset = 0 + end + local filehandle = io.open(foundfile, "r") + if filehandle then + if offset > 0 then + filehandle:seek("set", offset) + end + local dump = filehandle:read(length) + pdftexcmds.escapehex(dump) + end + end + end + end + function pdftexcmds.mdfivesum(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + pdftexcmds.escapehex(md5.sum(str)) + end + function pdftexcmds.filemdfivesum(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local filehandle = io.open(foundfile, "r") + if filehandle then + local contents = filehandle:read("*a") + pdftexcmds.escapehex(md5.sum(contents)) + end + end + end + function pdftexcmds.shellescape() + if os.execute then + tex.write("1") + else + tex.write("0") + end + end + function pdftexcmds.system(cmdline) + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "system(" .. cmdline .. ") ") + if os.execute then + texio.write("log", "executed.") + pdftexcmds.systemexitstatus = os.execute(cmdline) + else + texio.write("log", "disabled.") + end + end + function pdftexcmds.lastsystemstatus() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + local x = math.floor(result / 256) + tex.write(result - 256 * math.floor(result / 256)) + end + end + function pdftexcmds.lastsystemexit() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + tex.write(math.floor(result / 256)) + end + end + function pdftexcmds.pipe(cmdline) + local result + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "pipe(" .. cmdline ..") ") + if io.popen then + texio.write("log", "executed.") + local handle = io.popen(cmdline, "r") + if handle then + result = handle:read("*a") + handle:close() + end + else + texio.write("log", "disabled.") + end + if result then + tex.settoks(pdftexcmds.toks, result) + else + tex.settoks(pdftexcmds.toks, "") + end + end + } +\endgroup +\long\def\pdf@strcmp#1#2{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.strcmp("\luaescapestring{#1}",% + "\luaescapestring{#2}")% + }% +}% +\long\def\pdf@escapehex#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@escapehexnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}")% + }% +}% +\def\pdf@unescapehex#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}", "byte")% + }% +}% +\def\pdf@unescapehexnative#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}")% + }% +}% +\long\def\pdf@escapestring#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapestring("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapename#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapenamenative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}")% + }% +} +\def\pdf@filesize#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filesize("\luaescapestring{#1}")% + }% +} +\def\pdf@filemoddate#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemoddate("\luaescapestring{#1}")% + }% +} +\def\pdf@filedump#1#2#3{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filedump("\luaescapestring{\number#1}",% + "\luaescapestring{\number#2}",% + "\luaescapestring{#3}")% + }% +}% +\long\def\pdf@mdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@mdfivesumnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@filemdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@shellescape{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.shellescape()% + }% +} +\def\pdf@system#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.system("\luaescapestring{#1}")% + }% +} +\def\pdf@lastsystemstatus{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemstatus()% + }% +} +\def\pdf@lastsystemexit{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemexit()% + }% +} +\ifnum0% + \directlua\pdftexcmds@luastate{% + if io.popen then % + tex.write("1")% + end% + }% + =1 % + \def\pdf@pipe#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.pipe("\luaescapestring{#1}")% + }% + }% +\fi +\pdftexcmds@AtEnd +\endinput +%% +%% End of file `pdftexcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def index 6fe9f49c520..b34923a96a9 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-ascii.def}[2007/10/22 v1.3 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2007/11/11 v1.4 stringenc: US-ASCII] \expandafter\gdef\csname\SE@PrefixTo ascii\endcsname#1#2#3#4{% \ifnum"#1#2#3<8 % \SE@ResultAdd{#3#4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def index b54a3ff5ec3..004f7d1709f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1250.def}[2007/10/22 v1.3 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2007/11/11 v1.4 stringenc: cp1250] \def\SE@this{cp1250} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def index dfc70e3d945..6a9a5ddce0e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1251.def}[2007/10/22 v1.3 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2007/11/11 v1.4 stringenc: cp1251] \def\SE@this{cp1251} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def index bcd8af69776..32430be935e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1252.def}[2007/10/22 v1.3 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2007/11/11 v1.4 stringenc: cp1252] \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def index 848ce5a212e..71a35740f19 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1257.def}[2007/10/22 v1.3 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2007/11/11 v1.4 stringenc: cp1257] \def\SE@this{cp1257} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def index e71b0ce77a4..5ad15379866 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp437.def}[2007/10/22 v1.3 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2007/11/11 v1.4 stringenc: cp437] \def\SE@this{cp437} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def index 976c8188f9b..d0a33851607 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp850.def}[2007/10/22 v1.3 stringenc: cp850] +\ProvidesFile{se-cp850.def}[2007/11/11 v1.4 stringenc: cp850] \def\SE@this{cp850} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def index 860e12b0faf..474a5fef12c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp852.def}[2007/10/22 v1.3 stringenc: cp852] +\ProvidesFile{se-cp852.def}[2007/11/11 v1.4 stringenc: cp852] \def\SE@this{cp852} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def index ba6e972954e..033cff18b4d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp855.def}[2007/10/22 v1.3 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2007/11/11 v1.4 stringenc: cp855] \def\SE@this{cp855} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def index feeaecdbd47..7f8cb6b2237 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp858.def}[2007/10/22 v1.3 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2007/11/11 v1.4 stringenc: cp858] \def\SE@this{cp858} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def index 563c807b71a..90bd85576e6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp865.def}[2007/10/22 v1.3 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2007/11/11 v1.4 stringenc: cp865] \def\SE@this{cp865} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def index 2ae2a2c923a..7dbb3fe58a0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp866.def}[2007/10/22 v1.3 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2007/11/11 v1.4 stringenc: cp866] \def\SE@this{cp866} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def index db79bfe2e53..5d58100536b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-dec-mcs.def}[2007/10/22 v1.3 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2007/11/11 v1.4 stringenc: DEC-MCS] \def\SE@this{dec-mcs} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def index b25eefa571a..7285e3fb0d9 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-1.def}[2007/10/22 v1.3 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2007/11/11 v1.4 stringenc: ISO-8859-1] \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def index 3ed1c16a025..b8c22566a33 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-10.def}[2007/10/22 v1.3 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2007/11/11 v1.4 stringenc: ISO-8859-10] \def\SE@this{iso-8859-10} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def index cc807529d2d..9943219b431 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-11.def}[2007/10/22 v1.3 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2007/11/11 v1.4 stringenc: ISO-8859-11] \def\SE@this{iso-8859-11} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def index 9e9e7a8b4d6..f650e8ebddd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-13.def}[2007/10/22 v1.3 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2007/11/11 v1.4 stringenc: ISO-8859-13] \def\SE@this{iso-8859-13} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def index 517fa311d7e..c8d1215b86c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-14.def}[2007/10/22 v1.3 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2007/11/11 v1.4 stringenc: ISO-8859-14] \def\SE@this{iso-8859-14} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def index 949c276970f..3f51f9eb9f5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-15.def}[2007/10/22 v1.3 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2007/11/11 v1.4 stringenc: ISO-8859-15] \def\SE@this{iso-8859-15} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def index a4d781f8a71..2eeb96a35d0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-16.def}[2007/10/22 v1.3 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2007/11/11 v1.4 stringenc: ISO-8859-16] \def\SE@this{iso-8859-16} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def index 78dc10833f2..daf21912e92 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-2.def}[2007/10/22 v1.3 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2007/11/11 v1.4 stringenc: ISO-8859-2] \def\SE@this{iso-8859-2} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def index 1fdb0372d62..f6f2f6ef08f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-3.def}[2007/10/22 v1.3 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2007/11/11 v1.4 stringenc: ISO-8859-3] \def\SE@this{iso-8859-3} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def index e7fb67a64d0..3649f8b8116 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-4.def}[2007/10/22 v1.3 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2007/11/11 v1.4 stringenc: ISO-8859-4] \def\SE@this{iso-8859-4} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def index 59a0550bacb..21ea1febfe8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-5.def}[2007/10/22 v1.3 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2007/11/11 v1.4 stringenc: ISO-8859-5] \def\SE@this{iso-8859-5} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def index 0d77d513e1a..640e62cd50e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-6.def}[2007/10/22 v1.3 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2007/11/11 v1.4 stringenc: ISO-8859-6] \def\SE@this{iso-8859-6} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def index c4cae2337e7..1df21620e2e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-7.def}[2007/10/22 v1.3 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2007/11/11 v1.4 stringenc: ISO-8859-7] \def\SE@this{iso-8859-7} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def index 54ca4ad1753..6a6a322f771 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-8.def}[2007/10/22 v1.3 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2007/11/11 v1.4 stringenc: ISO-8859-8] \def\SE@this{iso-8859-8} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def index b3c85342a90..c0fabd170cd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-9.def}[2007/10/22 v1.3 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2007/11/11 v1.4 stringenc: ISO-8859-9] \def\SE@this{iso-8859-9} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def index 2e840b42010..68c68e0eb59 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-koi8-r.def}[2007/10/22 v1.3 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2007/11/11 v1.4 stringenc: KOI8-R] \def\SE@this{koi8-r} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def index dd998f6cc57..75940d74ebe 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-centeuro.def}[2007/10/22 v1.3 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2007/11/11 v1.4 stringenc: Mac OS Central European] \def\SE@this{mac-centeuro} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def index d2eb680f429..e02d138a99e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-cyrillic.def}[2007/10/22 v1.3 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2007/11/11 v1.4 stringenc: Mac OS Cyrillic] \def\SE@this{mac-cyrillic} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def index 9e7102f25d6..1a46d2cb3ec 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-roman.def}[2007/10/22 v1.3 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2007/11/11 v1.4 stringenc: Mac OS Roman] \def\SE@this{mac-roman} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def index b48938aad48..6373f8c5de5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-nextstep.def}[2007/10/22 v1.3 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2007/11/11 v1.4 stringenc: NextStep] \def\SE@this{nextstep} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def index 5be53592648..5249bb38349 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-pdfdoc.def}[2007/10/22 v1.3 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2007/11/11 v1.4 stringenc: PDFDocEncoding] \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2#3#4<256 % \ifnum"#1#2#3#4>160 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def index 41cf377f2a0..a57c759a7d0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf16le.def}[2007/10/22 v1.3 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2007/11/11 v1.4 stringenc: UTF-16LE] \expandafter\gdef\csname\SE@PrefixTo utf16le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#2}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def index 31f987c65c2..51dc5500b5b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32be.def}[2007/10/22 v1.3 stringenc: UTF-32BE] +\ProvidesFile{se-utf32be.def}[2007/11/11 v1.4 stringenc: UTF-32BE] \expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{% \SE@ResultAdd{0000#1#2#3#4}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def index 8323f09e622..4f2b26970ca 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32le.def}[2007/10/22 v1.3 stringenc: UTF-32LE] +\ProvidesFile{se-utf32le.def}[2007/11/11 v1.4 stringenc: UTF-32LE] \expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#20000}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def index c7bd217bf74..c3c1a6c3318 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf8.def}[2007/10/22 v1.3 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2007/11/11 v1.4 stringenc: UTF-8] \expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{% \ifnum"#1#2#3#4<"80 % \SE@ResultAdd{#3#4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index 99c3bc51b24..c74c8dff879 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.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}% @@ -82,10 +88,22 @@ \expandafter\x\csname ver@setouterhbox.sty\endcsname \ProvidesPackage{setouterhbox}% [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)] -\expandafter\edef\csname setouterhboxAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname setouterhboxAtEnd\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\setouterhboxAtEnd{% \setouterhboxAtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty index 8f0941c541d..835bb6c5ca7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@soulutf8.sty\endcsname \ProvidesPackage{soulutf8}% [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)] -\expandafter\edef\csname SOuL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname SOuL@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\SOuL@AtEnd{% \SOuL@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index 8b034b61690..daf59076e33 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -55,6 +55,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.}% @@ -68,6 +71,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -76,6 +80,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}% @@ -91,7 +97,7 @@ \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2007/10/22 v1.3 Converts strings between encodings (HO)] + [2007/11/11 v1.4 Converts strings between encodings (HO)] \expandafter\edef\csname SE@AtEnd\endcsname{% \catcode64 \the\catcode64\relax } @@ -295,8 +301,9 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\SE@InputIfFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -310,7 +317,7 @@ }% \else \def\SE@InputIfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \SE@FileNotFound{#1}% \else \SE@Input{#1}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index 34f66343644..ab869f46d2c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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,10 +87,22 @@ \expandafter\x\csname ver@telprint.sty\endcsname \ProvidesPackage{telprint}% [2007/09/09 v1.9 Formatting of German phone numbers (HO)] -\expandafter\edef\csname TELAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname TELAtEnd\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\TELAtEnd{% \TELAtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def index 5a42a35f271..b38b507b534 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def @@ -26,11 +26,12 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvipdfm.def}% - [2007/03/21 v0.1 accsupp driver for dvipdfm (HO)]% + [2007/11/14 v0.2 accsupp driver for dvipdfm (HO)]% \def\ACCSUPP@bdc{% \special{pdf:content \ACCSUPP@span BDC}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def index 1e4dbde3444..9553f5bf209 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def @@ -26,12 +26,13 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvips.def}% - [2007/03/21 v0.1 accsupp driver for dvips (HO)]% -\def\ACCSUPP@bdc#1{% + [2007/11/14 v0.2 accsupp driver for dvips (HO)]% +\def\ACCSUPP@bdc{% \special{ps:[\ACCSUPP@span/BDC pdfmark}% } \def\ACCSUPP@emc{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def index b1b1456aa90..38f90911ce9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def @@ -26,11 +26,12 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-pdftex.def}% - [2007/03/21 v0.1 accsupp driver for pdfTeX (HO)]% + [2007/11/14 v0.2 accsupp driver for pdfTeX (HO)]% \def\ACCSUPP@bdc{% \pdfliteral\ACCSUPP@pdfliteral{\ACCSUPP@span BDC}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty index 14d38a33f10..a26caed005b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty @@ -26,33 +26,54 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ACCSUPP@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\ACCSUPP@AtEnd{% + \ACCSUPP@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{254}{12}% ^^fe +\TMP@EnsureCode{255}{12}% ^^ff +\g@addto@macro\ACCSUPP@AtEnd{\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{accsupp}% - [2007/03/21 v0.1 Accessibility support by marked content (HO)]% -\edef\ACCSUPP@end{% - \catcode39 \the\catcode39 % ' - \catcode40 \the\catcode40 % ( - \catcode41 \the\catcode41 % ) - \catcode60 \the\catcode60 % < - \catcode61 \the\catcode61 % = - \catcode62 \the\catcode62 % > - \catcode94 \the\catcode94 % ^ - \catcode96 \the\catcode96 % ` - \catcode254 \the\catcode254 % ^^FE - \catcode255 \the\catcode255 % ^^FF -} -\@makeother\( -\@makeother\) -\@makeother\' -\@makeother\< -\@makeother\= -\@makeother\> -\catcode94 = 7 % -\@makeother\` -\@makeother\^^fe -\@makeother\^^ff + [2007/11/14 v0.2 Accessibility support by marked content (HO)] \RequirePackage{pdfescape}[2007/02/25] \RequirePackage{ifpdf} \RequirePackage{ifxetex} @@ -65,11 +86,11 @@ \@dblarg\ACCSUPP@@DefineDriverKey } \def\ACCSUPP@@DefineDriverKey[#1]#2{% - \define@key{ActTxt}{#2}[]{% + \define@key{ACCSUPP}{#2}[]{% \def\ACCSUPP@driver{#1}% }% \g@addto@macro\ACCSUPP@DisableOptions{% - \DisableKeyvalOption{ActTxt}{#2}% + \DisableKeyvalOption{ACCSUPP}{#2}% }% } \let\ACCSUPP@DisableOptions\@empty @@ -79,6 +100,7 @@ \ACCSUPP@DefineDriverKey{dvipdfm} \ACCSUPP@DefineDriverKey[dvipdfm]{dvipdfmx} \ACCSUPP@DefineDriverKey[dvipdfm]{xetex} +\let\ACCSUPP@driver\relax \InputIfFileExists{accsupp.cfg}{}{} \providecommand*{\ActualTextDriverDefault}{dvips} \ifpdf @@ -87,7 +109,9 @@ \ifxetex \def\ACCSUPP@driver{dvipdfm}% \else - \let\ACCSUPP@driver\BookmarkDriverDefault + \ifx\ACCSUPP@driver\relax + \let\ACCSUPP@driver\ActualTextDriverDefault + \fi \fi \fi \ProcessKeyvalOptions* @@ -107,7 +131,7 @@ Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak Package loading is aborted% }\@ehc - \expandafter\expandafter\expandafter\endinput + \expandafter\expandafter\expandafter\ACCSUPP@AtEnd \fi \def\ACCSUPP@temp{dvipdfm}% \ifxetex @@ -121,12 +145,19 @@ \fi \fi \fi +\ifx\ACCSUPP@driver\relax + \PackageError{accsupp}{% + Missing driver option.\MessageBreak + Package loading is aborted% + }\@ehc + \expandafter\ACCSUPP@AtEnd +\fi \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{% \PackageError{accsupp}{% Unsupported driver `\ACCSUPP@driver'.\MessageBreak Package loading is aborted% }\@ehc - \endinput + \ACCSUPP@AtEnd } \DeclareBoolOption{unicode} \DeclareStringOption[page]{pdfliteral} @@ -223,7 +254,7 @@ }% } \def\ACCSUPP@method@pdfstringdef#1{% - \ifActText@unicode + \ifACCSUPP@unicode \@ifundefined{hypersetup}{}{% \hypersetup{unicode}% }% @@ -234,11 +265,16 @@ }\@ehc \let\ACCSUPP@temp\@empty }{% - \pdfstringdef\ACCSUPP@temp#1% + \begingroup + \setbox0=\hbox{% + \pdfstringdef\ACCSUPP@temp#1% + \global\let\ACCSUPP@temp\ACCSUPP@temp + }% + \endgroup }% \edef#1{(\ACCSUPP@temp)}% } -\ACCSUPP@end +\ACCSUPP@AtEnd \endinput %% %% End of file `accsupp.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty index 47ce9af4d6d..11ec911e0c4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -41,10 +41,22 @@ %% askinclude-test23.tex, askinclude-test24.tex. %% \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname AskInc@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AskInc@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\AskInc@AtEnd{% \AskInc@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty index 4dbc977a358..e7287fe1901 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize-base}% - [2007/05/01 v1.3 Basic part of bmpsize (HO)]% + [2007/11/11 v1.4 Basic part of bmpsize (HO)]% \RequirePackage{fp-basic} \RequirePackage{fp-snap} \long\def\@bmpsize@plain@loop#1\repeat{% @@ -40,6 +40,7 @@ \iterate \let\iterate\relax } +\RequirePackage{pdftexcmds}[2007/11/11] \newif\ifbmpsize@ok \let\@bmpsize@ok\bmpsize@oktrue @@ -74,7 +75,7 @@ \def\@bmpsize@break#1\@bmpsize@loop#2{} \def\@bmpsize@size#1#2#3{% - \edef#3{\pdffilesize{#1}}% + \edef#3{\pdf@filesize{#1}}% \ifx#3\@empty \expandafter\@bmpsize@stop \fi @@ -84,7 +85,7 @@ } \def\@bmpsize@read#1#2#3{% - \edef\@bmpsize@buf{\pdffiledump offset#3length#2{#1}}% + \edef\@bmpsize@buf{\pdf@filedump{#3}{#2}{#1}}% \edef\@bmpsize@temp{% \noexpand\@bmpsize@check@byte{#2}\@bmpsize@buf{}{}\noexpand\\% }% @@ -98,8 +99,7 @@ \fi {% \edef\@bmpsize@buf{% - \pdffiledump offset\bmpsize@offset - length\bmpsize@fillbuflength{#1}% + \pdf@filedump{\bmpsize@offset}{\bmpsize@fillbuflength}{#1}% }% \ifx\@bmpsize@buf\@empty \expandafter\@bmpsize@stop @@ -117,13 +117,13 @@ } \def\@bmpsize@iswhite#1{% - \ifnum\pdfstrcmp{#1}{09}=\z@ + \ifnum\pdf@strcmp{#1}{09}=\z@ \else - \ifnum\pdfstrcmp{#1}{0A}=\z@ + \ifnum\pdf@strcmp{#1}{0A}=\z@ \else - \ifnum\pdfstrcmp{#1}{0D}=\z@ + \ifnum\pdf@strcmp{#1}{0D}=\z@ \else - \ifnum\pdfstrcmp{#1}{20}=\z@ + \ifnum\pdf@strcmp{#1}{20}=\z@ \else 1% \fi @@ -133,10 +133,10 @@ \space } \def\@bmpsize@isdigit#1{% - \ifnum\pdfstrcmp{#1}{30}<\z@ + \ifnum\pdf@strcmp{#1}{30}<\z@ 1% \else - \ifnum\pdfstrcmp{#1}{39}>\z@ + \ifnum\pdf@strcmp{#1}{39}>\z@ 1% \fi \fi @@ -199,7 +199,7 @@ \if@bmpsize@absnum \ifnum"\expandafter\@car#1\@nil>7 % \edef#1{\expandafter\@bmpsize@abs@byte#1\relax}% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}=\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}=\z@ \let\@bmpsize@temp\@bmpsize@stop \else \def\@bmpsize@temp{\edef#1{\the\numexpr#1+1}}% @@ -237,7 +237,7 @@ \@bmpsize@grab#14% \@bmpsize@swap@maybe#1% \@bmpsize@abs@maybe#1% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}>\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}>\z@ \expandafter\@bmpsize@stop \fi \edef#1{\number"#1}% @@ -434,14 +434,14 @@ \@bmpsize@grab\bmpsize@temp{8}% \@bmpsize@skip@four \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49484452}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -454,7 +454,7 @@ \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49444154}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49444154}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -462,7 +462,7 @@ {% \@bmpsize@stop }% - \ifnum\pdfstrcmp{\bmpsize@temp}{70485973}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{70485973}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -495,7 +495,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FFD8FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FFD8FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -505,7 +505,7 @@ \@bmpsize@read{#1}{4}{\bmpsize@offset}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -541,7 +541,7 @@ \@bmpsize@grab\bmpsize@temp{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{4A46494600}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4A46494600}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -592,7 +592,7 @@ \@bmpsize@grab\bmpsize@temp{6}% \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{457869660000}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{457869660000}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -601,7 +601,7 @@ \edef\bmpsize@exifoffset{\the\numexpr\bmpsize@offset+10}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -609,7 +609,7 @@ {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -801,7 +801,7 @@ \@bmpsize@read{#1}{26}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{424D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{424D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -854,7 +854,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{474946}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{474946}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -884,7 +884,7 @@ \@bmpsize@read{#1}{8}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -892,7 +892,7 @@ {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1015,16 +1015,16 @@ \def\bmpsize@offset{3}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{31}<\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{31}<\z@ \expandafter\@bmpsize@stop \fi - \ifnum\pdfstrcmp{\bmpsize@temp}{36}>\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{36}>\z@ \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% @@ -1047,7 +1047,7 @@ \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1057,7 +1057,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1065,7 +1065,7 @@ {% \@bmpsize@break }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{0D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0D}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1106,7 +1106,7 @@ }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% @@ -1146,7 +1146,7 @@ }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -1160,7 +1160,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50370A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50370A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1176,7 +1176,7 @@ {% \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1188,7 +1188,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1203,7 +1203,7 @@ \@bmpsize@grab\bmpsize@head{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@head}{5749445448}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{5749445448}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1258,7 +1258,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1267,12 +1267,12 @@ \@bmpsize@break }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \@bmpsize@append\bmpsize@head\bmpsize@head\bmpsize@temp - \ifnum\pdfstrcmp{\bmpsize@head}{454E44484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{454E44484452}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1281,7 +1281,7 @@ \@bmpsize@ok \@bmpsize@stop }{% - \ifnum\pdfstrcmp{\bmpsize@head}{484549474854}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{484549474854}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1336,7 +1336,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1345,7 +1345,7 @@ \@bmpsize@break }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@pushback\bmpsize@head \@bmpsize@loop{% @@ -1353,7 +1353,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1380,7 +1380,7 @@ \@bmpsize@skip@four \@bmpsize@skip@one \def\bmpsize@offset{9}% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1388,7 +1388,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{22}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{22}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1396,7 +1396,7 @@ {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1405,7 +1405,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1415,7 +1415,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1425,7 +1425,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1433,7 +1433,7 @@ {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1442,7 +1442,7 @@ \@bmpsize@break }% }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1503,7 +1503,7 @@ }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \def\bmpsize@tempnum{}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% @@ -1552,7 +1552,7 @@ }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -1564,13 +1564,13 @@ \@bmpsize@read{#1}{16}{1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{01}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1594,7 +1594,7 @@ \@bmpsize@skip@four \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1632,7 +1632,7 @@ \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1671,13 +1671,13 @@ \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{44616E4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{44616E4D}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{4C696E53}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4C696E53}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1707,7 +1707,7 @@ \@bmpsize@read{#1}{10}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{01DA}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01DA}=\z@ \else \expandafter\@bmpsize@stop \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def index 042cd5f363c..e53ba4c1329 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfm.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfm (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . @@ -51,10 +51,10 @@ \@bmpsize@count=\z@ }{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \def\@bmpsize@pdfescapestring#1{#1}% \else - \let\@bmpsize@pdfescapestring\pdfescapestring + \let\@bmpsize@pdfescapestring\pdf@escapestring \fi \def\bmpsize@dvipdfm@factor{.99626} \def\Ginclude@bmp#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def index cf88f50f985..3737f24033b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfmx.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfmx (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . @@ -51,10 +51,10 @@ \@bmpsize@count=\z@ }{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \def\@bmpsize@pdfescapestring#1{#1}% \else - \let\@bmpsize@pdfescapestring\pdfescapestring + \let\@bmpsize@pdfescapestring\pdf@escapestring \fi \def\bmpsize@dvipdfmx@factor{1.3837} \def\Ginclude@bmp#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def index 1582bec1cb2..41e6f77d692 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvips.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvips (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode58 \the\catcode58 % : diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex index 2639a1be762..001a8c7bc26 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \expandafter\ifx\csname NeedsTeXFormat\endcsname\relax -\input miniltx + \input miniltx\relax \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfoutput\endcsname\relax @@ -60,7 +60,7 @@ \csname @@end\endcsname \end }{% - \ifnum\pdfstrcmp{\imagename}{opt}=\z@ + \ifnum\pdf@strcmp{\imagename}{opt}=\z@ \expandafter\optionmenu \else \startimg @@ -130,7 +130,7 @@ \fi }% \ifx\@found\@empty - \edef\@file@date{\pdffilemoddate{\imagename}}% + \edef\@file@date{\pdf@filemoddate{\imagename}}% \ifx\@file@date\@empty \msg{\space\space --> File not found <--}% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index bc7be80416f..24140816d40 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -29,24 +29,33 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]% + [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% \expandafter\endinput \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffiledump\endcsname\relax +\expandafter\ifx\csname pdf@filedump\endcsname\relax \PackageError{bmpsize}{% You need pdfTeX 1.30.0 or newer% }{Package loading is aborted.}% \expandafter\endinput \fi +\RequirePackage{infwarerr}[2007/09/09] \RequirePackage{graphics} -\RequirePackage{keyval} +\RequirePackage{keyval}\relax +\expandafter\ifx\csname KV@errx\endcsname\relax + \def\KV@errx#1{% + \@PackageError{keyval}{#1}\@ehc + }% +\fi +\expandafter\ifx\csname KV@err\endcsname\relax + \let\KV@err\KV@errx +\fi \RequirePackage{bmpsize-base} -\RequirePackage{infwarerr} \InputIfFileExists{bmpsize-\Gin@driver}{}{} @@ -72,18 +81,18 @@ \x{ } \def\@bmpsize@read@resolution#1#2 #3 #4\@nil{% \ifcase 0\ifx\\#2\\1\fi - \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@ \ifx\\#3\\1\fi - \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@ 1% \fi \fi - \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax \let\bmpsize@pixelx@default\Gin@exclamation \else \edef\bmpsize@pixelx@default{#2}% \fi - \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax \let\bmpsize@pixely@default\Gin@exclamation \else \ifx\\#3\\% @@ -105,7 +114,7 @@ \let\@bmpsize@org@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% - \ifcase\pdfstrcmp{#1}{bmp}\relax + \ifcase\pdf@strcmp{#1}{bmp}\relax \expandafter\@firstofone \else \expandafter\@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index 1027a683717..ae71aad18a0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -31,8 +31,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2007/10/29 v2.1 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2007/10/29] + [2007/11/11 v2.2 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2007/11/11] \embedfile[% stringmethod=escape,% mimetype=plain/text,% 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@% diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 096b22d4abd..41800a8805d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -44,6 +44,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.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,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}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)] -\expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ETE@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\ETE@AtEnd{% \ETE@AtEnd @@ -107,6 +125,7 @@ \RequirePackage{infwarerr}[2007/09/09] \RequirePackage{grfext}\relax \RequirePackage{kvoptions}[2007/10/02] +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname Gin@setfile\endcsname\relax \@PackageWarningNoLine{epstopdf}{% @@ -130,9 +149,9 @@ \fi \endgroup \begingroup - \expandafter\ifx\csname pdfshellescape\endcsname\relax + \expandafter\ifx\csname pdf@shellescape\endcsname\relax \else - \ifnum\pdfshellescape>0 % + \ifnum\pdf@shellescape>0 % \else \@PackageWarningNoLine{epstopdf}{% Shell escape feature is not enabled% @@ -150,7 +169,7 @@ \ProcessKeyvalOptions* \newcommand*{\epstopdfsetup}{\setkeys{ETE}} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilemoddate\endcsname\relax +\expandafter\ifx\csname pdf@filemoddate\endcsname\relax \def\ETE@Make#1#2{% \ifETE@update \ETE@WarnModDate @@ -168,7 +187,7 @@ \else \def\ETE@Make#1#2{% \ifETE@update - \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 % + \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % \expandafter\expandafter\expandafter\@firstofone \else \@PackageInfoNoLine{epstopdf}{% @@ -182,8 +201,10 @@ }% \def\ETE@FileInfo#1#2{% #1 file: <#2>% - \expandafter\ETE@Date\pdffilemoddate{#2}\@nil - \expandafter\ETE@Size\pdffilesize{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Date\pdf@filemoddate{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Size\pdf@filesize{#2}\@nil }% \def\ETE@Date#1\@nil{% \ifx\\#1\\% @@ -254,7 +275,7 @@ }% \fi \ETE@Make\SourceFile\OutputFile{% - \immediate\write18{\CommandLine}% + \pdf@system{\CommandLine}% \ifETE@verbose \@PackageInfoNoLine{epstopdf}{% \ETE@FileInfo{Result}\OutputFile diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty index 41817c91c0c..9aed33045ad 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -43,6 +43,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.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,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}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@grfext.sty\endcsname \ProvidesPackage{grfext}% [2007/09/30 v1.0 Managing graphics extensions (HO)] -\expandafter\edef\csname grfext@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname grfext@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\grfext@AtEnd{% \grfext@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index da9cb1d01d1..f7a91e1ceae 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2007/08/16 v1.5 Extended file name support for graphics (HO)]% + [2007/11/11 v1.6 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -67,8 +67,9 @@ \DeclareDefaultOption{% \PassOptionsToPackage\CurrentOption{graphics}% } +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax +\expandafter\ifx\csname pdf@filesize\endcsname\relax \grffile@spacefalse \let\grffile@space@disabled\@empty \def\grffile@spacetrue{% @@ -98,7 +99,8 @@ \else \ifx\grffile@inputencoding\@empty \expandafter\ifx\csname inputencodingname\endcsname\relax - \expandafter\ifx\csname CurrentInputEncodingOption\endcsname\relax + \expandafter\ifx\csname + CurrentInputEncodingOption\endcsname\relax \else \let\grffile@inputencoding\CurrentInputEncodingOption \fi @@ -187,13 +189,13 @@ }% } \def\grffile@IfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \let\reserved@a\@secondoftwo \ifx\input@path\@undefined \else \expandafter\@tfor\expandafter\reserved@b\expandafter :\expandafter=\input@path\do{% - \expandafter\ifx\expandafter\\\pdffilesize{\reserved@b#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{\reserved@b#1}\\% \else \edef\grffile@file@found{\reserved@b#1}% \let\reserved@a\@firstoftwo diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty index 75ab3f2dd14..b8acb55ee3e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2007/10/21 v0.8 Private additional ltxdoc support (HO)] + [2007/11/11 v0.9 Private additional ltxdoc support (HO)] \RequirePackage[numbered]{hypdoc} \RequirePackage{array} \def\hld@info#1{% @@ -137,6 +137,7 @@ \providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}} \providecommand*{\pdfTeX}{pdf\TeX} \providecommand*{\pdfLaTeX}{pdf\LaTeX} +\providecommand*{\LuaTeX}{L\textsc{ua}\TeX} \def\@temp#1#2{% \providecommand*{#1}{% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty index dec536d7d7f..54abda022f2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2006/06/01 v2.0 Hyperref destination optimizer (HO)]% + [2007/11/11 v2.1 Hyperref destination optimizer (HO)]% \newif\ifHypDest@Verbose \DeclareOption{verbose}{\HypDest@Verbosetrue} \def\HypDest@VerboseInfo#1{% @@ -40,7 +40,8 @@ \DeclareOption{num}{\HypDest@namefalse} \DeclareOption{name}{\HypDest@nametrue} \ProcessOptions*\relax -\RequirePackage{ifpdf} +\RequirePackage{ifpdf}[2007/09/09] +\RequirePackage{pdftexcmds}[2007/11/11] \ifpdf \else \PackageError{hypdestopt}{% @@ -49,7 +50,7 @@ \expandafter\endinput \fi \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \PackageError{hypdestopt}{% This pdfTeX is too old, at least 1.30.0 is required% }\@ehc @@ -116,7 +117,7 @@ }% \newalphalph\HypDest@HexString\HypDest@HexChar{250}% \renewcommand*{\theHypDest}{% - \pdfunescapehex{\HypDest@HexString{\value{HypDest}}}% + \pdf@unescapehex{\HypDest@HexString{\value{HypDest}}}% }% \else \renewcommand*{\theHypDest}{% @@ -128,7 +129,7 @@ \begingroup \edef\x{% \expandafter\noexpand - \csname\HypDest@Prefix\pdfunescapehex{#1}\endcsname + \csname\HypDest@Prefix\pdf@unescapehex{#1}\endcsname }% \expandafter\ifx\x\relax \stepcounter{HypDest}% @@ -136,12 +137,12 @@ \let\on@line\@empty \ifHypDest@name \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> % - 0x\pdfescapehex{\x} (\number\value{HypDest})% + Use: (\pdf@unescapehex{#1}) -\string> % + 0x\pdf@escapehex{\x} (\number\value{HypDest})% }% \else \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> num \x + Use: (\pdf@unescapehex{#1}) -\string> num \x }% \fi \fi @@ -156,7 +157,7 @@ }% \if@filesw \immediate\write\@auxout{% - \string\HypDest@Use{\pdfescapehex{#1}}% + \string\HypDest@Use{\pdf@escapehex{#1}}% }% \fi }% @@ -177,7 +178,7 @@ \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}% \HypDest@VerboseInfo{% DestName: (#1) % - 0x\pdfescapehex{\csname\HypDest@Prefix#1\endcsname}% + 0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 63e25908eb0..bbd9ce68e6a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -29,13 +29,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]% + [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax - \RequirePackage{doc} - \ifx\numexpr\@undefined \RequirePackage{calc}% \fi @@ -55,12 +53,10 @@ }},% } \RequirePackage{thumbpdf} - \newcounter{HD@unique} \renewcommand{\theHD@unique}{% \number\value{HD@unique}% } - \g@addto@macro\Hy@UseMaketitleInfos{% \@ifundefined{fileinfo}{}{% \ifx\@pdfsubject\@empty @@ -68,7 +64,6 @@ \fi }% } - \pdfstringdefDisableCommands{% \let\thanks\@gobble \let\footnote\@gobble @@ -77,9 +72,6 @@ \let\scshape\@empty \def\and{and }% } - -%%% Bookmarks - \def\HD@sectionpatch{% \ifHD@numbered \HD@@sectionpatch{section}% @@ -96,7 +88,6 @@ }% } \def\HD@disable@writebookmark#1#2#3#4#5{} - \def\HD@guesstoclevel#1{% \expandafter\HD@@guesstoclevel#1\section\HD@end } @@ -107,12 +98,8 @@ \@nameuse{toclevel@\expandafter\@gobble\string#1\@empty}% }% } - \let\HDorg@tableofcontents\tableofcontents \def\tableofcontents{% - % As first section the table of contents shouldn't - % go into the toc itself. Also a number looks too funny then. - % Just a bookmark is enough in this case. \begingroup \@ifundefined{c@section}{% \def\c@section{0}% @@ -136,21 +123,19 @@ \endgroup \fi } - \let\HDorg@listoffigures\listoffigures \def\listoffigures{% \ifHD@numbered \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHd@unique}% + {\contentsname}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch \HDorg@listoffigures \endgroup } - \let\HDorg@listoftables\listoftables \def\listoftables{% \ifHD@numbered @@ -164,7 +149,6 @@ \HDorg@listoftables \endgroup } - \let\HDorg@thebibliography\thebibliography \def\thebibliography{% \ifHD@numbered @@ -176,7 +160,6 @@ \HD@sectionpatch \HDorg@thebibliography } - \let\HDorg@theindex\theindex \def\theindex{% \let\HDorg@index@prologue\index@prologue @@ -216,7 +199,7 @@ \ifx\HD@hfil\hfil \expandafter\HD@@@bfseries \fi -}% +} \def\HD@@@bfseries\hfil#1\hfil{% \ifx\\#1\\% \else @@ -229,7 +212,6 @@ \hfil#1\hfil }% \def\HD@margin{1mm} - \let\HDorg@theglossary\theglossary \def\theglossary{% \let\HDorg@glossary@prologue\glossary@prologue @@ -250,9 +232,6 @@ \HDorg@theglossary } \providecommand*{\glossaryname}{Change History} - -%%% Index stuff - \newcounter{HD@hypercount} \newlength{\HD@helplength} \newif\ifHD@savedest @@ -287,10 +266,8 @@ \def\HD@savedest@add#1{% \immediate\write\HD@savedest@out{\string~#1}% } - \newif\ifHD@targetraise \HD@targetraisetrue - \def\HD@target{% \ifHD@targetraise \ifhmode @@ -319,14 +296,12 @@ \fi \HD@next } - \g@addto@macro\CodelineIndex{% \let\special@index\HD@codeline@wrindex } \g@addto@macro\PageIndex{% \let\special@index\HD@page@wrindex } - \def\HD@codeline@wrindex#1{% \begingroup \let\HDorg@encapchar\encapchar @@ -349,7 +324,6 @@ \HDorg@index{#1\encapchar\encapchar\@nil}% \endgroup } - \def\hdclindex#1#2#3{% \csname\ifx\\#2\\relax\else#2\fi\endcsname{% \hyperlink{HD.#1}{#3}% @@ -361,7 +335,6 @@ \hyperpage{#2}% }% } - \let\HDorg@PrintDescribeMacro\PrintDescribeMacro \renewcommand\PrintDescribeMacro[1]{% \begingroup @@ -373,7 +346,6 @@ \HDorg@PrintDescribeMacro{#1}% \endgroup } - \let\HDorg@PrintMacroName\PrintMacroName \renewcommand\PrintMacroName[1]{% \begingroup @@ -385,7 +357,6 @@ \HDorg@PrintMacroName{#1}% \endgroup } - \let\HDorg@theCodelineNo\theCodelineNo \renewcommand*\theCodelineNo{% \settowidth{\HD@helplength}{\HDorg@theCodelineNo\ }% @@ -400,11 +371,9 @@ \fi \HDorg@theCodelineNo } - \AtBeginDocument{% \let\HDorg@index\index } - \let\HDorg@SpecialUsageIndex\SpecialUsageIndex \renewcommand*\SpecialUsageIndex[1]{% \@bsphack @@ -419,7 +388,6 @@ \endgroup \@esphack } - \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname autoindex\endcsname\relax \else @@ -438,7 +406,6 @@ \@esphack }% \fi - \let\HDorg@SpecialEnvIndex\SpecialEnvIndex \renewcommand*\SpecialEnvIndex[1]{% \@bsphack @@ -452,7 +419,6 @@ \endgroup \@esphack } - \let\HDorg@SortIndex\SortIndex \renewcommand*{\SortIndex}[2]{% \@bsphack @@ -462,9 +428,6 @@ \endgroup \@esphack } - -%%% glossary stuff - \let\HDorg@wrglossary\@wrglossary \def\@wrglossary#1{% \let\HDorg@encapchar\encapchar @@ -474,9 +437,6 @@ }% \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } - -%%% \MacroIndent automatically calculated - \AtEndDocument{% \if@filesw \immediate\write\@auxout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index 975343b7574..121ec0bd309 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -33,10 +33,22 @@ %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@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\KVO@AtEnd{% \KVO@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 329903bff66..80c1a7565cb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -48,6 +48,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.}% @@ -61,6 +64,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -69,6 +73,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}% @@ -85,10 +91,22 @@ \expandafter\x\csname ver@kvoptions.sty\endcsname \ProvidesPackage{kvoptions}% [2007/10/18 v3.0 Keyval support for LaTeX options (HO)] -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@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\KVO@AtEnd{% \KVO@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty index 8df07faa148..2436cadbf2d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty @@ -29,10 +29,22 @@ %% listingsutf8-test3.tex, listingsutf8-test4.tex, %% listingsutf8-test5.tex. %% -\expandafter\edef\csname lstU@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname lstU@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\lstU@AtEnd{% \lstU@AtEnd @@ -65,7 +77,7 @@ \g@addto@macro\lstU@AtEnd{\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% - [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)] + [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] \DeclareOption*{% \PassOptionsToPackage\CurrentOption{listings}% } @@ -76,6 +88,7 @@ \RequirePackage{inputenc}% }{}% } +\RequirePackage{pdftexcmds}[2007/11/11] \def\lstU@temp#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -88,9 +101,9 @@ \fi } \lstU@temp{scantokens}{It is provided by e-TeX} -\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30} \RequirePackage{stringenc}[2007/10/22] \newif\iflstU@utfviii \def\lstU@inputenc#1{% @@ -111,8 +124,8 @@ \def\lstU@input#1{% \iflstU@utfviii \edef\lstU@text{% - \pdfunescapehex{% - \pdffiledump length\pdffilesize{#1}{#1}% + \pdf@unescapehex{% + \pdf@filedump{0}{\pdf@filesize{#1}}{#1}% }% }% \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc diff --git a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty index a6cf3ac5131..d5fde1b2825 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty @@ -28,11 +28,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{stackrel} - [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]% -\RequirePackage{etexcmds} + [2007/11/11 v1.2 Adding subscript option to stackrel (HO)]% +\RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded + \RequirePackage{pdftexcmds}[2007/11/11]% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \expandafter\ifx\csname pdf@strcmp\endcsname\relax \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits \edef\reserved@a{\etex@unexpanded{#1}}% @@ -44,8 +45,8 @@ \else \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits - \ifcase\pdfstrcmp{\detokenize{#1}}{}\else_{#1}\fi - \ifcase\pdfstrcmp{\detokenize{#2}}{}\else^{#2}\fi + \ifcase\pdf@strcmp{\detokenize{#1}}{}\else_{#1}\fi + \ifcase\pdf@strcmp{\detokenize{#2}}{}\else^{#2}\fi \egroup }% \fi |