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/generic/oberdiek | |
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/generic/oberdiek')
58 files changed, 1033 insertions, 109 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 |