diff options
| author | Karl Berry <karl@freefriends.org> | 2011-04-12 22:56:39 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2011-04-12 22:56:39 +0000 |
| commit | 3c9b5c2960ae2455180bdb3a4e67bf10175b39af (patch) | |
| tree | 53ac9731c23e82f60349ec920ed8d816738913dc /Master/texmf-dist/tex | |
| parent | f437333cf5d63d69f5ab9fd1eb553af4175037d0 (diff) | |
oberdiek (12apr11)
git-svn-id: svn://tug.org/texlive/trunk@22061 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
137 files changed, 21578 insertions, 3277 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index a737a70b208..fd34006ca50 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -33,14 +33,18 @@ %% alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv, %% alphalph-test1.tex, alphalph-test2.tex, alphalph-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@alphalph.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@alphalph.sty\endcsname \ProvidesPackage{alphalph}% - [2010/04/18 v2.3 Converting numbers to letters (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/04/18 v2.3 Converting numbers to letters (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AlPh@AtEnd{% \AlPh@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -127,12 +142,12 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | +\edef\AlPh@AtEnd{\AlPh@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax @@ -446,7 +461,7 @@ } \newalphalph\AlphAlph\alphalph@Alph{26} \newalphalph\alphalph\alphalph@alph{26} -\AlPh@AtEnd +\AlPh@AtEnd% \endinput %% %% End of file `alphalph.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 1575b8f4ce7..0c8aea8c6fe 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% atbegshi-example1.tex, atbegshi-example2.tex, %% atbegshi-test1.tex, atbegshi-test2.tex, atbegshi-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@atbegshi.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2010/03/25 v1.12 At begin shipout hook (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/01/30 v1.15 At begin shipout hook (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AtBegShi@AtEnd{% \AtBegShi@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -125,13 +140,21 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^(superscript) \TMP@EnsureCode{96}{12}% ` +\edef\AtBegShi@AtEnd{\AtBegShi@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input ltxcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ltxcmds}[2010/03/01]% \else \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{ltxcmds}[2010/03/01]% @@ -148,11 +171,9 @@ \ltx@zero \fi \fi - \errmessage{% - Package atbegshi: \string#1\space - is already defined% - }% - \endgroup + \@PackageError{atbegshi}{% + \string#1\space is already defined% + }\@ehd \fi }% \else @@ -283,12 +304,15 @@ X \endgroup \ifAtBegShi@Discarded \else #1% - \ifvoid\AtBeginShipoutBox - \@PackageWarning{atbegshi}{% - Shipout box was voided by hook,\MessageBreak - ignoring shipout box% - }% - \AtBeginShipoutDiscard + \ifAtBegShi@Discarded + \else + \ifvoid\AtBeginShipoutBox + \@PackageWarning{atbegshi}{% + Shipout box was voided by hook,\MessageBreak + ignoring shipout box% + }% + \AtBeginShipoutDiscard + \fi \fi \fi } @@ -405,14 +429,13 @@ X \endgroup \def\AtBegShi@AbortIfUndefined#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname#1\endcsname\relax - \AtBegShi@AtEnd - \expandafter\endinput + \expandafter\AtBegShi@AtEnd \fi } -\AtBegShi@AbortIfUndefined{currentgrouplevel} -\AtBegShi@AbortIfUndefined{AtBeginDocument} -\AtBegShi@AbortIfUndefined{@ifpackageloaded} -\AtBegShi@AbortIfUndefined{@ifclassloaded} +\AtBegShi@AbortIfUndefined{currentgrouplevel}% +\AtBegShi@AbortIfUndefined{AtBeginDocument}% +\AtBegShi@AbortIfUndefined{@ifpackageloaded}% +\AtBegShi@AbortIfUndefined{@ifclassloaded}% \def\AtBegShi@PatchCrop{% \begingroup \def\AtBegShi@Crop@shipout{% @@ -666,7 +689,7 @@ X \endgroup }{% \AtBeginDocument{\AtBegShi@PatchMemoir}% } -\AtBegShi@AtEnd +\AtBegShi@AtEnd% \endinput %% %% End of file `atbegshi.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty index d00ab3b8fc1..1ee9aa77216 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% bigintcalc-test1.tex, bigintcalc-test2.tex, %% bigintcalc-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@bigintcalc.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2007/11/11 v1.1 Expandable big integer calculations (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/01/30 v1.2 Expandable big integer calculations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\BIC@AtEnd{% \BIC@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{36}{14}% $ (comment!) @@ -130,9 +145,11 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{11}% : (letter!) \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{14}% ? (comment!) +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\BIC@AtEnd{\BIC@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname BIC@TestMode\endcsname\relax \else @@ -156,9 +173,14 @@ \x{ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input pdftexcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{pdftexcmds}[2007/11/11]% \else - \RequirePackage{pdftexcmds}[2007/11/11]% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@escapehex\endcsname\relax @@ -1795,7 +1817,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \BIC@AfterFi{ #1#2}% \BIC@Fi } -\BIC@AtEnd +\BIC@AtEnd% \endinput %% %% End of file `bigintcalc.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty index ff09416ccff..f36c56b37b8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -33,14 +33,18 @@ %% bitset.sty, bitset.pdf, bitset.ins, bitset.drv, bitset-test1.tex, %% bitset-test2.tex, bitset-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@bitset.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@bitset.sty\endcsname \ProvidesPackage{bitset}% - [2007/09/28 v1.0 Data type bit set (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/01/30 v1.1 Data type bit set (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\BitSet@AtEnd{% \BitSet@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -129,10 +144,12 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{11}% : (letter!) \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{14}% ? (comment!) +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\BitSet@AtEnd{\BitSet@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname BitSet@TestMode\endcsname\relax \else @@ -141,9 +158,15 @@ ? \let\BitSet@@TestMode\BitSet@TestMode \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input intcalc.sty\relax - \input bigintcalc.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{intcalc}[2007/09/27]% + \TMP@RequirePackage{bigintcalc}[2007/09/27]% \else \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{intcalc}[2007/09/27]% @@ -1415,7 +1438,7 @@ \fi \BitSet@Fi } -\BitSet@AtEnd +\BitSet@AtEnd% \endinput %% %% End of file `bitset.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index e98547785c6..452e10f33ea 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2010 by +%% Copyright (C) 2007, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% catchfile-test1.tex, catchfile-test2.tex, %% catchfile-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@catchfile.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,37 +100,48 @@ \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2010/04/28 v1.5 Catches the contents of a file (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/03/01 v1.6 Catches the contents of a file (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\CatchFile@AtEnd{% \CatchFile@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\CatchFile@AtEnd{\CatchFile@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax @@ -144,9 +161,8 @@ package loading is aborted% }\@ehd \endgroup - \CatchFile@AtEnd - \expandafter\endinput - \fi + \expandafter\CatchFile@AtEnd + \fi% \endgroup \begingroup \def\Check#1#2#3#4\endgroup{% @@ -168,8 +184,7 @@ package loading is aborted% }\@ehd \csname endgroup\endcsname - \CatchFile@AtEnd - \endinput + \CatchFile@AtEnd% \endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax @@ -272,7 +287,7 @@ }% }% }% - #3% + #3\relax \expandafter\expandafter\expandafter\CatchFile@Do \CatchFile@Input\CatchFile@File\relax \fi @@ -285,7 +300,7 @@ \lowercase{\endgroup \def\CatchFile@EOF{AB}% } -\CatchFile@AtEnd +\CatchFile@AtEnd% \endinput %% %% End of file `catchfile.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty index 818af148638..72647e3ad65 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty @@ -30,21 +30,24 @@ %% %% This work consists of the main source file embedfile.dtx %% and the derived files -%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, -%% \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty, -%% embedfile-example-plain.tex, +%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, \immediate \write 18 {mkdir -p texmf/,}\edef {texmf/,} +%% dtx-attach.sty, embedfile-example-plain.tex, %% embedfile-example-collection.tex, embedfile-test1.tex, %% embedfile-test2.tex, embedfile-test3.tex, %% embedfile-test4.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@embedfile.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -52,7 +55,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -64,21 +66,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -97,29 +102,38 @@ \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2010/03/01 v2.5 embed files into PDF (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v2.5 embed files into PDF (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname EmFi@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\EmFi@AtEnd{% \EmFi@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -129,11 +143,11 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\EmFi@AtEnd{\EmFi@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\EmFi@RequirePackage#1[#2]{% @@ -155,9 +169,8 @@ Currently other drivers are not supported. % Package loading is aborted.% }% - \EmFi@AtEnd - \expandafter\endinput -\fi + \expandafter\EmFi@AtEnd +\fi% \EmFi@RequirePackage{pdftexcmds}[2007/11/11] \EmFi@RequirePackage{ltxcmds}[2010/03/01] \EmFi@RequirePackage{kvsetkeys}[2010/03/01] @@ -169,9 +182,8 @@ }{% At least version 1.30 is necessary. Package loading is aborted.% }% - \EmFi@AtEnd - \expandafter\endinput -\fi + \expandafter\EmFi@AtEnd +\fi% \EmFi@RequirePackage{pdfescape}[2007/11/11] \def\EmFi@temp#1{% \expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}% @@ -735,7 +747,7 @@ \else \AtEndDocument{\embedfilefinish}% \fi -\EmFi@AtEnd +\EmFi@AtEnd% \endinput %% %% End of file `embedfile.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty index 7eaff14511a..2fec6444d2f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty @@ -32,14 +32,18 @@ %% and the derived files %% engord.sty, engord.pdf, engord.ins, engord.drv, engord-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@engord.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -47,7 +51,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -59,21 +62,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -92,29 +98,38 @@ \fi \expandafter\x\csname ver@engord.sty\endcsname \ProvidesPackage{engord}% - [2010/03/01 v1.8 Provides English ordinal numbers (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v1.8 Provides English ordinal numbers (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\EO@AtEnd{% \EO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{36}{3}% $ @@ -123,8 +138,11 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^(superscript) \TMP@EnsureCode{96}{12}% ` +\edef\EO@AtEnd{\EO@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newcommand\endcsname\relax \def\EO@def{\def}% @@ -242,7 +260,7 @@ #2\EO@ord{#1}% \fi } -\EO@AtEnd +\EO@AtEnd% \endinput %% %% End of file `engord.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty b/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty new file mode 100644 index 00000000000..0f828ad54cf --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/eolgrab.sty @@ -0,0 +1,220 @@ +%% +%% This is file `eolgrab.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% eolgrab.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file eolgrab.dtx +%% and the derived files +%% eolgrab.sty, eolgrab.pdf, eolgrab.ins, eolgrab.drv, +%% eolgrab-example-ltx.tex, eolgrab-example-env.tex, +%% eolgrab-example-sec.tex, eolgrab-test1.tex, +%% eolgrab-test2.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@eolgrab.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{eolgrab}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@eolgrab.sty\endcsname +\ProvidesPackage{eolgrab}% + [2011/01/12 v1.0 Grab line end delimited argument (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname eolgrab@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\eolgrab@AtEnd{% + \eolgrab@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ +\edef\eolgrab@AtEnd{\eolgrab@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ltxcmds.sty\relax + \input infwarerr.sty\relax +\else + \RequirePackage{ltxcmds}[2010/12/04]% + \RequirePackage{infwarerr}[2010/04/08]% +\fi +\ltx@IfUndefined{@ifdefinable}{% + \def\eolgrab@ifdefinable#1#2{% + \ltx@ifundefined{#1}{#2}{% + \@PackageError{eolgrab}{% + Command \ltx@backslashchar#1 already defined% + }\@ehc + }% + }% +}{% + \def\eolgrab@ifdefinable#1{% + \expandafter\@ifdefinable\csname#1\endcsname + }% +} +\eolgrab@ifdefinable{eolgrab}{% + \ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\eolgrab#1% + }{% + \newcommand\eolgrab{}% + \DeclareRobustCommand*\eolgrab + }% + }{% + \protected\def\eolgrab#1% + }{% + \begingroup + \endlinechar=13 % + \catcode13=\ltx@active + \eolgrab@{#1}% + }% +} +\eolgrab@ifdefinable{eolgrabopt}{% + \ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\eolgrabopt#1% + }{% + \newcommand\eolgrabopt{}% + \DeclareRobustCommand*\eolgrabopt + }% + }{% + \protected\def\eolgrabopt#1% + }{% + \begingroup + \endlinechar=13 % + \catcode13=\ltx@active + \eolgrab@opt{#1}% + }% +} +\begingroup + \catcode13=\ltx@active % +\ltx@firstofone{\endgroup % + \def\eolgrab@#1#2^^M{% + \endgroup % + #1{#2}% + }% + \def\eolgrab@opt#1#2^^M{% + \endgroup % + \ltx@ifempty{#2}{% + #1% + }{% + #1[{#2}]% + }% + }% +}% +\eolgrab@AtEnd% +\endinput +%% +%% End of file `eolgrab.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty index 2814ef24ff2..f83d7528a0f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2010 by +%% Copyright (C) 2007, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex, %% etexcmds-test4.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@etexcmds.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,38 +100,53 @@ \fi \expandafter\x\csname ver@etexcmds.sty\endcsname \ProvidesPackage{etexcmds}% - [2010/01/28 v1.3 Prefix for e-TeX command names (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\etexcmds@AtEnd{% \etexcmds@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \edef\etexcmds@AtEnd{% \etexcmds@AtEnd \escapechar\the\escapechar\relax + \noexpand\endinput } \escapechar=92 % backslash \def\etexcmds@newif#1{% @@ -143,9 +164,17 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ifluatex}[2010/03/01]% \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ifluatex}[2010/03/01]% \fi \etexcmds@newif{unexpanded} \begingroup @@ -163,19 +192,38 @@ \etex@unexpandedtrue \else \edef\y{\meaning\@@unexpanded}% - \ifx\y + \ifx\x\y \endgroup \let\etex@unexpanded\@@unexpanded \etex@unexpandedtrue \else - \endgroup - \@PackageInfoNoLine{etexcmds}{% - Could not find \string\unexpanded.\MessageBreak - That can mean that you are not using e-TeX or\MessageBreak - that some package has redefined \string\unexpanded.\MessageBreak - In the latter case, load this package earlier% - }% - \etex@unexpandedfalse + \ifluatex + \ifnum\luatexversion<36 % + \else + \begingroup + \directlua{% + tex.enableprimitives('etex@',{'unexpanded'})% + }% + \global\let\etex@unexpanded\etex@unexpanded + \endgroup + \fi + \fi + \edef\y{\meaning\etex@unexpanded}% + \ifx\x\y + \endgroup + \etex@unexpandedtrue + \else + \endgroup + \@PackageInfoNoLine{etexcmds}{% + Could not find \string\unexpanded.\MessageBreak + That can mean that you are not using e-TeX or% + \MessageBreak + that some package has redefined \string\unexpanded.% + \MessageBreak + In the latter case, load this package earlier% + }% + \etex@unexpandedfalse + \fi \fi \fi \fi @@ -195,23 +243,42 @@ \etex@expandedtrue \else \edef\y{\meaning\@@expanded}% - \ifx\y + \ifx\x\y \endgroup \let\etex@expanded\@@expanded \etex@expandedtrue \else - \endgroup - \@PackageInfoNoLine{etexcmds}{% - Could not find \string\expanded.\MessageBreak - That can mean that you are not using pdfTeX 1.50 or\MessageBreak - that some package has redefined \string\expanded.\MessageBreak - In the latter case, load this package earlier% - }% - \etex@expandedfalse + \ifluatex + \ifnum\luatexversion<36 % + \else + \begingroup + \directlua{% + tex.enableprimitives('etex@',{'expanded'})% + }% + \global\let\etex@expanded\etex@expanded + \endgroup + \fi + \fi + \edef\y{\meaning\etex@expanded}% + \ifx\x\y + \endgroup + \etex@expandedtrue + \else + \endgroup + \@PackageInfoNoLine{etexcmds}{% + Could not find \string\expanded.\MessageBreak + That can mean that you are not using pdfTeX 1.50 or% + \MessageBreak + that some package has redefined \string\expanded.% + \MessageBreak + In the latter case, load this package earlier% + }% + \etex@expandedfalse + \fi \fi \fi \fi -\etexcmds@AtEnd +\etexcmds@AtEnd% \endinput %% %% End of file `etexcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/gettitlestring.sty b/Master/texmf-dist/tex/generic/oberdiek/gettitlestring.sty index 6adf5be5ba0..e6a1ea8b015 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/gettitlestring.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/gettitlestring.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2009 by +%% Copyright (C) 2009, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% gettitlestring.drv, gettitlestring-test1.tex, %% gettitlestring-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@gettitlestring.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,38 +100,47 @@ \fi \expandafter\x\csname ver@gettitlestring.sty\endcsname \ProvidesPackage{gettitlestring}% - [2009/12/18 v1.3 Cleanup title references (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/12/03 v1.4 Cleanup title references (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname GTS@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\GTS@AtEnd{% \GTS@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] +\edef\GTS@AtEnd{\GTS@AtEnd\noexpand\endinput} \RequirePackage{kvoptions}[2009/07/17] \SetupKeyvalOptions{% family=gettitlestring,% @@ -182,6 +197,7 @@ \let\raggedleft\@empty \let\centering\@empty \let\protect\@unexpandable@protect + \let\enit@format\@empty % package enumitem } \providecommand*{\GTS@DisableHook}{} \def\GetTitleStringDisableCommands{% @@ -244,6 +260,7 @@ \GTS@TestLeft\markboth\GTS@CdrThree \GTS@TestLeft\@mkboth\GTS@CdrThree \GTS@TestLeft\addcontentsline\GTS@CdrFour + \GTS@TestLeft\enit@format\GTS@Cdr % package enumitem } \def\GTS@RemoveRight{% \toks@{}% @@ -282,7 +299,7 @@ \GTS@TestRightLabel#3\GTS@Nil\@nil }% } -\GTS@AtEnd +\GTS@AtEnd% \endinput %% %% End of file `gettitlestring.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty new file mode 100644 index 00000000000..717afa7030e --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -0,0 +1,9211 @@ +%% +%% This is file `hobsub-generic.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hobsub.dtx (with options: `generic,preamble,infwarerr') +%% infwarerr.dtx (with options: `package') +%% hobsub.dtx (with options: `post,ltxcmds') +%% ltxcmds.dtx (with options: `package') +%% hobsub.dtx (with options: `post,ifluatex') +%% ifluatex.dtx (with options: `package') +%% hobsub.dtx (with options: `post,ifvtex') +%% ifvtex.dtx (with options: `package') +%% hobsub.dtx (with options: `post,intcalc') +%% intcalc.dtx (with options: `package') +%% hobsub.dtx (with options: `post,ifpdf') +%% ifpdf.dtx (with options: `package') +%% hobsub.dtx (with options: `post,etexcmds') +%% etexcmds.dtx (with options: `package') +%% hobsub.dtx (with options: `post,kvsetkeys') +%% kvsetkeys.dtx (with options: `package') +%% hobsub.dtx (with options: `post,kvdefinekeys') +%% kvdefinekeys.dtx (with options: `package') +%% hobsub.dtx (with options: `post,luatex-loader') +%% luatex.dtx (with options: `loader') +%% hobsub.dtx (with options: `post,pdftexcmds') +%% pdftexcmds.dtx (with options: `package') +%% hobsub.dtx (with options: `post,pdfescape') +%% pdfescape.dtx (with options: `package') +%% hobsub.dtx (with options: `post,bigintcalc') +%% bigintcalc.dtx (with options: `package') +%% hobsub.dtx (with options: `post,bitset') +%% bitset.dtx (with options: `package') +%% hobsub.dtx (with options: `post,uniquecounter') +%% uniquecounter.dtx (with options: `package') +%% hobsub.dtx (with options: `post,atend') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file hobsub.dtx +%% and the derived files +%% hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty, +%% hobsub-hyperref.sty, hobsub-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@hobsub-generic.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{hobsub-generic}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@hobsub-generic.sty\endcsname +\ProvidesPackage{hobsub-generic}% + [2011/01/30 v1.0 Bundle oberdiek, subset generic (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOBsub@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOBsub@AtEnd{% + \HOBsub@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\edef\HOBsub@AtEnd{\HOBsub@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ver@hobsub.sty\endcsname\relax +\else + \expandafter\hobsub@GobbleRemainingPackage +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname HOBsub@OrgEndinput\endcsname\relax + \let\HOBsub@OrgEndinput\endinput +\fi +\def\hobsub@GobbleRemainingPackage{% + \begingroup + \catcode92=14 % backslash: comment + \catcode32=14 % space: comment + \catcode123=14 % left brace: comment + \catcode125=14 % right brace: comment + \catcode60=3 % less: math + \catcode62=4 % greater: align + \endlinechar=-1 % + \HOBsub@GobbleRemainingPackage +} +\catcode60=3 % less: dollar +\catcode62=4 % greater: align +\long\def\HOBsub@GobbleRemainingPackage#1<hobsub>{% + \endgroup +} +\catcode60=12 % less: other +\catcode62=12 % greater: other +\def\hobsub@StartPackage#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \let\HOBsub@OrgCurrName\@currname + \let\HOBsub@OrgCurrExt\@currext + \csname @pushfilename\endcsname + \def\@currname{#1}% + \def\@currext{sty}% + \expandafter\def\csname\@currname.\@currext-h@@k\endcsname{}% + \let\endinput\hobsub@GobbleRemainingPackage + \def\hobsub@StopPackage{% + \let\hobsub@StopPackage\relax + \HOBsub@StopPackage + }% + \hobsub@AddToFileList{#1.sty}% + \else + \hobsub@Info{hobsub}{Skipping package `#1' (already loaded)}% + \let\hobsub@StopPackage\relax + \expandafter\hobsub@GobbleRemainingPackage + \fi +} +\let\hobsub@StopPackage\relax +\def\hobsub@Info#1#2{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @PackageInfoNoLine\endcsname\relax + \immediate\write-1{Package #1 Info: #2.}% + \else + \let\hobsub@Info\@PackageInfoNoLine + \hobsub@Info{#1}{#2}% + \fi +} +\def\HOBsub@StopPackage{% + \csname\@currname.\@currext-h@@k\endcsname + \let\endinput\HOBsub@OrgEndinput + \csname @popfilename\endcsname + \let\@currname\HOBsub@OrgCurrName + \let\@currext\HOBsub@OrgCurrExt +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname @addtofilelist\endcsname\relax + \def\hobsub@AddToFileList#1{}% +\else + \def\hobsub@AddToFileList#1{% + \@addtofilelist{#1}% + }% +\fi +\hobsub@GobbleRemainingPackage +<hobsub> +\hobsub@StartPackage{hobsub}% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ProvidesPackage\endcsname\relax + \immediate\write-1{% + Package: hobsub 2011/01/30 v1.0 Subsetting bundle oberdiek (HO)% + }% +\else + \ProvidesPackage{hobsub}% + [2011/01/30 v1.0 Subsetting bundle oberdiek (HO)]% +\fi + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{infwarerr} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@infwarerr.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{infwarerr}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@infwarerr.sty\endcsname +\ProvidesPackage{infwarerr}% + [2010/04/08 v1.3 Providing info/warning/message (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname InfWarErr@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\InfWarErr@AtEnd{% + \InfWarErr@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ +\edef\InfWarErr@AtEnd{\InfWarErr@AtEnd\noexpand\endinput} +\begingroup + \let\x=Y% + \def\check#1{% + \@check{Generic}{#1}% + \@check{Package}{#1}% + \@check{Class}{#1}% + }% + \def\@check#1#2{% + \expandafter\ifx\csname #1#2\endcsname\relax + \let\x=N% + \fi + }% + \check{Info}% + \check{Warning}% + \check{Error}% + \@check{Package}{WarningNoLine}% + \@check{Class}{WarningNoLine}% + \@check{}{@ehc}% + \@check{}{@ehd}% +\expandafter\endgroup +\ifx\x Y% + \let\@PackageInfo\PackageInfo + \def\@PackageInfoNoLine#1#2{% + \PackageInfo{#1}{#2\@gobble}% + }% + \let\@ClassInfo\ClassInfo + \def\@ClassInfoNoLine#1#2{% + \ClassInfo{#1}{#2\@gobble}% + }% + \let\@PackageWarning\PackageWarning + \let\@PackageWarningNoLine\PackageWarningNoLine + \let\@ClassWarning\ClassWarning + \let\@ClassWarningNoLine\ClassWarningNoLine + \let\@PackageError\PackageError + \let\@ClassError\ClassError + \expandafter\InfWarErr@AtEnd +\fi% +\begingroup\expandafter\endgroup +\ifcase\expandafter\ifx\csname inputlineno\endcsname\relax + 0 % + \else + \ifnum\inputlineno<0 % + 0 % + \else + 1 % + \fi + \fi + \def\InfWarErr@online{}% +\else + \def\InfWarErr@online{ on input line \the\inputlineno}% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \def\InfWarErr@protected{}% +\else + \let\InfWarErr@protected\protected +\fi +\chardef\InfWarErr@unused=16 % +\def\InfWarErr@ehc{% + Try typing \space <return> \space to proceed.\MessageBreak + If that doesn't work, type \space X <return> \space to quit.% +} +\def\InfWarErr@ehd{% + You're in trouble here. \space\@ehc +} +\InfWarErr@protected\def\InfWarErr@GenericInfo#1#2{% + \begingroup + \let\on@line\InfWarErr@online + \long\def\@gobble##1{}% + \def\space{ }% + \def\@spaces{\space\space\space\space}% + \def\MessageBreak{^^J#1}% + \newlinechar=10 % + \escapechar=92 % + \immediate\write-1{#2\on@line.}% + \endgroup +} +\InfWarErr@protected\def\InfWarErr@GenericWarning#1#2{% + \begingroup + \let\on@line\InfWarErr@online + \long\def\@gobble##1{}% + \def\space{ }% + \def\@spaces{\space\space\space\space}% + \def\MessageBreak{^^J#1}% + \newlinechar=10 % + \escapechar=92 % + \immediate\write\InfWarErr@unused{^^J#2\on@line.^^J}% + \endgroup +} +\InfWarErr@protected\def\InfWarErr@GenericError#1#2#3#4{% + \begingroup + \immediate\write\InfWarErr@unused{}% + \def\space{ }% + \def\@spaces{\space\space\space\space}% + \let\@ehc\InfWarErr@ehc + \let\@ehd\InfWarErr@ehd + \let\on@line\InfWarErr@online + \def\MessageBreak{^^J}% + \newlinechar=10 % + \escapechar=92 % + \edef\InfWarErr@help{\noexpand\errhelp{#4}}% + \InfWarErr@help + \def\MessageBreak{^^J#1}% + \errmessage{% + #2.^^J^^J% + #3^^J% + Type \space H <return> \space for immediate help.^^J ...^^J% + }% + \endgroup +} +\def\@PackageInfo#1#2{% + \InfWarErr@GenericInfo{% + (#1) \@spaces\@spaces\@spaces + }{% + Package #1 Info: #2% + }% +} +\def\@PackageInfoNoLine#1#2{% + \@PackageInfo{#1}{#2\@gobble}% +} +\def\@ClassInfo#1#2{% + \InfWarErr@GenericInfo{% + (#1) \space\space\@spaces\@spaces + }{% + Class #1 Info: #2% + }% +} +\def\@ClassInfoNoLine#1#2{% + \@ClassInfo{#1}{#2\@gobble}% +} +\def\@PackageWarning#1#2{% + \InfWarErr@GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces + }{% + Package #1 Warning: #2% + }% +} +\def\@PackageWarningNoLine#1#2{% + \@PackageWarning{#1}{#2\@gobble}% +} +\def\@ClassWarning#1#2{% + \InfWarErr@GenericWarning{% + (#1) \space\@spaces\@spaces\@spaces + }{% + Class #1 Warning: #2% + }% +} +\def\@ClassWarningNoLine#1#2{% + \@ClassWarning{#1}{#2\@gobble}% +} +\def\@PackageError#1#2#3{% + \InfWarErr@GenericError{% + (#1)\@spaces\@spaces\@spaces\@spaces + }{% + Package #1 Error: #2% + }{% + See the #1 package documentation for explanation.% + }{#3}% +} +\def\@ClassError#1#2#3{% + \InfWarErr@GenericError{% + (#1) \space\@spaces\@spaces\@spaces + }{% + Class #1 Error: #2% + }{% + See the #1 class documentation for explanation.% + }{#3}% +} +\InfWarErr@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{ltxcmds} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@ltxcmds.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{ltxcmds}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@ltxcmds.sty\endcsname +\ProvidesPackage{ltxcmds}% + [2011/03/16 v1.18 LaTeX kernel commands for general use (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname LTXcmds@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\LTXcmds@AtEnd{% + \LTXcmds@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{12}% ^ (superscript) (!) +\TMP@EnsureCode{124}{12}% | +\edef\LTXcmds@AtEnd{\LTXcmds@AtEnd\noexpand\endinput} +\chardef\ltx@zero=0 % +\chardef\ltx@one=1 % +\chardef\ltx@two=2 % +\chardef\ltx@active=13 % +\chardef\ltx@cclv=255 % +\def\ltx@minusone{% + -\ltx@one +} +\long\def\ltx@gobble#1{} +\long\def\ltx@gobbletwo#1#2{} +\long\def\ltx@gobblethree#1#2#3{} +\long\def\ltx@gobblefour#1#2#3#4{} +\def\ltx@GobbleNum#1{% + \romannumeral + \csname ltx@zero% + \expandafter\LTXcmds@GobbleNum + \romannumeral\LTXcmds@num{#1}000{m\endcsname}% +} +\def\LTXcmds@GobbleNum#1{% + \csname LTXcmds@G#1\LTXcmds@GobbleNum +} +\long\def\LTXcmds@Gm#1{% + \endcsname +} +\long\def\ltx@firstofone#1{#1} +\long\def\ltx@firstoftwo#1#2{#1} +\long\def\ltx@secondoftwo#1#2{#2} +\long\def\ltx@firstofthree#1#2#3{#1} +\long\def\ltx@secondofthree#1#2#3{#2} +\long\def\ltx@thirdofthree#1#2#3{#3}% +\long\def\ltx@firstoffour#1#2#3#4{#1} +\long\def\ltx@secondoffour#1#2#3#4{#2} +\long\def\ltx@thirdoffour#1#2#3#4{#3}% +\long\def\ltx@fourthoffour#1#2#3#4{#4}% +\long\def\ltx@car#1#2\@nil{#1} +\long\def\ltx@cdr#1#2\@nil{#2} +\long\def\ltx@carzero#1\@nil{}% +\long\def\ltx@cdrzero#1\@nil{#1}% + +\long\def\ltx@cartwo#1#2#3\@nil{#1#2} +\long\def\ltx@cdrtwo#1#2#3\@nil{#3} +\long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3} +\long\def\ltx@cdrthree#1#2#3#4\@nil{#4} +\long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4} +\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5} +\def\ltx@CarNum#1{% + \romannumeral + \csname LTXcmds@CarNumFinish% + \expandafter\LTXcmds@CarNum + \romannumeral\LTXcmds@num{#1}000{x\endcsname}% +} +\def\LTXcmds@CarNum#1{% + \csname LTXcmds@C#1\LTXcmds@CarNum +} +\long\def\LTXcmds@Cm#1#2{% + \endcsname{#1#2}% +} +\def\LTXcmds@Cx#1{% + \endcsname{}% +} +\long\def\LTXcmds@CarNumFinish#1#2\@nil{% + \ltx@zero + #1% +} +\def\ltx@CdrNum#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\LTXcmds@CdrNum + \ltx@GobbleNum{#1}% +} +\long\def\LTXcmds@CdrNum#1\@nil{ #1}% +\long\def\ltx@ReturnAfterFi#1\fi{\fi#1} +\long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1} +\def\ltx@empty{} +\def\ltx@space{ } +\begingroup + \lccode`0=`\%\relax +\lowercase{\endgroup + \def\ltx@percentchar{0}% +} +\begingroup + \lccode`0=`\\\relax +\lowercase{\endgroup + \def\ltx@backslashchar{0}% +} +\begingroup + \lccode`0=`\#\relax +\lowercase{\endgroup + \def\ltx@hashchar{0}% +} +\begingroup + \lccode`0=`\{\relax +\lowercase{\endgroup + \def\ltx@leftbracechar{0}% +} +\begingroup + \lccode`0=`\}\relax +\lowercase{\endgroup + \def\ltx@rightbracechar{0}% +} +\def\ltx@newif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\LTXcmds@newif\string#1\@nil +} +\begingroup + \escapechar=-1 % +\expandafter\endgroup +\expandafter\def\expandafter\LTXcmds@newif\string\if#1\@nil{% + \expandafter\edef\csname#1true\endcsname{% + \let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iftrue + }% + \expandafter\edef\csname#1false\endcsname{% + \let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iffalse + }% + \csname#1false\endcsname +} +\def\ltx@newglobalif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\LTXcmds@newglobalif\string#1\@nil +} +\begingroup + \escapechar=-1 % +\expandafter\endgroup +\expandafter +\def\expandafter\LTXcmds@newglobalif\string\if#1\@nil{% + \expandafter\edef\csname#1true\endcsname{% + \global\let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iftrue + }% + \expandafter\edef\csname#1false\endcsname{% + \global\let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iffalse + }% + \csname#1false\endcsname +} +\def\ltx@LocalExpandAfter{% + \begingroup + \expandafter\expandafter\expandafter + \endgroup + \expandafter +} +\ltx@LocalExpandAfter +\ifx\csname ifcsname\endcsname\relax + \def\ltx@ifundefined#1{% + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \def\ltx@IfUndefined#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \expandafter\ltx@gobble +\else + \expandafter\ltx@firstofone +\fi +{% + \def\ltx@ifundefined#1{% + \ifcsname #1\endcsname + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\expandafter\expandafter\ltx@firstoftwo + \else + \expandafter\expandafter\expandafter\ltx@secondoftwo + \fi + \else + \expandafter\ltx@firstoftwo + \fi + }% + \let\ltx@IfUndefined\ltx@ifundefined +} +\def\ltx@RemovePrefix#1>{} +\def\ltx@StripPrefix{% + \expandafter\ltx@RemovePrefix +} +\def\ltx@onelevel@sanitize#1{% + \edef#1{% + \expandafter + \ltx@RemovePrefix\meaning#1% + }% +} +\def\ltx@clsextension{cls} +\def\ltx@pkgextension{sty} +\def\ltx@iffileloaded#1{% + \ltx@ifundefined{ver@#1}\ltx@secondoftwo\ltx@firstoftwo +} +\def\ltx@ifclassloaded#1{% + \ltx@iffileloaded{#1.\ltx@clsextension}% +} +\def\ltx@ifpackageloaded#1{% + \ltx@iffileloaded{#1.\ltx@pkgextension}% +} +\def\ltx@iffilelater#1#2{% + \ltx@iffileloaded{#1}{% + \expandafter\LTXcmds@IfLater\expandafter{% + \number + \expandafter\expandafter\expandafter\LTXcmds@ParseVersion + \expandafter\expandafter\expandafter{% + \csname ver@#1\endcsname + }% + \expandafter}\expandafter{% + \number + \expandafter\LTXcmds@ParseVersion\expandafter{#2}% + }% + }\ltx@secondoftwo +} +\def\LTXcmds@IfLater#1#2{% + \ifcase 0% + \ifnum#1<19940101 % + \else + \ifnum#2<19940101 % + \else + \ifnum#2>#1 % + \else + 1% + \fi + \fi + \fi + \ltx@space + \expandafter\ltx@secondoftwo + \else + \expandafter\ltx@firstoftwo + \fi +} +\def\ltx@ifclasslater#1{% + \ltx@iffilelater{#1.\ltx@clsextension}% +} +\def\ltx@ifpackagelater#1{% + \ltx@iffilelater{#1.\ltx@pkgextension}% +} +\ltx@IfUndefined{pdfmatch}{% + \def\LTXcmds@ParseVersion#1{% + \LTXcmds@@ParseVersion#10000/00/00\@nil + }% + \def\LTXcmds@@ParseVersion#1#2#3#4/#5#6/#7#8#9\@nil{% + #1#2#3#4#5#6#7#8% + }% +}{% + \def\LTXcmds@ParseVersion#1{% + \ifnum\pdfmatch{% + ^% + (199[4-9]|[2-9][0-9][0-9][0-9])/% + (0[1-9]|1[0-2])/% + (0[1-9]|[1-2][0-9]|3[0-1])% + }{#1}=1 % + \ltx@StripPrefix\pdflastmatch1 % + \ltx@StripPrefix\pdflastmatch2 % + \ltx@StripPrefix\pdflastmatch3 % + \else + 0% + \fi + }% +} +\long\def\ltx@GlobalAppendToMacro#1#2{% + \ifx\ltx@undefined#1% + \let#1\ltx@empty + \else + \ifx\relax#1% + \let#1\ltx@empty + \fi + \fi + \begingroup + \toks0\expandafter{#1#2}% + \xdef#1{\the\toks0}% + \endgroup +} +\long\def\ltx@LocalAppendToMacro#1#2{% + \global\let\LTXcmds@gtemp#1% + \ifx\ltx@undefined\LTXcmds@gtemp + \global\let\LTXcmds@gtemp\ltx@empty + \else + \ifx\relax\LTXcmds@gtemp + \global\letLTXcmds@gtemp\ltx@empty + \fi + \fi + \begingroup + \toks0\expandafter{\LTXcmds@gtemp#2}% + \xdef\LTXcmds@gtemp{\the\toks0}% + \endgroup + \let#1\LTXcmds@gtemp +} +\long\def\ltx@ifnextchar#1#2#3{% + \begingroup + \let\LTXcmds@CharToken= #1\relax + \toks\ltx@zero{#2}% + \toks\ltx@two{#3}% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar +} +\def\LTXcmds@ifnextchar{% + \ifx\LTXcmds@LetToken\LTXcmds@CharToken + \expandafter\endgroup\the\toks\expandafter\ltx@zero + \else + \ifx\LTXcmds@LetToken\LTXcmds@SpaceToken + \expandafter\expandafter\expandafter\LTXcmds@@ifnextchar + \else + \expandafter\endgroup\the\toks + \expandafter\expandafter\expandafter\ltx@two + \fi + \fi +} +\begingroup + \def\x#1{\endgroup + \def\LTXcmds@@ifnextchar#1{% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar + }% + }% +\x{ } +\begingroup + \def\x#1{\endgroup + \let\LTXcmds@SpaceToken= #1% + }% +\x{ } +\ltx@IfUndefined{quitvmode}{% + \ltx@IfUndefined{leavevmode}{% + \ltx@IfUndefined{voidb@x}{% + \ltx@IfUndefined{newbox}{% + \def\ltx@leavevmode{% + \begingroup + \setbox\ltx@zero=\hbox{}% + \begingroup + \setbox\ltx@zero=\hbox{\box\ltx@zero}% + \endgroup + \unhbox\ltx@zero + \endgroup + }% + }{% + \csname newbox\endcsname\LTXcmds@VoidBox + \ifvoid\LTXcmds@VoidBox + \else + \setbox\LTXcmds@VoidBox=\hbox{}% + \begingroup + \setbox\LTXcmds@VoidBox=\hbox{\box\LTXcmds@VoidBox}% + \endgroup + \fi + \def\ltx@leavevmode{\unhbox\LTXcmds@VoidBox}% + }% + }{% + \def\ltx@leavevmode{\unhbox\voidb@x}% + }% + }{% + \let\ltx@leavevmode\leavevmode + }% +}{% + \let\ltx@leavevmode\quitvmode +} +\def\ltx@mbox{% + \ltx@leavevmode + \hbox +} +\ltx@IfUndefined{numexpr}{% + \def\LTXcmds@num#1{% + \expandafter\ltx@firstofone\expandafter{% + \number#1% + }% + }% +}{% + \def\LTXcmds@num#1{% + \expandafter\ltx@firstofone\expandafter{% + \the\numexpr#1% + }% + }% +} +\ltx@IfUndefined{detokenize}{% + \def\LTXcmds@temp#1{% + \long\def\ltx@ifempty##1{% + \romannumeral0% + \iffalse{\fi + \expandafter\ltx@gobble\expandafter{% + \expandafter{\string##1}% + \expandafter\ltx@gobble\string + }% + \expandafter\ltx@firstofthree\expandafter + {\iffalse}\fi + \expandafter#1\ltx@secondoftwo + }% + \expandafter#1\ltx@firstoftwo + }% + \long\def\ltx@ifblank##1{% + \romannumeral0% + \iffalse{\fi + \expandafter\expandafter\expandafter\ltx@gobble + \expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter{% + \expandafter\string\ltx@gobble##1.% + }% + \expandafter\ltx@gobble\string + }% + \expandafter\ltx@firstofthree\expandafter + {\iffalse}\fi + \expandafter#1\ltx@secondoftwo + }% + \expandafter#1\ltx@firstoftwo + }% + }% + \LTXcmds@temp{ }% +}{% + \long\def\ltx@ifempty#1{% + \romannumeral% + \csname + LTXcmds@ifempty% + \ifcat$\detokenize{#1}$% + @% + \fi + \endcsname + }% + \long\def\LTXcmds@ifempty@#1#2{0 #1}% + \long\def\LTXcmds@ifempty#1#2{0 #2}% + \long\def\ltx@ifblank#1{% + \romannumeral% + \csname + LTXcmds@ifempty% + \ifcat$\detokenize\expandafter{\ltx@gobble#1.}$% + @% + \fi + \endcsname + }% +} +\long\def\ltx@zapspace#1{% + \romannumeral + \LTXcmds@zapspace\ltx@zero#1 \@nil +} +\long\def\LTXcmds@zapspace#1 #2\@nil{% + \ltx@ifempty{#2}{% + #1% + }{% + \LTXcmds@zapspace#1#2\@nil + }% +} +\ltx@IfUndefined{lastnodetype}{% + \catcode`\$=9 % + \catcode`\&=14 % +}{% + \catcode`\$=14 % + \catcode`\&=9 % +} +\def\ltx@IfBoxEmpty#1{% + \ifvoid#1\relax + \expandafter\ltx@secondoftwo + \else +& \begingroup +& \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +& \ifhmode\unhcopy\else\unvcopy\fi#1\relax +& \expandafter +& }% +& \expandafter\endgroup +& \ifnum\lastnodetype<\ltx@zero +& \expandafter\expandafter\expandafter\ltx@firstoftwo +& \else +& \expandafter\expandafter\expandafter\ltx@secondoftwo +& \fi +$ \begingroup +$ \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +$ \penalty\ltx@one +$ \ifhmode\unhcopy\else\unvcopy\fi#1\relax +$ \expandafter +$ }% +$ \ifnum\lastpenalty=\ltx@one +$ \endgroup +$ \begingroup +$ \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +$ \penalty\ltx@two +$ \ifhmode\unhcopy\else\unvcopy\fi#1\relax +$ \expandafter +$ }% +$ \ifnum\lastpenalty=\ltx@two +$ \def\next{\endgroup\expandafter\ltx@firstoftwo}% +$ \else +$ \def\next{\endgroup\expandafter\ltx@secondoftwo}% +$ \fi +$ \else +$ \def\next{\endgroup\expandafter\ltx@secondoftwo}% +$ \fi +$ \next + \fi +} +\def\ltx@IfBoxVoidOrEmpty#1{% + \ifvoid#1\relax + \expandafter\ltx@thirdoffour + \fi + \ltx@IfBoxEmpty{#1}% +} +\LTXcmds@AtEnd% + + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{ifluatex} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@ifluatex.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{ifluatex}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@ifluatex.sty\endcsname +\ProvidesPackage{ifluatex}% + [2010/03/01 v1.3 Provides the ifluatex switch (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname ifluatex@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ifluatex@AtEnd{% + \ifluatex@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{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{94}{7}% ^ +\TMP@EnsureCode{96}{12}% ` +\edef\ifluatex@AtEnd{\ifluatex@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname PackageError\endcsname\relax + \def\ifluatex@Error#1#2{% + \begingroup + \newlinechar=10 % + \def\MessageBreak{^^J}% + \edef\x{\errhelp{#2}}% + \x + \errmessage{Package ifluatex Error: #1}% + \endgroup + }% +\else + \def\ifluatex@Error{% + \PackageError{ifluatex}% + }% +\fi +\begingroup + \expandafter\ifx\csname ifluatex\endcsname\relax + \else + \edef\i/{\expandafter\string\csname ifluatex\endcsname}% + \ifluatex@Error{Name clash, \i/ is already defined}{% + Incompatible versions of \i/ can cause problems,\MessageBreak + therefore package loading is aborted.% + }% + \endgroup + \expandafter\ifluatex@AtEnd + \fi% +\endgroup +\let\ifluatex\iffalse +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname luatexversion\endcsname\relax +\else + \expandafter\let\csname ifluatex\expandafter\endcsname + \csname iftrue\endcsname +\fi +\ifluatex +\else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname directlua\endcsname\relax + \else + \expandafter\let\csname ifluatex\expandafter\endcsname + \csname iftrue\endcsname + \begingroup + \newlinechar=10 % + \endlinechar=\newlinechar% + \ifnum0% + \directlua{% + if tex.enableprimitives then + tex.enableprimitives('ifluatex', {'luatexversion'}) + tex.print('1') + end + }% + \ifx\ifluatexluatexversion\@undefined\else 1\fi % + =11 % + \global\let\luatexversion\ifluatexluatexversion% + \else% + \ifluatex@Error{% + Missing \string\luatexversion% + }{% + Update LuaTeX.% + }% + \fi% + \endgroup% + \fi +\fi +\ifluatex + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname luatexrevision\endcsname\relax + \ifnum\luatexversion<36 % + \else + \begingroup + \ifx\luatexrevision\relax + \let\luatexrevision\@undefined + \fi + \newlinechar=10 % + \endlinechar=\newlinechar% + \ifcase0% + \directlua{% + if tex.enableprimitives then + tex.enableprimitives('ifluatex', {'luatexrevision'}) + else + tex.print('1') + end + }% + \ifx\ifluatexluatexrevision\@undefined 1\fi% + \relax% + \global\let\luatexrevision\ifluatexluatexrevision% + \fi% + \endgroup% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname luatexrevision\endcsname\relax + \ifluatex@Error{% + Missing \string\luatexrevision% + }{% + Update LuaTeX.% + }% + \fi + \fi +\fi +\begingroup + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \let\x\PackageInfo + \expandafter\let\csname on@line\endcsname\empty + \fi + \x{ifluatex}{LuaTeX \ifluatex\else not \fi detected}% +\endgroup +\ifluatex@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{ifvtex} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@ifvtex.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{ifvtex}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@ifvtex.sty\endcsname +\ProvidesPackage{ifvtex}% + [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname ifvtex@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ifvtex@AtEnd{% + \ifvtex@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{39}{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{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ +\TMP@EnsureCode{96}{12}% ` +\edef\ifvtex@AtEnd{\ifvtex@AtEnd\noexpand\endinput} +\begingroup + \expandafter\ifx\csname ifvtex\endcsname\relax + \else + \edef\i/{\expandafter\string\csname ifvtex\endcsname}% + \expandafter\ifx\csname PackageError\endcsname\relax + \def\x#1#2{% + \edef\z{#2}% + \expandafter\errhelp\expandafter{\z}% + \errmessage{Package ifvtex Error: #1}% + }% + \def\y{^^J}% + \newlinechar=10 % + \else + \def\x#1#2{% + \PackageError{ifvtex}{#1}{#2}% + }% + \def\y{\MessageBreak}% + \fi + \x{Name clash, \i/ is already defined}{% + Incompatible versions of \i/ can cause problems,\y + therefore package loading is aborted.% + }% + \endgroup + \expandafter\ifvtex@AtEnd + \fi% +\endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newif\endcsname\relax + \def\ifvtex@newif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\ifvtex@@newif\string#1\@nil + }% + \def\ifvtex@@newif#1#2#3\@nil{% + \expandafter\edef\csname#3true\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iftrue\endcsname + }% + \expandafter\edef\csname#3false\endcsname{% + \let + \expandafter\noexpand\csname if#3\endcsname + \expandafter\noexpand\csname iffalse\endcsname + }% + \csname#3false\endcsname + }% +\else + \expandafter\let\expandafter\ifvtex@newif\csname newif\endcsname +\fi +\ifvtex@newif\ifvtex +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname VTeXversion\endcsname\relax +\else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname OpMode\endcsname\relax + \else + \vtextrue + \fi +\fi +\ifvtex@newif\ifvtexdvi +\ifvtex@newif\ifvtexpdf +\ifvtex@newif\ifvtexps +\ifvtex@newif\ifvtexhtml +\ifvtex@newif\ifvtexgex +\ifvtex + \ifcase\OpMode\relax + \vtexdvitrue + \or % 1 + \vtexpdftrue + \or % 2 + \vtexpstrue + \or % 3 + \vtexpstrue + \or\or\or\or\or\or\or % 10 + \vtexhtmltrue + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname gexmode\endcsname\relax + \else + \ifnum\gexmode>0 % + \vtexgextrue + \fi + \fi +\fi +\begingroup + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \let\x\PackageInfo + \expandafter\let\csname on@line\endcsname\empty + \fi + \x{ifvtex}{% + VTeX % + \ifvtex + in \ifvtexdvi DVI\fi + \ifvtexpdf PDF\fi + \ifvtexps PS\fi + \ifvtexhtml HTML\fi + \space mode % + with\ifvtexgex\else out\fi\space GeX % + \else + not % + \fi + detected% + }% +\endgroup +\ifvtex@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{intcalc} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@intcalc.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{intcalc}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@intcalc.sty\endcsname +\ProvidesPackage{intcalc}% + [2007/09/27 v1.1 Expandable integer calculations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname InCa@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\InCa@AtEnd{% + \InCa@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{11}% : (letter!) +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{63}{14}% ? (comment!) +\edef\InCa@AtEnd{\InCa@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname InCa@TestMode\endcsname\relax +\else + \catcode63=9 % ? (ignore) +\fi +? \let\InCa@@TestMode\InCa@TestMode +\def\InCa@Abs#1#2!{% + \ifx#1-% + #2% + \else + #1#2% + \fi +} +\def\InCa@Sgn#1#2!{% + \ifx#1-% + -1% + \else + \ifx#10% + 0% + \else + 1% + \fi + \fi +} +\def\InCa@Min#1!#2!{% + \ifnum#1<#2 % + #1% + \else + #2% + \fi +} +\def\InCa@Max#1!#2!{% + \ifnum#1>#2 % + #1% + \else + #2% + \fi +} +\def\InCa@Cmp#1!#2!{% + \ifnum#1=#2 % + 0% + \else + \ifnum#1<#2 % + -% + \fi + 1% + \fi +} +\def\InCa@Fac#1!{% + \ifcase#1 1% 0! + \or 1% 1! + \or 2% 2! + \or 6% 3! + \or 24% 4! + \or 120% 5! + \or 720% 6! + \or 5040% 7! + \or 40320% 8! + \or 362880% 9! + \or 3628800% 10! + \or 39916800% 11! + \or 479001600% 12! + \else + \ifnum#1<\z@ + 0\IntCalcError:FacNegative% + \else + 0\IntCalcError:FacOverflow% + \fi + \fi +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\else + \def\intcalcNum#1{% + \the\numexpr#1\relax + }% + \def\intcalcInv#1{% + \number-\intcalcNum{#1} % + }% + \def\intcalcAbs#1{% + \number\expandafter\InCa@Abs\the\numexpr#1! % + }% + \def\intcalcSgn#1{% + \number\expandafter\InCa@Sgn\the\numexpr#1! % + }% + \def\intcalcMin#1#2{% + \number\expandafter\InCa@Min + \the\numexpr#1\expandafter!% + \the\numexpr#2! % + }% + \def\intcalcMax#1#2{% + \number\expandafter\InCa@Max + \the\numexpr#1\expandafter!% + \the\numexpr#2! % + }% + \def\intcalcCmp#1#2{% + \number\expandafter\InCa@Cmp + \the\numexpr#1\expandafter!\the\numexpr#2! % + }% + \def\intcalcInc#1{% + \the\numexpr#1+1\relax + }% + \def\intcalcDec#1{% + \the\numexpr#1-1\relax + }% + \def\IntCalcInc#1!{% + \the\numexpr#1+1\relax + }% + \def\IntCalcDec#1!{% + \the\numexpr#1-1\relax + }% + \def\intcalcAdd#1#2{% + \the\numexpr#1+(#2)\relax + }% + \def\intcalcSub#1#2{% + \the\numexpr#1-(#2)\relax + }% + + \def\IntCalcAdd#1!#2!{% + \the\numexpr#1+#2\relax + }% + \def\IntCalcSub#1!#2!{% + \the\numexpr#1-#2\relax + }% + \def\intcalcShl#1{% + \the\numexpr(#1)*2\relax + }% + \def\intcalcShr#1{% + \number\expandafter\InCa@Shr\the\numexpr#1! % + }% + \def\IntCalcShl#1!{% + \the\numexpr#1*2\relax + }% + \def\IntCalcShr#1!{% + \the\numexpr\ifodd#1 (#1-1)\else#1\fi/2\relax + }% + \def\InCa@Shr#1#2!{% + \ifx#1-% + -\InCa@Shr#2!% + \else + \ifodd#1#2 % + \the\numexpr(#1#2-1)/2\relax + \else + \the\numexpr#1#2/2\relax + \fi + \fi + }% + \def\intcalcMul#1#2{% + \the\numexpr(#1)*(#2)\relax + }% + \def\IntCalcMul#1!#2!{% + \the\numexpr#1*#2\relax + }% + \def\intcalcSqr#1{% + \number\expandafter\InCa@Sqr\the\numexpr#1! % + }% + \def\InCa@Sqr#1!{% + \the\numexpr#1*#1\relax + }% + \def\intcalcFac#1{% + \number\expandafter\InCa@Fac\the\numexpr#1! % + }% + \def\intcalcPow#1#2{% + \number\expandafter\InCa@Pow + \the\numexpr#1\expandafter!% + \the\numexpr#2! % + }% + \def\InCa@Pow#1#2!#3#4!{% + \ifcase#3#4 % power = 0 + 1% + \or % power = 1 + #1#2% + \or % power = 2 + \the\numexpr#1#2*#1#2\relax + \else + \ifcase#1#2 % basis = 0, power <> 0 + 0% + \ifx#3-% power < 0 + 0\IntCalcError:DivisionByZero% + \fi + \or + 1% basis = 1 + \else + \ifnum#1#2=\m@ne % basis = -1 + \ifodd#3#4 % + -% + \fi + 1% + \else % |basis| > 1 + \ifx#3-% power < 0 + 0% + \else % power > 2 + \InCa@PowRec#1#2!#3#4!1!% + \fi + \fi + \fi + \fi + }% + \def\InCa@PowRec#1!#2!#3!{% + \ifnum#2=\@ne + \the\numexpr#1*#3\relax + \else + \ifodd#2 % + \expandafter\InCa@PowRec + \the\numexpr#1*#1\expandafter!% + \the\numexpr(#2-1)/2\expandafter!% + \the\numexpr#1*#3\expandafter\expandafter\expandafter!% + \else + \expandafter\InCa@PowRec + \the\numexpr#1*#1\expandafter!% + \the\numexpr(#2-1)/2\expandafter!% + \number#3\expandafter\expandafter\expandafter!% + \fi + \fi + }% + \def\intcalcDiv#1#2{% + \number\expandafter\InCa@Div + \the\numexpr#1\expandafter!% + \the\numexpr#2! % + }% + \def\InCa@Div#1!#2!{% + \ifcase#2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase#1 % + 0% + \else + \expandafter\InCa@@Div + \romannumeral 0% + \ifnum#1<\z@ + \expandafter-\number-#1% + \else + \expandafter+\number#1% + \fi + \expandafter!% + \romannumeral 0% + \ifnum#2<\z@ + \expandafter-\number-#2% + \else + \expandafter+\number#2% + \fi + !% + \fi + \fi + }% + \def\InCa@Temp#1{% + \def\IntCalcDiv##1!##2!{% + \number + \ifcase##2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase##1 % + 0% + \else + \the\numexpr(##1-(##2-1)/2)/##2\relax + \fi + \fi + #1% + }% + }% + \InCa@Temp{ }% + \def\InCa@@Div#1#2!#3#4!{% + #1#3% + \the\numexpr(#2-(#4-1)/2)/#4\relax + }% + \def\intcalcMod#1#2{% + \number\expandafter\InCa@Mod + \the\numexpr#1\expandafter!% + \the\numexpr#2! % + }% + \def\InCa@Mod#1!#2!{% + \ifcase#2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase#1 % + 0% + \else + \expandafter\InCa@@Mod + \romannumeral 0% + \ifnum#1<\z@ + \expandafter-\number-#1% + \else + \expandafter+\number#1% + \fi + \expandafter!% + \romannumeral 0% + \ifnum#2<\z@ + \expandafter-\number-#2% + \else + \expandafter+\number#2% + \fi + !% + \fi + \fi + }% + \def\InCa@Temp#1{% + \def\IntCalcMod##1!##2!{% + \number + \ifcase##2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase##1 % + 0% + \else + \the\numexpr##1-(##1-(##2-1)/2)/##2*##2\relax + \fi + \fi + #1% + }% + }% + \InCa@Temp{ }% + \def\InCa@@Mod#1#2!#3#4!{% + \if#3+% + \if#1+% + \the\numexpr#2-\InCa@@Div+#2!+#4!*#4\relax + \else + \expandafter\InCa@ModX + \the\numexpr-#2+\InCa@@Div+#2!+#4!*#4!#4!% + \fi + \else + -% + \if#1+% + \expandafter\InCa@ModX + \the\numexpr-#2+\InCa@@Div+#2!+#4!*#4!#4!% + \else + \the\numexpr#2-\InCa@@Div+#2!+#4!*#4\relax + \fi + \fi + }% + \def\InCa@ModX#1!#2!{% + \ifcase#1 % + 0% + \else + \the\numexpr#1+#2\relax + \fi + }% + \expandafter\InCa@AtEnd +\fi% +\def\intcalcNum#1{% + \number\expandafter\InCa@FirstOfOne\number#1! % +} +\def\intcalcInv#1{% + \number\expandafter\InCa@FirstOfOne\number-#1! % +} +\def\InCa@FirstOfOne#1!{#1} +\def\intcalcAbs#1{% + \number\expandafter\InCa@Abs\number#1! % +} +\def\intcalcSgn#1{% + \number\expandafter\InCa@Sgn\number#1! % +} +\def\intcalcMin#1#2{% + \number\expandafter\InCa@Min + \number\number#1\expandafter!\number#2! % +} +\def\intcalcMax#1#2{% + \number\expandafter\InCa@Max + \number\number#1\expandafter!\number#2! % +} +\def\intcalcCmp#1#2{% + \number\expandafter\InCa@Cmp + \number\number#1\expandafter!\number#2! % +}% +\def\intcalcInc#1{% + \number\expandafter\InCa@IncSwitch\number#1! % +} +\def\InCa@IncSwitch#1#2!{% + \ifx#1-% + -% + \csname InCa@Empty% + \InCa@Dec#2!% + \else + \csname InCa@Empty% + \InCa@Inc#1#2!% + \fi +} +\def\intcalcDec#1{% + \number\expandafter\InCa@DecSwitch\number#1! % +} +\def\InCa@DecSwitch#1#2!{% + \ifx#1-% + -% + \csname InCa@Empty% + \expandafter\InCa@Inc#2!% + \else + \ifx#10% + -1% + \else + \csname InCa@Empty% + \InCa@Dec#1#2!% + \fi + \fi +} +\def\IntCalcInc#1!{% + \number\csname InCa@Empty\InCa@Inc#1! % +} +\def\IntCalcDec#1!{% + \number\csname InCa@Empty\InCa@Dec#1! % +} +\def\InCa@Inc#1#2{% + \ifx#2!% + \csname InCa@IncDigit#1\endcsname1% + \else + \csname InCa@IncDigit#1% + \expandafter\InCa@Inc\expandafter#2% + \fi +} +\def\InCa@Temp#1#2{% + \expandafter\def\csname InCa@IncDigit#1\endcsname##1{% + \endcsname + 0% + \ifcase##1 % + #1% + \else + #2% + \fi + }% +} +\InCa@Temp 01 +\InCa@Temp 12 +\InCa@Temp 23 +\InCa@Temp 34 +\InCa@Temp 45 +\InCa@Temp 56 +\InCa@Temp 67 +\InCa@Temp 78 +\InCa@Temp 89 +\expandafter\def\csname InCa@IncDigit9\endcsname#1{% + \expandafter\endcsname + \ifcase#1 % + 09% + \else + 10% + \fi +} +\def\InCa@Dec#1#2{% + \ifx#2!% + \csname InCa@DecDigit#1\endcsname1% + \else + \csname InCa@DecDigit#1% + \expandafter\InCa@Dec\expandafter#2% + \fi +} +\def\InCa@Temp#1#2{% + \expandafter\def\csname InCa@DecDigit#1\endcsname##1{% + \endcsname + 0% + \ifcase##1 % + #1% + \else + #2% + \fi + }% +} +\InCa@Temp 98 +\InCa@Temp 87 +\InCa@Temp 76 +\InCa@Temp 65 +\InCa@Temp 54 +\InCa@Temp 43 +\InCa@Temp 32 +\InCa@Temp 21 +\InCa@Temp 10 +\expandafter\def\csname InCa@DecDigit0\endcsname#1{% + \expandafter\endcsname + \ifcase#1 % + 00% + \else + 19% + \fi +} +\def\intcalcAdd#1#2{% + \number + \expandafter\InCa@AddSwitch + \number\number#1\expandafter!% + \number#2! % +} +\def\intcalcSub#1#2{% + \number + \expandafter\InCa@AddSwitch + \number\number#1\expandafter!% + \number-\number#2! % +} +\def\InCa@AddSwitch#1!#2!{% + \ifnum#1<\z@ + \ifnum#2<\z@ + -% + \ifnum#1<#2 % + \expandafter\InCa@Add\number-#1\expandafter!% + \@gobble#2!% + \else + \expandafter\InCa@Add\number-#2\expandafter!% + \@gobble#1!% + \fi + \else + \ifnum-#1>#2 % + -% + \expandafter\InCa@Sub\@gobble#1!#2!% + \else + \expandafter\InCa@Sub\number#2\expandafter!% + \@gobble#1!% + \fi + \fi + \else + \ifnum#2<\z@ + \ifnum#1>-#2 % + \expandafter\InCa@Sub\number#1\expandafter!% + \@gobble#2!% + \else + -% + \expandafter\InCa@Sub\@gobble#2!#1!% + \fi + \else + \ifnum#1>#2 % + \InCa@Add#1!#2!% + \else + \InCa@Add#2!#1!% + \fi + \fi + \fi +} +\def\IntCalcAdd#1!#2!{% + \number\InCa@Add#1!#2! % +} +\def\IntCalcSub#1!#2!{% + \number\InCa@Sub#1!#2! % +} +\begingroup + \def\x#1{\endgroup + \let\InCa@Space= #1% + }% +\x{ } +\def\InCa@Add#1!#2!{% + \ifcase#2 % + #1% + \else + \InCa@@Add#1!#2!000000000\InCa@Space + \fi +} +\def\InCa@Sub#1!#2!{% + \ifnum#1=#2 % + 0% + \else + \InCa@@Sub#1!#2!000000000\InCa@Space + \fi +} +\def\InCa@@Add#1!#2#3!{% + \ifx\InCa@Empty#3\InCa@Empty + \@ReturnAfterElseFi{% + \InCa@@@Add!!#1!#2% + }% + \else + \@ReturnAfterFi{% + \InCa@@Add#1!#3!#2% + }% + \fi +} +\def\InCa@@Sub#1!#2#3!{% + \ifx\InCa@Empty#3\InCa@Empty + \@ReturnAfterElseFi{% + \InCa@@@Sub!!#1!#2% + }% + \else + \@ReturnAfterFi{% + \InCa@@Sub#1!#3!#2% + }% + \fi +} +\def\InCa@@@Add#1!#2!#3#4!#5{% + \ifx\InCa@Empty#4\InCa@Empty + \csname InCa@Empty% + \@ReturnAfterElseFi{% + \InCa@ProcessAdd#1#3!#5#2% + }% + \else + \@ReturnAfterFi{% + \InCa@@@Add#1#3!#5#2!#4!% + }% + \fi +} +\def\InCa@@@Sub#1!#2!#3#4!#5{% + \ifx\InCa@Empty#4\InCa@Empty + \csname @gobble% + \@ReturnAfterElseFi{% + \InCa@ProcessSub#1#3!#5#2% + }% + \else + \@ReturnAfterFi{% + \InCa@@@Sub#1#3!#5#2!#4!% + }% + \fi +} +\def\InCa@ProcessAdd#1#2!#3#4{% + \ifx\InCa@Empty#2\InCa@Empty + \csname InCa@AddDigit#1\endcsname#3% + \romannumeral0#4% + \else + \csname InCa@AddDigit#1\csname InCa@DigitCarry#3% + \@ReturnAfterFi{% + \InCa@ProcessAdd#2!#4% + }% + \fi +} +\def\InCa@ProcessSub#1#2!#3#4{% + \ifx\InCa@Empty#2\InCa@Empty + \csname InCa@SubDigit#1\endcsname#3% + \romannumeral0#4% + \else + \csname InCa@SubDigit#1\csname InCa@DigitCarry#3% + \@ReturnAfterFi{% + \InCa@ProcessSub#2!#4% + }% + \fi +} +\def\InCa@Temp#1#2{% + \expandafter\def\csname InCa@DigitCarry#1\endcsname##1{% + \ifcase##1 % + \endcsname#1% + \else + \endcsname#2% + \fi + }% +} +\InCa@Temp 01 +\InCa@Temp 12 +\InCa@Temp 23 +\InCa@Temp 34 +\InCa@Temp 45 +\InCa@Temp 56 +\InCa@Temp 67 +\InCa@Temp 78 +\InCa@Temp 89 +\InCa@Temp 9{{10}} +\expandafter\def\csname InCa@AddDigit0\endcsname#1{% + \ifnum#1>9 % + \endcsname10% + \else + \endcsname0#1% + \fi +} +\def\InCa@Temp#1#2#3{% + \expandafter\def\csname InCa@AddDigit#1\endcsname##1{% + \ifnum##1>#2 % + \endcsname 1% + \else + \endcsname 0% + \fi + \ifcase##1 #1% 0 + #3% + \else #1% 10 + \fi + }% +} +\InCa@Temp 18{% + \or 2% 1 + \or 3% 2 + \or 4% 3 + \or 5% 4 + \or 6% 5 + \or 7% 6 + \or 8% 7 + \or 9% 8 + \or 0% 9 +}% +\InCa@Temp 27{% + \or 3% 1 + \or 4% 2 + \or 5% 3 + \or 6% 4 + \or 7% 5 + \or 8% 6 + \or 9% 7 + \or 0% 8 + \or 1% 9 +}% +\InCa@Temp 36{% + \or 4% 1 + \or 5% 2 + \or 6% 3 + \or 7% 4 + \or 8% 5 + \or 9% 6 + \or 0% 7 + \or 1% 8 + \or 2% 9 +}% +\InCa@Temp 45{% + \or 5% 1 + \or 6% 2 + \or 7% 3 + \or 8% 4 + \or 9% 5 + \or 0% 6 + \or 1% 7 + \or 2% 8 + \or 3% 9 +}% +\InCa@Temp 54{% + \or 6% 1 + \or 7% 2 + \or 8% 3 + \or 9% 4 + \or 0% 5 + \or 1% 6 + \or 2% 7 + \or 3% 8 + \or 4% 9 +}% +\InCa@Temp 63{% + \or 7% 1 + \or 8% 2 + \or 9% 3 + \or 0% 4 + \or 1% 5 + \or 2% 6 + \or 3% 7 + \or 4% 8 + \or 5% 9 +}% +\InCa@Temp 72{% + \or 8% 1 + \or 9% 2 + \or 0% 3 + \or 1% 4 + \or 2% 5 + \or 3% 6 + \or 4% 7 + \or 5% 8 + \or 6% 9 +}% +\InCa@Temp 81{% + \or 9% 1 + \or 0% 2 + \or 1% 3 + \or 2% 4 + \or 3% 5 + \or 4% 6 + \or 5% 7 + \or 6% 8 + \or 7% 9 +}% +\InCa@Temp 90{% + \or 0% 1 + \or 1% 2 + \or 2% 3 + \or 3% 4 + \or 4% 5 + \or 5% 6 + \or 6% 7 + \or 7% 8 + \or 8% 9 +}% +\def\InCa@Temp#1#2{% + \expandafter\def\csname InCa@SubDigit#1\endcsname##1{% + \ifnum##1>#1 % + \endcsname 1% + \else + \endcsname 0% + \fi + \ifcase##1 #1% 0 + #2% + \else #1% 10 + \fi + }% +} +\InCa@Temp 0{% + \or 9% 1 + \or 8% 2 + \or 7% 3 + \or 6% 4 + \or 5% 5 + \or 4% 6 + \or 3% 7 + \or 2% 8 + \or 1% 9 +} +\InCa@Temp 1{% + \or 0% 1 + \or 9% 2 + \or 8% 3 + \or 7% 4 + \or 6% 5 + \or 5% 6 + \or 4% 7 + \or 3% 8 + \or 2% 9 +} +\InCa@Temp 2{% + \or 1% 1 + \or 0% 2 + \or 9% 3 + \or 8% 4 + \or 7% 5 + \or 6% 6 + \or 5% 7 + \or 4% 8 + \or 3% 9 +} +\InCa@Temp 3{% + \or 2% 1 + \or 1% 2 + \or 0% 3 + \or 9% 4 + \or 8% 5 + \or 7% 6 + \or 6% 7 + \or 5% 8 + \or 4% 9 +} +\InCa@Temp 4{% + \or 3% 1 + \or 2% 2 + \or 1% 3 + \or 0% 4 + \or 9% 5 + \or 8% 6 + \or 7% 7 + \or 6% 8 + \or 5% 9 +} +\InCa@Temp 5{% + \or 4% 1 + \or 3% 2 + \or 2% 3 + \or 1% 4 + \or 0% 5 + \or 9% 6 + \or 8% 7 + \or 7% 8 + \or 6% 9 +} +\InCa@Temp 6{% + \or 5% 1 + \or 4% 2 + \or 3% 3 + \or 2% 4 + \or 1% 5 + \or 0% 6 + \or 9% 7 + \or 8% 8 + \or 7% 9 +} +\InCa@Temp 7{% + \or 6% 1 + \or 5% 2 + \or 4% 3 + \or 3% 4 + \or 2% 5 + \or 1% 6 + \or 0% 7 + \or 9% 8 + \or 8% 9 +} +\InCa@Temp 8{% + \or 7% 1 + \or 6% 2 + \or 5% 3 + \or 4% 4 + \or 3% 5 + \or 2% 6 + \or 1% 7 + \or 0% 8 + \or 9% 9 +} +\InCa@Temp 9{% + \or 8% 1 + \or 7% 2 + \or 6% 3 + \or 5% 4 + \or 4% 5 + \or 3% 6 + \or 2% 7 + \or 1% 8 + \or 0% 9 +} +\def\intcalcShl#1{% + \number\expandafter\InCa@ShlSwitch\number#1! % +} +\def\InCa@ShlSwitch#1#2!{% + \ifx#1-% + -\csname InCa@Empty% + \InCa@Shl#2!% + \else + \csname InCa@Empty% + \InCa@Shl#1#2!% + \fi +} +\def\IntCalcShl#1!{% + \number + \csname InCa@Empty% + \InCa@Shl#1! % +} +\def\InCa@Shl#1#2{% + \ifx#2!% + \csname InCa@ShlDigit#1\endcsname0% + \else + \csname InCa@ShlDigit#1% + \@ReturnAfterFi{% + \InCa@Shl#2% + }% + \fi +} +\expandafter\def\csname InCa@ShlDigit0\endcsname{% + \endcsname0% +} +\def\InCa@Temp#1#2#3#4#5{% + \expandafter\def\csname InCa@ShlDigit#1\endcsname##1{% + \expandafter\endcsname + \ifcase##1 % + #2#3% + \else + #4#5% + \fi + }% +} +\InCa@Temp 10203 +\InCa@Temp 20405 +\InCa@Temp 30607 +\InCa@Temp 40809 +\InCa@Temp 51011 +\InCa@Temp 61213 +\InCa@Temp 71415 +\InCa@Temp 81617 +\InCa@Temp 91819 +\def\intcalcShr#1{% + \number\expandafter\InCa@ShrSwitch\number#1! % +} +\def\InCa@ShrSwitch#1#2!{% + \ifx#1-% + -\InCa@Shr#2!% + \else + \InCa@Shr#1#2!% + \fi +} +\def\IntCalcShr#1!{% + \number\InCa@Shr#1! % +} +\def\InCa@Shr#1#2{% + \InCa@ShrDigit#1!% + \ifx#2!% + \else + \@ReturnAfterFi{% + \ifodd#1 % + \@ReturnAfterElseFi{% + \InCa@Shr{1#2}% + }% + \else + \expandafter\InCa@Shr\expandafter#2% + \fi + }% + \fi +} +\def\InCa@ShrDigit#1!{% + \ifcase#1 0% 0 + \or 0% 1 + \or 1% 2 + \or 1% 3 + \or 2% 4 + \or 2% 5 + \or 3% 6 + \or 3% 7 + \or 4% 8 + \or 4% 9 + \or 5% 10 + \or 5% 11 + \or 6% 12 + \or 6% 13 + \or 7% 14 + \or 7% 15 + \or 8% 16 + \or 8% 17 + \or 9% 18 + \or 9% 19 + \fi +} +\def\InCa@Temp#1{% + \def\InCa@Tim##1##2{% + \number + \ifcase##2 % 0 + 0% + \or % 1 + ##1% + \else % 2-9 + \csname InCa@Empty% + \InCa@ProcessTim##2##1!% + \fi + #1% + }% +} +\InCa@Temp{ } +\def\InCa@ProcessTim#1#2#3{% + \ifx#3!% + \csname InCa@TimDigit#2\endcsname#10% + \else + \csname InCa@TimDigit#2\csname InCa@Param#1% + \@ReturnAfterFi{% + \InCa@ProcessTim#1#3% + }% + \fi +} +\def\InCa@Temp#1{% + \expandafter\def\csname InCa@Param#1\endcsname{% + \endcsname#1% + }% +} +\InCa@Temp 0% +\InCa@Temp 1% +\InCa@Temp 2% +\InCa@Temp 3% +\InCa@Temp 4% +\InCa@Temp 5% +\InCa@Temp 6% +\InCa@Temp 7% +\InCa@Temp 8% +\InCa@Temp 9% +\expandafter\def\csname InCa@TimDigit0\endcsname#1#2{% + \endcsname + 0#2% +} +\expandafter\def\csname InCa@TimDigit1\endcsname#1#2{% + \ifcase#2 % + \endcsname 0#1% + \else + \csname InCa@AddDigit#1\endcsname #2% + \fi +} +\def\InCa@Temp#1#2{% + \expandafter\def\csname InCa@TimDigit#1\endcsname##1{% + \expandafter\InCa@TimDigitCarry + \number + \ifcase##1 0% 0 + #2% + \fi + !% + }% +} +\InCa@Temp 2{% + \or 2% 1 + \or 4% 2 + \or 6% 3 + \or 8% 4 + \or 10% 5 + \or 12% 6 + \or 14% 7 + \or 16% 8 + \or 18% 9 +} +\InCa@Temp 3{% + \or 3% 1 + \or 6% 2 + \or 9% 3 + \or 12% 4 + \or 15% 5 + \or 18% 6 + \or 21% 7 + \or 24% 8 + \or 27% 9 +} +\InCa@Temp 4{% + \or 4% 1 + \or 8% 2 + \or 12% 3 + \or 16% 4 + \or 20% 5 + \or 24% 6 + \or 28% 7 + \or 32% 8 + \or 36% 9 +} +\InCa@Temp 5{% + \or 5% 1 + \or 10% 2 + \or 15% 3 + \or 20% 4 + \or 25% 5 + \or 30% 6 + \or 35% 7 + \or 40% 8 + \or 45% 9 +} +\InCa@Temp 6{% + \or 6% 1 + \or 12% 2 + \or 18% 3 + \or 24% 4 + \or 30% 5 + \or 36% 6 + \or 42% 7 + \or 48% 8 + \or 54% 9 +} +\InCa@Temp 7{% + \or 7% 1 + \or 14% 2 + \or 21% 3 + \or 28% 4 + \or 35% 5 + \or 42% 6 + \or 49% 7 + \or 56% 8 + \or 63% 9 +} +\InCa@Temp 8{% + \or 8% 1 + \or 16% 2 + \or 24% 3 + \or 32% 4 + \or 40% 5 + \or 48% 6 + \or 56% 7 + \or 64% 8 + \or 72% 9 +} +\InCa@Temp 9{% + \or 9% 1 + \or 18% 2 + \or 27% 3 + \or 36% 4 + \or 45% 5 + \or 54% 6 + \or 63% 7 + \or 72% 8 + \or 81% 9 +} +\def\InCa@TimDigitCarry#1!{% + \ifnum#1<10 % + \csname InCa@AddDigit#1\expandafter\endcsname + \else + \@ReturnAfterFi{% + \InCa@@TimDigitCarry#1!% + }% + \fi +} +\def\InCa@@TimDigitCarry#1#2!#3{% + \csname InCa@DigitCarry#1% + \csname InCa@AddDigit#2\endcsname #3% +} +\def\intcalcMul#1#2{% + \number + \expandafter\InCa@MulSwitch + \number\number#1\expandafter!% + \number#2! % +} +\def\InCa@MulSwitch#1!#2!{% + \ifnum#1<\z@ + \ifnum#2<\z@ + \ifnum#1<#2 % + \expandafter\InCa@Mul\number-#1\expandafter!% + \@gobble#2!% + \else + \expandafter\InCa@Mul\number-#2\expandafter!% + \@gobble#1!% + \fi + \else + -% + \ifnum-#1>#2 % + \expandafter\InCa@Mul\@gobble#1!#2!% + \else + \expandafter\InCa@Mul\number#2\expandafter!% + \@gobble#1!% + \fi + \fi + \else + \ifnum#2<\z@ + -% + \ifnum#1>-#2 % + \expandafter\InCa@Mul\number#1\expandafter!% + \@gobble#2!% + \else + \expandafter\InCa@Mul\@gobble#2!#1!% + \fi + \else + \ifnum#1>#2 % + \InCa@Mul#1!#2!% + \else + \InCa@Mul#2!#1!% + \fi + \fi + \fi +} +\def\IntCalcMul#1!#2!{% + \number\InCa@Mul#1!#2! % +} +\def\InCa@Mul#1!#2!{% + \ifcase#2 % + 0% + \or + #1% + \or + \csname InCa@Empty% + \expandafter\InCa@Shl#1!% + \else + \ifnum#2<10 % + \InCa@Tim{#1}#2% + \else + \InCa@ProcessMul!#2!#1!% + \fi + \fi +} +\def\InCa@ProcessMul#1!#2#3!#4!{% + \ifx\InCa@Empty#3\InCa@Empty + \expandafter\InCa@Add\number + #10\expandafter\expandafter\expandafter!% + \InCa@Tim{#4}#2!% + \else + \ifx\InCa@Empty#1\InCa@Empty + \expandafter\expandafter\expandafter\InCa@ProcessMul + \InCa@Tim{#4}#2!% + #3!#4!% + \else + \expandafter\InCa@ProcessMul\number + \expandafter\InCa@Add\number% + #10\expandafter\expandafter\expandafter!% + \InCa@Tim{#4}#2!!% + #3!#4!% + \fi + \fi +} +\def\intcalcSqr#1{% + \number\expandafter\InCa@Sqr\number#1! % +} +\def\InCa@Sqr#1#2!{% + \ifx#1-% + \InCa@Mul#2!#2!% + \else + \InCa@Mul#1#2!#1#2!% + \fi +} +\def\intcalcFac#1{% + \number\expandafter\InCa@Fac\number#1! % +} +\def\intcalcPow#1#2{% + \number\expandafter\InCa@Pow + \number\number#1\expandafter!% + \number#2! % +} +\def\InCa@Pow#1#2!#3#4!{% + \ifcase#3#4 % power = 0 + 1% + \or % power = 1 + #1#2% + \or % power = 2 + \ifx#1-% + \InCa@Mul#2!#2!% + \else + \InCa@Mul#1#2!#1#2!% + \fi + \else + \ifcase#1#2 % basis = 0, power <> 0 + 0% + \ifx#3-% power < 0 + 0\IntCalcError:DivisionByZero% + \fi + \or + 1% basis = 1 + \else + \ifnum#1#2=\m@ne % basis = -1 + \ifodd#3#4 % + -% + \fi + 1% + \else % |basis| > 1 + \ifx#3-% power < 0 + 0% + \else % power > 2 + \ifx#1-% basis < 0 + \ifodd#3#4 % + -% + \fi + \InCa@PowRec#2!#3#4!1!% + \else + \InCa@PowRec#1#2!#3#4!1!% + \fi + \fi + \fi + \fi + \fi +} +\def\InCa@PowRec#1!#2!#3!{% + \ifnum#2=\@ne + \ifnum#1>#3 % + \InCa@Mul#1!#3!% + \else + \InCa@Mul#3!#1!% + \fi + \else + \expandafter\InCa@PowRec + \number\InCa@Mul#1!#1!\expandafter!% + \number\intcalcShr{#2}\expandafter!% + \number + \ifodd#2 % + \ifnum#1>#3 % + \InCa@Mul#1!#3!% + \else + \InCa@Mul#3!#1!% + \fi + \else + #3% + \fi + \expandafter!% + \fi +} +\def\intcalcDiv#1#2{% + \number\expandafter\InCa@Div + \number\number#1\expandafter!% + \number#2! % +} +\def\InCa@Div#1!#2!{% + \ifcase#2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase#1 % + 0% + \else + \expandafter\InCa@DivSwitch + \number#1\expandafter!% + \number#2!% + \fi + \fi +} +\def\InCa@Temp#1{% + \def\IntCalcDiv##1!##2!{% + \number + \ifcase##2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase##1 % + 0% + \else + \InCa@@Div##1!##2!% + \fi + \fi + #1% + }% +} +\InCa@Temp{ }% +\def\InCa@DivSwitch#1!#2!{% + \ifnum#1<\z@ + \ifnum#2<\z@ + \expandafter\InCa@@Div\number-#1\expandafter!% + \@gobble#2!% + \else + -% + \expandafter\InCa@@Div\@gobble#1!#2!% + \fi + \else + \ifnum#2<\z@ + -% + \expandafter\InCa@@Div\number#1\expandafter!% + \@gobble#2!% + \else + \InCa@@Div#1!#2!% + \fi + \fi +} +\def\InCa@@Div#1!#2!{% + \ifnum#1>#2 % + \ifcase#2 % 0 already catched +? \IntCalcError:ThisCannotHappen% + \or % 1 + #1% + \or % 2 + \InCa@Shr#1!% + \else + \InCa@DivStart!#1!#2!#2!% + \fi + \else + \ifnum#1=#2 % + 1% + \else + 0% + \fi + \fi +} +\def\InCa@DivStart#1!#2#3!#4#5{% + \ifx#5!% + \@ReturnAfterElseFi{% + \InCa@DivStartI{#1#2}#3=!% + }% + \else + \@ReturnAfterFi{% + \InCa@DivStart{#1#2}!#3!#5% + }% + \fi +} +\def\InCa@DivStartI#1!#2!{% + \expandafter\InCa@DivStartII + \number#2\expandafter\expandafter\expandafter!% + \intcalcShl{#2}!% + #1!% +} +\def\InCa@DivStartII#1!#2!{% + \expandafter\InCa@DivStartIII + \number#1\expandafter!% + \number#2\expandafter\expandafter\expandafter!% + \intcalcShl{#2}!% +} +\def\InCa@DivStartIII#1!#2!#3!{% + \expandafter\InCa@DivStartIV + \number#1\expandafter!% + \number#2\expandafter!% + \number#3\expandafter!% + \number\InCa@Add#3!#2!\expandafter\expandafter\expandafter!% + \intcalcShl{#3}!% +} +\def\InCa@DivStartIV#1!#2!#3!#4!#5!#6!{% + \InCa@ProcessDiv#6!#1!#2!#3!#4!#5!/% +} +\def\InCa@ProcessDiv#1#2#3!#4!#5!#6!#7!#8!#9/{% + #9% + \ifnum#1<#4 % 0 + 0% + \ifx#2=% + \else + \InCa@ProcessDiv{#1#2}#3!#4!#5!#6!#7!#8!% + \fi + \else % 1-9 + \ifnum#1<#5 % 1 + 1% + \ifx#2=% + \else + \expandafter\InCa@ProcessDiv\expandafter{% + \number\InCa@Sub#1!#4!% + #2% + }#3!#4!#5!#6!#7!#8!% + \fi + \else % 2-9 + \ifnum#1<#7 % 2 3 4 5 + \ifnum#1<#6 % 2 3 + \@ReturnAfterElseFi{% + \expandafter\InCa@@ProcessDiv + \number\InCa@Sub#1!#5!!% + 23% + }% + \else % 4 5 + \@ReturnAfterFi{% + \expandafter\InCa@@ProcessDiv + \number\InCa@Sub#1!#6!!% + 45% + }% + \fi + #2#3!#4!#5!#6!#7!#8!% + \else % 6 7 8 9 + \ifnum#1<#8 % 6 7 + \@ReturnAfterElseFi{% + \expandafter\InCa@@ProcessDiv + \number\InCa@Sub#1!#7!!% + 67% + }% + \else % 8 9 + \@ReturnAfterFi{% + \expandafter\InCa@@ProcessDiv + \number\InCa@Sub#1!#8!!% + 89% + }% + \fi + #2#3!#4!#5!#6!#7!#8!% + \fi + \fi + \fi + \ifx#2=% + \expandafter\@gobble + \fi + /% +} +\def\InCa@@ProcessDiv#1!#2#3#4#5!#6!{% + \ifnum#1<#6 % + #2% + \@ReturnAfterElseFi{% + \ifx#4=% + \expandafter\InCa@CleanupIV + \else + \@ReturnAfterFi{% + \InCa@ProcessDiv{#1#4}#5!#6!% + }% + \fi + }% + \else + #3% + \@ReturnAfterFi{% + \ifx#4=% + \expandafter\InCa@CleanupIV + \else + \@ReturnAfterFi{% + \expandafter\InCa@ProcessDiv\expandafter{% + \number\InCa@Sub#1!#6! % + #4% + }#5!#6!% + }% + \fi + }% + \fi +} +\def\InCa@CleanupIV#1!#2!#3!#4!{} +\def\intcalcMod#1#2{% + \number\expandafter\InCa@Mod + \number\number#1\expandafter!% + \number#2! % +} +\def\InCa@Mod#1!#2!{% + \ifcase#2 % + 0\IntCalcError:DivisionByZero% + \else + \ifnum#2<\z@ + -% + \expandafter\InCa@Mod + \number-#1\expandafter!% + \number-#2!% + \else + \ifcase#1 % + 0% + \else + \ifcase#2 % 0 already catched +? \IntCalcError:ThisCannotHappen% + \or % 1 + 0% + \or % 2 + \ifodd#1 1\else 0\fi + \else + \ifnum#1<\z@ + \expandafter\InCa@ModShift + \number-% + \expandafter\InCa@Sub + \number\@gobble#1\expandafter!% + \number\intcalcMul{#2}{% + \expandafter\InCa@Div\@gobble#1!#2!% + }!% + !#2!% + \else + \expandafter\InCa@Sub\number#1\expandafter!% + \number\intcalcMul{#2}{\InCa@Div#1!#2!}!% + \fi + \fi + \fi + \fi + \fi +} +\def\InCa@Temp#1{% + \def\IntCalcMod##1!##2!{% + \number + \ifcase##2 % + 0\IntCalcError:DivisionByZero% + \else + \ifcase##1 % + 0% + \else + \ifcase##2 % 0 already catched +? \IntCalcError:ThisCannotHappen + \or % 1 + 0% + \or % 2 + \ifodd ##1 1\else 0\fi + \else + \expandafter\InCa@Sub\number##1\expandafter!% + \number\intcalcMul{##2}{\InCa@Div##1!##2!}!% + \fi + \fi + \fi + #1% + }% +} +\InCa@Temp{ }% +\def\InCa@ModShift#1!#2!{% + \ifnum#1<\z@ + \expandafter\InCa@Sub\number#2\expandafter!% + \@gobble#1!% + \else + #1% + \fi +} +\def\InCa@Empty{} +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\long\def\@ReturnAfterFi#1\fi{\fi#1}% +\long\def\@ReturnAfterElseFi#1\else#2\fi{\fi#1}% +\InCa@AtEnd% + + + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{ifpdf} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@ifpdf.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{ifpdf}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@ifpdf.sty\endcsname +\ProvidesPackage{ifpdf}% + [2011/01/30 v2.3 Provides the ifpdf switch (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname ifpdf@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ifpdf@AtEnd{% + \ifpdf@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{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{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ +\TMP@EnsureCode{96}{12}% ` +\edef\ifpdf@AtEnd{\ifpdf@AtEnd\noexpand\endinput} +\begingroup + \expandafter\ifx\csname ifpdf\endcsname\relax + \else + \edef\i/{\expandafter\string\csname ifpdf\endcsname}% + \expandafter\ifx\csname PackageError\endcsname\relax + \def\x#1#2{% + \edef\z{#2}% + \expandafter\errhelp\expandafter{\z}% + \errmessage{Package ifpdf Error: #1}% + }% + \def\y{^^J}% + \newlinechar=10 % + \else + \def\x#1#2{% + \PackageError{ifpdf}{#1}{#2}% + }% + \def\y{\MessageBreak}% + \fi + \x{Name clash, \i/ is already defined}{% + Incompatible versions of \i/ can cause problems,\y + therefore package loading is aborted.% + }% + \endgroup + \expandafter\ifpdf@AtEnd + \fi% +\endgroup +\begingroup + \def\skip#1\relax\begingroup{}% + \expandafter\ifx\csname pdfoutput\endcsname\relax + \else + \expandafter\skip + \fi + \expandafter\ifx\csname directlua\endcsname\relax + \expandafter\skip + \fi +\endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ifluatex}[2009/04/10]% +\else + \RequirePackage{ifluatex}[2009/04/10]% +\fi +\ifluatex + \ifnum\luatexversion<36 % + \else + \begingroup + \directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}% + \global\let\pdfoutput\ifpdfpdfoutput + \endgroup + \fi +\fi +\relax\begingroup\endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newif\endcsname\relax + \edef\pdffalse{% + \let + \expandafter\noexpand\csname ifpdf\endcsname + \expandafter\noexpand\csname iffalse\endcsname + }% + \edef\pdftrue{% + \let + \expandafter\noexpand\csname ifpdf\endcsname + \expandafter\noexpand\csname iftrue\endcsname + }% + \pdffalse +\else + \csname newif\expandafter\endcsname\csname ifpdf\endcsname +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfoutput\endcsname\relax +\else + \ifnum\pdfoutput<1 % + \else + \pdftrue + \fi +\fi +\begingroup + \expandafter\ifx\csname pdfoutput\endcsname\relax + \else + \escapechar=92 % + \edef\m{\meaning\pdfoutput}% + \edef\p{\string\pdfoutput}% + \ifx\m\p + \else + \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax + \def\PackageWarningNoLine#1#2{% + \immediate\write16{% + Package `#1' Warning: #2.% + }% + }% + \fi + \PackageWarningNoLine{ifpdf}{% + Someone has redefined \string\pdfoutput% + }% + \fi + \fi +\endgroup +\begingroup + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \let\x\PackageInfo + \expandafter\let\csname on@line\endcsname\empty + \fi + \x{ifpdf}{pdfTeX in PDF mode is \ifpdf\else not \fi detected}% +\endgroup +\ifpdf@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{etexcmds} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@etexcmds.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{etexcmds}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@etexcmds.sty\endcsname +\ProvidesPackage{etexcmds}% + [2011/02/16 v1.5 Prefix for e-TeX command names (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname etexcmds@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\etexcmds@AtEnd{% + \etexcmds@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\etexcmds@AtEnd{% + \etexcmds@AtEnd + \escapechar\the\escapechar\relax + \noexpand\endinput +} +\escapechar=92 % backslash +\def\etexcmds@newif#1{% + \expandafter\edef\csname etex@#1false\endcsname{% + \let + \expandafter\noexpand\csname ifetex@#1\endcsname + \noexpand\iffalse + }% + \expandafter\edef\csname etex@#1true\endcsname{% + \let + \expandafter\noexpand\csname ifetex@#1\endcsname + \noexpand\iftrue + }% + \csname etex@#1false\endcsname +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ifluatex}[2010/03/01]% +\else + \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ifluatex}[2010/03/01]% +\fi +\etexcmds@newif{unexpanded} +\begingroup +\edef\x{\string\unexpanded}% +\edef\y{\meaning\unexpanded}% +\ifx\x\y + \endgroup + \let\etex@unexpanded\unexpanded + \etex@unexpandedtrue +\else + \edef\y{\meaning\normalunexpanded}% + \ifx\x\y + \endgroup + \let\etex@unexpanded\normalunexpanded + \etex@unexpandedtrue + \else + \edef\y{\meaning\@@unexpanded}% + \ifx\x\y + \endgroup + \let\etex@unexpanded\@@unexpanded + \etex@unexpandedtrue + \else + \ifluatex + \ifnum\luatexversion<36 % + \else + \begingroup + \directlua{% + tex.enableprimitives('etex@',{'unexpanded'})% + }% + \global\let\etex@unexpanded\etex@unexpanded + \endgroup + \fi + \fi + \edef\y{\meaning\etex@unexpanded}% + \ifx\x\y + \endgroup + \etex@unexpandedtrue + \else + \endgroup + \@PackageInfoNoLine{etexcmds}{% + Could not find \string\unexpanded.\MessageBreak + That can mean that you are not using e-TeX or% + \MessageBreak + that some package has redefined \string\unexpanded.% + \MessageBreak + In the latter case, load this package earlier% + }% + \etex@unexpandedfalse + \fi + \fi + \fi +\fi +\etexcmds@newif{expanded} +\begingroup +\edef\x{\string\expanded}% +\edef\y{\meaning\expanded}% +\ifx\x\y + \endgroup + \let\etex@expanded\expanded + \etex@expandedtrue +\else + \edef\y{\meaning\normalexpanded}% + \ifx\x\y + \endgroup + \let\etex@expanded\normalexpanded + \etex@expandedtrue + \else + \edef\y{\meaning\@@expanded}% + \ifx\x\y + \endgroup + \let\etex@expanded\@@expanded + \etex@expandedtrue + \else + \ifluatex + \ifnum\luatexversion<36 % + \else + \begingroup + \directlua{% + tex.enableprimitives('etex@',{'expanded'})% + }% + \global\let\etex@expanded\etex@expanded + \endgroup + \fi + \fi + \edef\y{\meaning\etex@expanded}% + \ifx\x\y + \endgroup + \etex@expandedtrue + \else + \endgroup + \@PackageInfoNoLine{etexcmds}{% + Could not find \string\expanded.\MessageBreak + That can mean that you are not using pdfTeX 1.50 or% + \MessageBreak + that some package has redefined \string\expanded.% + \MessageBreak + In the latter case, load this package earlier% + }% + \etex@expandedfalse + \fi + \fi + \fi +\fi +\etexcmds@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{kvsetkeys} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@kvsetkeys.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{kvsetkeys}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@kvsetkeys.sty\endcsname +\ProvidesPackage{kvsetkeys}% + [2011/04/07 v1.13 Key value parser (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname KVS@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\KVS@AtEnd{% + \KVS@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{126}{13}% ~ (active) +\edef\KVS@AtEnd{\KVS@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{etexcmds}[2010/01/28]% +\else + \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{etexcmds}[2010/01/28]% +\fi +\expandafter\ifx\csname toks@\endcsname\relax + \toksdef\toks@=0 % +\fi +\begingroup\expandafter\endgroup +\ifcase0\ifetex@unexpanded + \expandafter\ifx\csname ifcsname\endcsname\relax + \else + \expandafter\ifx\csname unless\endcsname\relax + \else + 1% + \fi + \fi + \fi + \catcode`\$=9 % ignore + \catcode`\&=14 % comment +\else % e-TeX + \catcode`\$=14 % comment + \catcode`\&=9 % ignore +\fi +\def\KVS@Empty{} +\long\def\KVS@FirstOfTwo#1#2{#1} +\long\def\KVS@SecondOfTwo#1#2{#2} +\long\def\KVS@IfEmpty#1{% +& \edef\KVS@Temp{\etex@unexpanded{#1}}% +$ \begingroup +$ \toks@{#1}% +$ \edef\KVS@Temp{\the\toks@}% +$ \expandafter\endgroup + \ifx\KVS@Temp\KVS@Empty + \expandafter\KVS@FirstOfTwo + \else + \expandafter\KVS@SecondOfTwo + \fi +} +\long\def\kv@normalize#1{% + \begingroup + \toks@{,#1,}% + \KVS@Comma + \KVS@SpaceComma{ }% + \KVS@CommaSpace + \KVS@CommaComma + \KVS@Equals + \KVS@SpaceEquals{ }% + \KVS@EqualsSpace + \xdef\KVS@Global{\the\toks@}% + \endgroup + \let\kv@list\KVS@Global +} +\def\comma@normalize#1{% + \begingroup + \toks@{,#1,}% + \KVS@Comma + \KVS@SpaceComma{ }% + \KVS@CommaSpace + \KVS@CommaComma + \xdef\KVS@Global{\the\toks@}% + \endgroup + \let\comma@list\KVS@Global +} +\begingroup + \lccode`\,=`\,% + \lccode`\~=`\,% +\lowercase{\endgroup + \def\KVS@Comma{% + \toks@\expandafter{\expandafter}\expandafter + \KVS@@Comma\the\toks@~\KVS@Nil + }% + \long\def\KVS@@Comma#1~#2\KVS@Nil{% + \toks@\expandafter{\the\toks@#1}% + \KVS@IfEmpty{#2}{% + }{% + \KVS@@Comma,#2\KVS@Nil + }% + }% +} +\long\def\KVS@SpaceComma#1{% + \expandafter\KVS@@SpaceComma\the\toks@#1,\KVS@Nil +} +\long\def\KVS@@SpaceComma#1 ,#2\KVS@Nil{% + \KVS@IfEmpty{#2}{% + \toks@{#1}% + }{% + \toks@{#1,#2}% + \expandafter\KVS@@SpaceComma\the\toks@\KVS@Nil + }% +} +\def\KVS@CommaSpace{% + \expandafter\KVS@@CommaSpace\the\toks@, \KVS@Nil +} +\long\def\KVS@@CommaSpace#1, #2\KVS@Nil{% + \KVS@IfEmpty{#2}{% + \toks@{#1}% + }{% + \toks@{#1,#2}% + \expandafter\KVS@@CommaSpace\the\toks@\KVS@Nil + }% +} +\def\KVS@CommaComma{% + \expandafter\KVS@@CommaComma\the\toks@,\KVS@Nil +} +\long\def\KVS@@CommaComma#1,,#2\KVS@Nil{% + \toks@{#1,#2}% + \KVS@IfEmpty{#2}{% + }{% + \expandafter\KVS@@CommaComma\the\toks@\KVS@Nil + }% +} +\begingroup + \lccode`\==`\=% + \lccode`\~=`\=% +\lowercase{\endgroup + \def\KVS@Equals{% + \toks@\expandafter{\expandafter}\expandafter + \KVS@@Equals\the\toks@~\KVS@Nil + }% + \long\def\KVS@@Equals#1~#2\KVS@Nil{% + \edef\KVS@Temp{\the\toks@}% + \ifx\KVS@Temp\KVS@Empty + \expandafter\KVS@FirstOfTwo + \else + \expandafter\KVS@SecondOfTwo + \fi + {% + \toks@{#1}% + }{% + \toks@\expandafter{\the\toks@=#1}% + }% + \KVS@IfEmpty{#2}{% + }{% + \KVS@@Equals#2\KVS@Nil + }% + }% +} +\long\def\KVS@SpaceEquals#1{% + \expandafter\KVS@@SpaceEquals\the\toks@#1=\KVS@Nil +} +\long\def\KVS@@SpaceEquals#1 =#2\KVS@Nil{% + \KVS@IfEmpty{#2}{% + \toks@{#1}% + }{% + \toks@{#1=#2}% + \expandafter\KVS@@SpaceEquals\the\toks@\KVS@Nil + }% +} +\def\KVS@EqualsSpace{% + \expandafter\KVS@@EqualsSpace\the\toks@= \KVS@Nil +} +\long\def\KVS@@EqualsSpace#1= #2\KVS@Nil{% + \KVS@IfEmpty{#2}{% + \toks@{#1}% + }{% + \toks@{#1=#2}% + \expandafter\KVS@@EqualsSpace\the\toks@\KVS@Nil + }% +} +\long\def\kv@parse#1{% + \kv@normalize{#1}% + \expandafter\kv@parse@normalized\expandafter{\kv@list}% +} +\long\def\kv@parse@normalized#1#2{% + \KVS@Parse#1,\KVS@Nil{#2}% +} +\long\def\KVS@Parse#1,#2\KVS@Nil#3{% + \KVS@IfEmpty{#1}{% + }{% + \KVS@Process#1=\KVS@Nil{#3}% + }% + \KVS@MaybeBreak + \KVS@IfEmpty{#2}{% + }{% + \KVS@Parse#2\KVS@Nil{#3}% + }% +} +\long\def\KVS@Process#1=#2\KVS@Nil#3{% + \let\KVS@MaybeBreak\relax + \def\kv@key{#1}% + \KVS@IfEmpty{#2}{% + \let\kv@value\relax + #3{#1}{}% + }{% + \KVS@@Process{#1}#2\KVS@Nil{#3}% + }% +} +\long\def\KVS@@Process#1#2=\KVS@Nil#3{% +& \edef\kv@value{\etex@unexpanded{#2}}% +$ \begingroup +$ \toks@{#2}% +$ \xdef\KVS@Global{\the\toks@}% +$ \endgroup +$ \let\kv@value\KVS@Global + #3{#1}{#2}% +} +\let\KVS@MaybeBreak\relax +\def\KVS@break#1#2#3#4{% + \let\KVS@MaybeBreak\relax +} +\def\kv@break{% + \let\KVS@MaybeBreak\KVS@break +} +\def\comma@parse#1{% + \comma@normalize{#1}% + \expandafter\comma@parse@normalized\expandafter{\comma@list}% +} +\def\comma@parse@normalized#1#2{% + \KVS@CommaParse#1,\KVS@Nil{#2}% +} +\def\KVS@CommaParse#1,#2\KVS@Nil#3{% + \KVS@IfEmpty{#1}{% + }{% + \def\comma@entry{#1}% + #3{#1}% + }% + \KVS@MaybeBreak + \KVS@IfEmpty{#2}{% + }{% + \KVS@CommaParse#2\KVS@Nil{#3}% + }% +} +\def\comma@break{% + \let\KVS@MaybeBreak\KVS@break +} +\def\kv@processor@default#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \edef\KVS@temp{\endgroup + \noexpand\KVS@ProcessorDefault{#1}{#2}% + }% + \KVS@temp +} +\long\def\KVS@ProcessorDefault#1#2#3{% +& \unless\ifcsname KV@#1@#2\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#2\endcsname\relax +& \unless\ifcsname KVS@#1@handler\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KVS@#1@handler\endcsname\relax + \kv@error@unknownkey{#1}{#2}% + \else + \csname KVS@#1@handler\endcsname{#2}{#3}% + \relax + \fi + \else + \ifx\kv@value\relax +& \unless\ifcsname KV@#1@#2@default\endcsname +$ \begingroup\expandafter\expandafter\expandafter\endgroup +$ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax + \kv@error@novalue{#1}{#2}% + \else + \csname KV@#1@#2@default\endcsname + \relax + \fi + \else + \csname KV@#1@#2\endcsname{#3}% + \fi + \fi +} +\long\def\kv@set@family@handler#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \expandafter\endgroup + \expandafter\def\csname KVS@#1@handler\endcsname##1##2{#2}% +} +\def\kv@error@novalue{% + \kv@error@generic{No value specified for}% +} +\def\kv@error@unknownkey{% + \kv@error@generic{Undefined}% +} +\def\kv@error@generic#1#2#3{% + \@PackageError{kvsetkeys}{% + #1 key `#3'% + }{% + The keyval family of the key `#3' is `#2'.\MessageBreak + The setting of the key is ignored because of the error.\MessageBreak + \MessageBreak + \@ehc + }% +} +\long\def\kvsetkeys#1#2{% + \kv@parse{#2}{\kv@processor@default{#1}}% +} +\KVS@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{kvdefinekeys} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@kvdefinekeys.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{kvdefinekeys}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@kvdefinekeys.sty\endcsname +\ProvidesPackage{kvdefinekeys}% + [2011/04/07 v1.3 Defining keys (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname KVD@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\KVD@AtEnd{% + \KVD@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\KVD@AtEnd{\KVD@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/03/01]% +\else + \RequirePackage{ltxcmds}[2010/03/01]% +\fi +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\kv@define@key#1#2% + }{% + \DeclareRobustCommand*{\kv@define@key}[2]% + }% +}{% + \protected\def\kv@define@key#1#2% +}% +{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \edef\KVD@temp{\endgroup + \noexpand\KVD@DefineKey{#1}{#2}% + }% + \KVD@temp +} +\def\KVD@DefineKey#1#2{% + \ltx@ifnextchar[{% + \KVD@DefineKeyWithDefault{#1}{#2}% + }{% + \long\expandafter\def\csname KV@#1@#2\endcsname##1% + }% +} +\long\def\KVD@DefineKeyWithDefault#1#2[#3]{% + \expandafter\def\csname KV@#1@#2@default\expandafter\endcsname + \expandafter{% + \csname KV@#1@#2\endcsname{#3}% + }% + \long\expandafter\def\csname KV@#1@#2\endcsname##1% +} +\KVD@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\ifluatex +\else + \expandafter\hobsub@GobbleRemainingPackage +\fi +\hobsub@StartPackage{luatex-loader} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@luatex-loader.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{luatex-loader}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@luatex-loader.sty\endcsname +\ProvidesPackage{luatex-loader}% + [2010/03/09 v0.4 Lua module loader (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5\endlinechar=13\relax% + \catcode10=12 % ^^J + \catcode34=12 % " + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode46=12 % . + \catcode60=12 % < + \catcode61=12 % = + \catcode95=12 % _ (other!) + \catcode96=12 % ` + \catcode123=1 % { + \catcode125=2 % } + \endlinechar=10 % + \ifnum\luatexversion<36 % + \directlua0% + \else % + \expandafter\directlua % + \fi % + {% + do + local script = "oberdiek.luatex.lua" + local file = kpse.find_file(script, "texmfscripts") + if file then + texio.write_nl("(" .. file .. ")") + dofile(file) + else + error("File `" .. script .. "' not found") + end + end + }% +\endgroup\endinput% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{pdftexcmds} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pdftexcmds.sty\endcsname +\ProvidesPackage{pdftexcmds}% + [2011/04/10 v0.14 Utilities of pdfTeX for LuaTeX (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname pdftexcmds@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\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{0}{12}% +\TMP@EnsureCode{1}{12}% +\TMP@EnsureCode{2}{12}% +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{38}{4}% & +\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{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{95}{12}% _ (other) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{126}{12}% ~ (other) +\edef\pdftexcmds@AtEnd{% + \pdftexcmds@AtEnd + \escapechar=\number\escapechar\relax + \noexpand\endinput +} +\escapechar=92 % +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ifluatex}[2010/03/01]% + \TMP@RequirePackage{ltxcmds}[2010/12/02]% + \TMP@RequirePackage{ifpdf}[2010/09/13]% +\else + \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ifluatex}[2010/03/01]% + \RequirePackage{ltxcmds}[2010/12/02]% + \RequirePackage{ifpdf}[2010/09/13]% +\fi +\ifluatex +\else + \@PackageInfoNoLine{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 + \ltx@IfUndefined{pdftexversion}{% + }{% + \ifnum\pdftexversion>120 % 1.21a supports \ifeof18 + \ifeof18 % + \chardef\pdf@shellescape=0 % + \else + \chardef\pdf@shellescape=1 % + \fi + \fi + }% + \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% + }% +\fi +\ifluatex + \ifnum\luatexversion<36 % + \def\pdftexcmds@directlua{\directlua0 }% + \else + \let\pdftexcmds@directlua\directlua + \fi + \begingroup + \newlinechar=10 % + \endlinechar=\newlinechar + \pdftexcmds@directlua{% + if tex.enableprimitives then + tex.enableprimitives( + 'pdf@', + {'primitive', 'ifprimitive', 'pdfdraftmode'} + ) + tex.enableprimitives('', {'luaescapestring'}) + end + }% + \endgroup % +\fi +\def\pdftexcmds@strip@prefix#1>{} +\def\pdftexcmds@temp#1#2#3{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf@#1\endcsname\relax + \begingroup + \def\x{#3}% + \edef\x{\expandafter\pdftexcmds@strip@prefix\meaning\x}% + \escapechar=-1 % + \edef\y{\expandafter\meaning\csname#2\endcsname}% + \expandafter\endgroup + \ifx\x\y + \expandafter\let\csname pdf@#1\expandafter\endcsname + \csname #2\endcsname + \fi + \fi +} +\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX +\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX +\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX +\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX +\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX +\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX +\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX +\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX +\begingroup + \expandafter\ifx\csname pdf@primitive\endcsname\relax + \else + \expandafter\ifx\csname pdftexversion\endcsname\relax + \else + \ifnum\pdftexversion=140 % + \expandafter\ifx\csname pdftexrevision\endcsname\relax + \else + \ifnum\pdftexrevision<4 % + \endgroup + \let\pdf@primitive\@undefined + \@PackageInfoNoLine{pdftexcmds}{% + \string\pdf@primitive disabled, because\MessageBreak + \string\pdfprimitive\space is broken until pdfTeX 1.40.4% + }% + \begingroup + \fi + \fi + \fi + \fi + \fi +\endgroup +\begingroup + \@PackageInfoNoLine{pdftexcmds}{% + \string\pdf@primitive\space is % + \expandafter\ifx\csname pdf@primitive\endcsname\relax not \fi + available% + }% + \@PackageInfoNoLine{pdftexcmds}{% + \string\pdf@ifprimitive\space is % + \expandafter\ifx\csname pdf@ifprimitive\endcsname\relax not \fi + available% + }% +\endgroup +\def\pdftexcmds@temp#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf@#1\endcsname\relax + \begingroup + \escapechar=-1 % + \edef\x{\expandafter\meaning\csname#1\endcsname}% + \def\y{#1}% + \def\z##1->{}% + \edef\y{\expandafter\z\meaning\y}% + \expandafter\endgroup + \ifx\x\y + \expandafter\def\csname pdf@#1\expandafter\endcsname + \expandafter{% + \csname#1\endcsname + }% + \fi + \fi +}% +\pdftexcmds@temp{shellescape}% +\pdftexcmds@temp{strcmp}% +\def\pdf@isprimitive{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf@strcmp\endcsname\relax + \long\def\pdf@isprimitive##1{% + \expandafter\pdftexcmds@isprimitive\expandafter{\meaning##1}% + }% + \long\def\pdftexcmds@isprimitive##1##2{% + \expandafter\pdftexcmds@@isprimitive\expandafter{\string##2}{##1}% + }% + \def\pdftexcmds@@isprimitive##1##2{% + \ifnum0\pdftexcmds@equal##1\delimiter##2\delimiter=1 % + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \def\pdftexcmds@equal##1##2\delimiter##3##4\delimiter{% + \ifx##1##3% + \ifx\relax##2##4\relax + 1% + \else + \ifx\relax##2\relax + \else + \ifx\relax##4\relax + \else + \pdftexcmds@equalcont{##2}{##4}% + \fi + \fi + \fi + \fi + }% + \def\pdftexcmds@equalcont##1{% + \def\pdftexcmds@equalcont####1####2##1##1##1##1{% + ##1##1##1##1% + \pdftexcmds@equal####1\delimiter####2\delimiter + }% + }% + \expandafter\pdftexcmds@equalcont\csname fi\endcsname + \else + \long\def\pdf@isprimitive##1##2{% + \ifnum\pdf@strcmp{\meaning##1}{\string##2}=0 % + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \fi +} +\ifluatex +\else + \pdf@isprimitive +\fi +\let\pdftexcmds@temp\ltx@zero % +\ltx@IfUndefined{pdfdraftmode}{% + \@PackageInfoNoLine{pdftexcmds}{\ltx@backslashchar pdfdraftmode not found}% +}{% + \ifpdf + \let\pdftexcmds@temp\ltx@one + \@PackageInfoNoLine{pdftexcmds}{\ltx@backslashchar pdfdraftmode found}% + \else + \@PackageInfoNoLine{pdftexcmds}{% + \ltx@backslashchar pdfdraftmode is ignored in DVI mode% + }% + \fi +} +\ifcase\pdftexcmds@temp + \let\pdf@draftmode\ltx@zero + \let\pdf@ifdraftmode\ltx@secondoftwo + \def\pdftexcmds@setdraftmode#1{}% +\else + \let\pdftexcmds@draftmode\pdfdraftmode + \def\pdf@ifdraftmode{% + \ifnum\pdftexcmds@draftmode=\ltx@one + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \def\pdf@draftmode{% + \ifnum\pdftexcmds@draftmode=\ltx@one + \expandafter\ltx@one + \else + \expandafter\ltx@zero + \fi + }% + \def\pdftexcmds@setdraftmode#1{% + \pdftexcmds@draftmode=#1\relax + }% +\fi +\def\pdf@setdraftmode#1{% + \begingroup + \count\ltx@cclv=#1\relax + \edef\x{\endgroup + \noexpand\pdftexcmds@@setdraftmode{\the\count\ltx@cclv}% + }% + \x +} +\def\pdftexcmds@@setdraftmode#1{% + \ifcase#1 % + \pdftexcmds@setdraftmode{#1}% + \or + \pdftexcmds@setdraftmode{#1}% + \else + \@PackageWarning{pdftexcmds}{% + \string\pdf@setdraftmode: Ignoring\MessageBreak + invalid value `#1'% + }% + \fi +} +\ifluatex +\else + \expandafter\pdftexcmds@AtEnd +\fi% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{luatex-loader}[2009/04/10]% +\else + \RequirePackage{luatex-loader}[2009/04/10]% +\fi +\pdftexcmds@directlua{% + require("oberdiek.pdftexcmds")% +} +\begingroup + \def\x{2011/04/10 v0.14}% + \ltx@onelevel@sanitize\x + \edef\y{% + \pdftexcmds@directlua{% + if oberdiek.pdftexcmds.getversion then % + oberdiek.pdftexcmds.getversion()% + end% + }% + }% + \ifx\x\y + \else + \@PackageError{pdftexcmds}{% + Wrong version of lua module.\MessageBreak + Package version: \x\MessageBreak + Lua module: \y + }\@ehc + \fi +\endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newtoks\endcsname\relax + \toksdef\pdftexcmds@toks=0 % +\else + \csname newtoks\endcsname\pdftexcmds@toks +\fi +\def\pdftexcmds@Patch{0} + +\ifnum\luatexversion>40 % + \ifnum\luatexversion<66 % + \def\pdftexcmds@Patch{1}% + \fi +\fi +\ifcase\pdftexcmds@Patch + \catcode`\&=14 % +\else + \catcode`\&=9 % + \def\pdftexcmds@PatchDecode#1\@nil{% + \pdftexcmds@DecodeA#1^^A^^A\@nil{}% + }% + \def\pdftexcmds@DecodeA#1^^A^^A#2\@nil#3{% + \ifx\relax#2\relax + \ltx@ReturnAfterElseFi{% + \pdftexcmds@DecodeB#3#1^^A^^B\@nil{}% + }% + \else + \ltx@ReturnAfterFi{% + \pdftexcmds@DecodeA#2\@nil{#3#1^^@}% + }% + \fi + }% + \def\pdftexcmds@DecodeB#1^^A^^B#2\@nil#3{% + \ifx\relax#2\relax% + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3#1% + }% + \else + \ltx@ReturnAfterFi{% + \pdftexcmds@DecodeB#2\@nil{#3#1^^A}% + }% + \fi + }% +\fi +\ifnum\luatexversion<36 % +\else + \catcode`\0=9 % +\fi +\long\def\pdf@strcmp#1#2{% + \directlua0{% + oberdiek.pdftexcmds.strcmp("\luaescapestring{#1}",% + "\luaescapestring{#2}")% + }% +}% +\pdf@isprimitive +\long\def\pdf@escapehex#1{% + \directlua0{% + oberdiek.pdftexcmds.escapehex("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@escapehexnative#1{% + \directlua0{% + oberdiek.pdftexcmds.escapehex("\luaescapestring{#1}")% + }% +}% +\def\pdf@unescapehex#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode + \the\expandafter\pdftexcmds@toks + \directlua0{% + oberdiek.pdftexcmds.toks="pdftexcmds@toks"% + oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}", "byte", \pdftexcmds@Patch)% + }% +& \@nil +}% +\def\pdf@unescapehexnative#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode + \the\expandafter\pdftexcmds@toks + \directlua0{% + oberdiek.pdftexcmds.toks="pdftexcmds@toks"% + oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}", \pdftexcmds@Patch)% + }% +& \@nil +}% +\long\def\pdf@escapestring#1{% + \directlua0{% + oberdiek.pdftexcmds.escapestring("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapename#1{% + \directlua0{% + oberdiek.pdftexcmds.escapename("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapenamenative#1{% + \directlua0{% + oberdiek.pdftexcmds.escapename("\luaescapestring{#1}")% + }% +} +\def\pdf@filesize#1{% + \directlua0{% + oberdiek.pdftexcmds.filesize("\luaescapestring{#1}")% + }% +} +\def\pdf@filemoddate#1{% + \directlua0{% + oberdiek.pdftexcmds.filemoddate("\luaescapestring{#1}")% + }% +} +\def\pdf@filedump#1#2#3{% + \directlua0{% + oberdiek.pdftexcmds.filedump("\luaescapestring{\number#1}",% + "\luaescapestring{\number#2}",% + "\luaescapestring{#3}")% + }% +}% +\long\def\pdf@mdfivesum#1{% + \directlua0{% + oberdiek.pdftexcmds.mdfivesum("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@mdfivesumnative#1{% + \directlua0{% + oberdiek.pdftexcmds.mdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@filemdfivesum#1{% + \directlua0{% + oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@shellescape{% + \directlua0{% + oberdiek.pdftexcmds.shellescape()% + }% +} +\def\pdf@system#1{% + \directlua0{% + oberdiek.pdftexcmds.system("\luaescapestring{#1}")% + }% +} +\def\pdf@lastsystemstatus{% + \directlua0{% + oberdiek.pdftexcmds.lastsystemstatus()% + }% +} +\def\pdf@lastsystemexit{% + \directlua0{% + oberdiek.pdftexcmds.lastsystemexit()% + }% +} +\catcode`\0=12 % +\ifnum0% + \pdftexcmds@directlua{% + if io.popen then % + tex.write("1")% + end% + }% + =1 % + \def\pdf@pipe#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode + \the\expandafter\pdftexcmds@toks + \pdftexcmds@directlua{% + oberdiek.pdftexcmds.toks="pdftexcmds@toks"% + oberdiek.pdftexcmds.pipe("\luaescapestring{#1}", \pdftexcmds@Patch)% + }% +& \@nil + }% +\fi +\pdftexcmds@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{pdfescape} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{pdfescape}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pdfescape.sty\endcsname +\ProvidesPackage{pdfescape}% + [2011/04/04 v1.12 Provides string conversions (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123 1 % { + \catcode125 2 % } + \catcode64 11 % + \def\x{\endgroup + \expandafter\edef\csname PE@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2#3{% + \edef\PE@AtEnd{% + \PE@AtEnd + #1#2=\the#1#2\relax + }% + #1#2=#3\relax +} +\TMP@EnsureCode\catcode{0}{12}% ^^@ +\TMP@EnsureCode\catcode{34}{12}% " +\TMP@EnsureCode\catcode{39}{12}% ' +\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{62}{12}% > +\TMP@EnsureCode\catcode{91}{12}% [ +\TMP@EnsureCode\catcode{93}{12}% ] +\TMP@EnsureCode\catcode{94}{7}% ^ +\TMP@EnsureCode\catcode{96}{12}% ` +\TMP@EnsureCode\uccode{34}{0}% " +\TMP@EnsureCode\uccode{48}{0}% 0 +\TMP@EnsureCode\uccode{61}{0}% = +\edef\PE@AtEnd{\PE@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/04/08]% +\else + \RequirePackage{ltxcmds}[2010/04/08]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\EdefSanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \PE@onelevel@sanitize#1% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @onelevel@sanitize\endcsname\relax + \def\PE@onelevel@sanitize#1{% + \edef#1{\expandafter\PE@strip@prefix\meaning#1}% + }% + \def\PE@strip@prefix#1>{}% + \else + \let\PE@onelevel@sanitize\@onelevel@sanitize + \fi +\else + \long\def\EdefSanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{% + \detokenize\expandafter{#1}% + }% + }% + \def\PE@onelevel@sanitize#1{% + \edef#1{\detokenize\expandafter{#1}}% + }% +\fi +\let\PE@sanitize\EdefSanitize +\begingroup + \catcode`\ =12\relax% +\def\x{\endgroup\def\PE@space@other{ }}\x\relax +\def\PE@space@space{ } +\def\PE@SanitizeSpaceOther#1{% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% +} +\def\PE@SpaceToOther#1 #2\relax{% + #1% + \ifx\\#2\\% + \else + \PE@space@other + \ltx@ReturnAfterFi{% + \PE@SpaceToOther#2\relax + }% + \fi +} +\def\EdefUnescapeName#1#2{% + \EdefSanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@UnescapeName#1% + \PE@onelevel@sanitize#1% +} +\begingroup + \catcode`\$=6 % hash + \catcode`\#=12 % other + \gdef\PE@UnescapeName$1{% + \begingroup + \PE@InitUccodeHexDigit + \def\PE@result{}% + \expandafter\PE@DeName$1#\relax\relax + \expandafter\endgroup + \expandafter\def\expandafter$1\expandafter{\PE@result}% + }% + \gdef\PE@DeName$1#$2$3{% + \ifx\relax$2% + \edef\PE@result{\PE@result$1}% + \let\PE@next\relax + \else + \ifx\relax$3% + % wrong escape sequence in input + \edef\PE@result{\PE@result$1#}% + \let\PE@next\relax + \else + \uppercase{% + \def\PE@testA{$2}% + \def\PE@testB{$3}% + }% + \ifcase\ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \ifcase\expandafter\PE@TestUcHexDigit\PE@testB + \ltx@zero + \else + \ltx@one + \fi + \else + \ltx@one + \fi + \uccode\ltx@zero="\PE@testA\PE@testB\relax + \uppercase{% + \def\PE@temp{^^@}% + }% + \uccode\ltx@zero=\ltx@zero + \edef\PE@result{\PE@result$1\PE@temp}% + \let\PE@next\PE@DeName + \else + % wrong escape sequence in input + \edef\PE@result{\PE@result$1#}% + \def\PE@next{\PE@DeName$2$3}% + \fi + \fi + \fi + \PE@next + }% +\endgroup +\def\PE@InitUccodeHexDigit{% + \uccode`a=`A\relax + \uccode`b=`B\relax + \uccode`c=`C\relax + \uccode`d=`D\relax + \uccode`e=`E\relax + \uccode`f=`F\relax + \uccode`A=\ltx@zero + \uccode`B=\ltx@zero + \uccode`C=\ltx@zero + \uccode`D=\ltx@zero + \uccode`E=\ltx@zero + \uccode`F=\ltx@zero + \uccode`0=\ltx@zero + \uccode`1=\ltx@zero + \uccode`2=\ltx@zero + \uccode`3=\ltx@zero + \uccode`4=\ltx@zero + \uccode`5=\ltx@zero + \uccode`6=\ltx@zero + \uccode`7=\ltx@zero + \uccode`8=\ltx@zero + \uccode`9=\ltx@zero +} +\def\PE@TestUcHexDigit#1{% + \ifnum`#1<48 % 0 + \ltx@one + \else + \ifnum`#1>70 % F + \ltx@one + \else + \ifnum`#1>57 % 9 + \ifnum`#1<65 % A + \ltx@one + \else + \ltx@zero + \fi + \else + \ltx@zero + \fi + \fi + \fi +} +\def\EdefUnescapeString#1#2{% + \EdefSanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@NormalizeLineEnd#1% + \PE@UnescapeString#1% + \PE@onelevel@sanitize#1% +} +\begingroup + \uccode`\8=10 % lf + \uccode`\9=13 % cr +\def\x#1#2{\endgroup + \def\PE@NormalizeLineEnd##1{% + \def\PE@result{}% + \expandafter\PE@@NormalizeLineEnd##1#2\relax + \let##1\PE@result + }% + \def\PE@@NormalizeLineEnd##1#2##2{% + \ifx\relax##2% + \edef\PE@result{\PE@result##1}% + \let\PE@next\relax + \else + \edef\PE@result{\PE@result##1#1}% + \ifx#1##2% lf + \let\PE@next\PE@@NormalizeLineEnd + \else + \def\PE@next{\PE@@NormalizeLineEnd##2}% + \fi + \fi + \PE@next + }% +}% +\uppercase{% + \x 89% +} +\begingroup + \catcode`\|=0 % + \catcode`\\=12 % + |gdef|PE@UnescapeString#1{% + |begingroup + |def|PE@result{}% + |expandafter|PE@DeString#1\|relax + |expandafter|endgroup + |expandafter|def|expandafter#1|expandafter{|PE@result}% + }% + |gdef|PE@DeString#1\#2{% + |ifx|relax#2% + |edef|PE@result{|PE@result#1}% + |let|PE@next|relax + |else + |if n#2% + |uccode|ltx@zero=10 % + |else|if r#2% + |uccode|ltx@zero=13 % + |else|if t#2% + |uccode|ltx@zero=9 % + |else|if b#2% + |uccode|ltx@zero=8 % + |else|if f#2% + |uccode|ltx@zero=12 % + |else + |uccode|ltx@zero=|ltx@zero + |fi|fi|fi|fi|fi + |ifnum|uccode|ltx@zero>|ltx@zero + |uppercase{% + |edef|PE@temp{^^@}% + }% + |edef|PE@result{|PE@result#1|PE@temp}% + |let|PE@next|PE@DeString + |else + |if\#2% backslash + |edef|PE@result{|PE@result#1}% + |let|PE@next|PE@CheckEndBackslash + |else + |ifnum`#2=10 % linefeed + |edef|PE@result{|PE@result#1}% + |let|PE@next|PE@DeString + |else + |ifcase|PE@TestOctDigit#2% + |edef|PE@result{|PE@result#1}% + |def|PE@next{|PE@OctI#2}% + |else + |edef|PE@result{|PE@result#1#2}% + |let|PE@next|PE@DeString + |fi + |fi + |fi + |fi + |fi + |PE@next + }% + |gdef|PE@CheckEndBackslash#1{% + |ifx|relax#1% + |else + |edef|PE@result{|PE@result\}% + |expandafter|PE@DeString|expandafter#1% + |fi + }% +|endgroup +\def\PE@TestOctDigit#1{% + \ifnum`#1<48 % 0 + \ltx@one + \else + \ifnum`#1>55 % 7 + \ltx@one + \else + \ltx@zero + \fi + \fi +} +\def\PE@OctI#1#2{% + \ifcase\PE@TestOctDigit#2% + \def\PE@next{\PE@OctII{#1#2}}% + \else + \def\PE@next{\PE@OctAll#1#2}% + \fi + \PE@next +} +\def\PE@OctII#1#2{% + \ifcase\PE@TestOctDigit#2% + \def\PE@next{\PE@OctAll{#1#2}}% + \else + \def\PE@next{\PE@OctAll{#1}#2}% + \fi + \PE@next +} +\def\PE@OctAll#1{% + \uccode\ltx@zero='#1\relax + \uppercase{% + \edef\PE@result{\PE@result^^@}% + }% + \PE@DeString +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{pdftexcmds}[2007/11/11]% +\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% + \PE@EscapeHex#1% + }% + \def\EdefUnescapeHex#1#2{% + \EdefSanitize#1{#2}% + \PE@UnescapeHex#1% + }% + \long\def\EdefEscapeName#1#2{% + \EdefSanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@EscapeName#1% + }% + \long\def\EdefEscapeString#1#2{% + \EdefSanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@EscapeString#1% + }% +\else + \long\def\PE@edefbabel#1#2#3{% + \begingroup + \csname @save@activestrue\endcsname + \edef#1{#2{#3}}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + \long\def\EdefEscapeHex#1#2{% + \PE@edefbabel#1\pdf@escapehex{#2}% + }% + \def\EdefUnescapeHex#1#2{% + \PE@edefbabel#1\pdf@unescapehex{#2}% + }% + \long\def\EdefEscapeName#1#2{% + \PE@edefbabel#1\pdf@escapename{#2}% + }% + \long\def\EdefEscapeString#1#2{% + \PE@edefbabel#1\pdf@escapestring{#2}% + }% + \expandafter\PE@AtEnd +\fi% +\edef\PE@hash{\string#} +\begingroup + \escapechar=-1 % +\edef\x{\endgroup + \def\noexpand\PE@backslash{\string\\}% +} +\x +\ltx@newif\ifPE@etex +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\else + \PE@etextrue +\fi +\ifPE@etex + \def\PE@EscapeHex#1{% + \edef#1{\expandafter\PE@ToHex#1\relax}% + }% +\else + \def\PE@EscapeHex#1{% + \def\PE@result{}% + \expandafter\PE@ToHex#1\relax + \let#1\PE@result + }% +\fi +\def\PE@ToHex#1{% + \ifx\relax#1% + \else + \PE@HexChar{#1}% + \expandafter\PE@ToHex + \fi +}% +\ifPE@etex + \def\PE@HexChar#1{% + \PE@HexDigit{\numexpr\dimexpr.0625\dimexpr`#1sp\relax\relax\relax}% + \PE@HexDigit{% + \numexpr`#1-16*\dimexpr.0625\dimexpr`#1sp\relax\relax\relax + }% + }% +\else + \def\PE@HexChar#1{% + \dimen0=`#1sp% + \dimen2=.0625\dimen0 % + \advance\dimen0-16\dimen2 % + \edef\PE@result{% + \PE@result + \PE@HexDigit{\dimen2 }% + \PE@HexDigit{\dimen0 }% + }% + }% +\fi +\def\PE@HexDigit#1{% + \expandafter\string + \ifcase#1% + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or + A\or B\or C\or D\or E\or F% + \fi +} +\ifPE@etex + \def\PE@OctChar#1{% + \expandafter\PE@@OctChar + \the\numexpr\dimexpr.015625\dimexpr`#1sp\relax\relax + \expandafter\relax + \expandafter\relax + \the\numexpr\dimexpr.125\dimexpr`#1sp\relax\relax\relax + \relax + #1% + }% + \def\PE@@OctChar#1\relax#2\relax#3{% + \PE@backslash + #1% + \the\numexpr#2-8*#1\relax + \the\numexpr\dimexpr`#3sp\relax-8*#2\relax + }% +\else + \def\PE@OctChar#1{% + \dimen0=`#1sp% + \dimen2=.125\dimen0 % + \dimen4=.125\dimen2 % + \advance\dimen0-8\dimen2 % + \advance\dimen2-8\dimen4 % + \edef\PE@result{% + \PE@result + \PE@backslash + \number\dimen4 % + \number\dimen2 % + \number\dimen0 % + }% + }% +\fi +\def\PE@UnescapeHex#1{% + \begingroup + \PE@InitUccodeHexDigit + \def\PE@result{}% + \expandafter\PE@DeHex#1\relax\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% +} +\def\PE@DeHex#1#2{% + \ifx#2\relax + \ifx#1\relax + \let\PE@next\relax + \else + \uppercase{% + \def\PE@testA{#1}% + }% + \ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \def\PE@next{% + \PE@DeHex#10\relax\relax + }% + \else + \let\PE@next\relax + \fi + \fi + \else + \uppercase{% + \def\PE@testA{#1}% + \def\PE@testB{#2}% + }% + \ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \ifcase\expandafter\PE@TestUcHexDigit\PE@testB + \uccode\ltx@zero="\PE@testA\PE@testB\relax + \ifnum\uccode\ltx@zero=32 % + \let\PE@temp\PE@space@space + \else + \uppercase{% + \def\PE@temp{^^@}% + }% + \fi + \edef\PE@result{\PE@result\PE@temp}% + \let\PE@next\PE@DeHex + \else + % invalid input sequence + \def\PE@next{% + \PE@DeHex#1% + }% + \fi + \else + % invalid input sequence + \def\PE@next{\PE@DeHex#2}% + \fi + \fi + \PE@next +} +\ifPE@etex + \def\PE@EscapeName#1{% + \edef#1{\expandafter\PE@EscapeNameTokens#1\relax}% + }% +\else + \def\PE@EscapeName#1{% + \def\PE@result{}% + \expandafter\PE@EscapeNameTokens#1\relax + \let#1\PE@result + }% +\fi +\def\PE@EscapeNameTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \ifcase`#1 % + % drop illegal zero + \else + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \fi + \else + \ifnum`#1>126 % + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \else \ifnum`#1=35 \PE@EscapeNameHashChar 23% # + \else\ifnum`#1=37 \PE@EscapeNameHashChar 25% % + \else\ifnum`#1=40 \PE@EscapeNameHashChar 28% ( + \else\ifnum`#1=41 \PE@EscapeNameHashChar 29% ) + \else\ifnum`#1=47 \PE@EscapeNameHashChar 2F% / + \else\ifnum`#1=60 \PE@EscapeNameHashChar 3C% < + \else\ifnum`#1=62 \PE@EscapeNameHashChar 3E% > + \else\ifnum`#1=91 \PE@EscapeNameHashChar 5B% [ + \else\ifnum`#1=93 \PE@EscapeNameHashChar 5D% ] + \else\ifnum`#1=123 \PE@EscapeNameHashChar 7B% { + \else\ifnum`#1=125 \PE@EscapeNameHashChar 7D% } + \else + \PE@EscapeNameAdd{#1}% + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeNameTokens + \fi +}% +\def\PE@EscapeNameHashChar#1#2{% + \PE@EscapeNameAdd{\PE@hash\string#1\string#2}% +}% +\ifPE@etex + \def\PE@EscapeNameAdd#1{#1}% +\else + \def\PE@EscapeNameAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +\ifPE@etex + \def\PE@EscapeString#1{% + \edef#1{\expandafter\PE@EscapeStringTokens#1\relax}% + }% +\else + \def\PE@EscapeString#1{% + \begingroup + \def\PE@result{}% + \expandafter\PE@EscapeStringTokens#1\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% + }% +\fi +\def\PE@EscapeStringTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \PE@OctChar#1% + \else + \ifnum`#1>126 % + \PE@OctChar#1% + \else \ifnum`#1=40 \PE@EscapeStringAdd{\string\(}% ( + \else\ifnum`#1=41 \PE@EscapeStringAdd{\string\)}% ) + \else\ifnum`#1=92 \PE@EscapeStringAdd{\string\\}% \ + \else + \PE@EscapeStringAdd{#1}% + \fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeStringTokens + \fi +}% +\ifPE@etex + \def\PE@EscapeStringAdd#1{#1}% +\else + \def\PE@EscapeStringAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +\PE@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{bigintcalc} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@bigintcalc.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{bigintcalc}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@bigintcalc.sty\endcsname +\ProvidesPackage{bigintcalc}% + [2011/01/30 v1.2 Expandable big integer calculations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname BIC@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\BIC@AtEnd{% + \BIC@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{36}{14}% $ (comment!) +\TMP@EnsureCode{38}{14}% & (comment!) +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\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}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{63}{14}% ? (comment!) +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\BIC@AtEnd{\BIC@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname BIC@TestMode\endcsname\relax +\else + \catcode63=9 % ? (ignore) +\fi +? \let\BIC@@TestMode\BIC@TestMode +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \catcode36=9 % $ (ignore) +\else + \catcode38=9 % & (ignore) +\fi +\let\BIC@Fi\fi +\def\BIC@AfterFi#1#2\BIC@Fi{\fi#1}% +\def\BIC@AfterFiFi#1#2\BIC@Fi{\fi\fi#1}% +\def\BIC@AfterFiFiFi#1#2\BIC@Fi{\fi\fi\fi#1}% +\begingroup + \def\x#1{\endgroup + \let\BIC@Space= #1% + }% +\x{ } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{pdftexcmds}[2007/11/11]% +\else +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax + \def\BIC@Expand#1{% + \romannumeral0% + \BIC@@Expand#1!\@nil{}% + }% + \def\BIC@@Expand#1#2\@nil#3{% + \expandafter\ifcat\noexpand#1\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {% + \expandafter\BIC@@Expand#1#2\@nil{#3}% + }{% + \ifx#1!% + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + { #3}{% + \BIC@@Expand#2\@nil{#3#1}% + }% + }% + }% + \expandafter\ifx\csname @firstoftwo\endcsname\relax + \long\def\@firstoftwo#1#2{#1}% + \fi + \expandafter\ifx\csname @secondoftwo\endcsname\relax + \long\def\@secondoftwo#1#2{#2}% + \fi +\else + \def\BIC@Expand#1{% + \romannumeral0\expandafter\expandafter\expandafter\BIC@Space + \pdf@unescapehex{% + \expandafter\expandafter\expandafter + \BIC@StripHexSpace\pdf@escapehex{#1}20\@nil + }% + }% + \def\BIC@StripHexSpace#120#2\@nil{% + #1% + \ifx\\#2\\% + \else + \BIC@AfterFi{% + \BIC@StripHexSpace#2\@nil + }% + \BIC@Fi + }% +\fi +\def\BIC@Normalize#1#2{% + \ifx#2-% + \ifx\\#1\\% + \BIC@AfterFiFi{% + \BIC@Normalize-% + }% + \else + \BIC@AfterFiFi{% + \BIC@Normalize{}% + }% + \fi + \else + \ifx#2+% + \BIC@AfterFiFi{% + \BIC@Normalize{#1}% + }% + \else + \ifx#20% + \BIC@AfterFiFiFi{% + \BIC@NormalizeZero{#1}% + }% + \else + \BIC@AfterFiFiFi{% + \BIC@NormalizeDigits#1#2% + }% + \fi + \fi + \BIC@Fi +} +\def\BIC@NormalizeZero#1#2{% + \ifx#2!% + \BIC@AfterFi{ 0}% + \else + \ifx#20% + \BIC@AfterFiFi{% + \BIC@NormalizeZero{#1}% + }% + \else + \BIC@AfterFiFi{% + \BIC@NormalizeDigits#1#2% + }% + \fi + \BIC@Fi +} +\def\BIC@NormalizeDigits#1!{ #1} +\def\bigintcalcNum#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Normalize + \expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter}% + \BIC@Expand{#1}!% +} +\def\bigintcalcInv#1{% + \romannumeral0\expandafter\expandafter\expandafter\BIC@Space + \bigintcalcNum{-#1}% +} +\def\bigintcalcAbs#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Abs + \bigintcalcNum{#1}% +} +\def\BIC@Abs#1{% + \ifx#1-% + \expandafter\BIC@Space + \else + \expandafter\BIC@Space + \expandafter#1% + \fi +} +\def\bigintcalcSgn#1{% + \number + \expandafter\expandafter\expandafter\BIC@Sgn + \bigintcalcNum{#1}! % +} +\def\BIC@Sgn#1#2!{% + \ifx#1-% + -1% + \else + \ifx#10% + 0% + \else + 1% + \fi + \fi +} +\def\bigintcalcCmp#1#2{% + \number + \expandafter\expandafter\expandafter\BIC@Cmp + \bigintcalcNum{#2}!{#1}% +} +\def\BIC@Cmp#1!#2{% + \expandafter\expandafter\expandafter\BIC@@Cmp + \bigintcalcNum{#2}!#1!% +} +\def\BIC@@Cmp#1#2!#3#4!{% + \ifx#1-% + \ifx#3-% + \BIC@AfterFiFi{% + \BIC@@Cmp#4!#2!% + }% + \else + \BIC@AfterFiFi{% + -1 % + }% + \fi + \else + \ifx#3-% + \BIC@AfterFiFi{% + 1 % + }% + \else + \BIC@AfterFiFi{% + \BIC@CmpLength#1#2!#3#4!#1#2!#3#4!% + }% + \fi + \BIC@Fi +} +\def\BIC@PosCmp#1!#2!{% + \BIC@CmpLength#1!#2!#1!#2!% +} +\def\BIC@CmpLength#1#2!#3#4!{% + \ifx\\#2\\% + \ifx\\#4\\% + \BIC@AfterFiFi\BIC@CmpDiff + \else + \BIC@AfterFiFi{% + \BIC@CmpResult{-1}% + }% + \fi + \else + \ifx\\#4\\% + \BIC@AfterFiFi{% + \BIC@CmpResult1% + }% + \else + \BIC@AfterFiFi{% + \BIC@CmpLength#2!#4!% + }% + \fi + \BIC@Fi +} +\def\BIC@CmpResult#1#2!#3!{#1 } +\def\BIC@CmpDiff#1#2!#3#4!{% + \ifnum#1<#3 % + \BIC@AfterFi{% + -1 % + }% + \else + \ifnum#1>#3 % + \BIC@AfterFiFi{% + 1 % + }% + \else + \ifx\\#2\\% + \BIC@AfterFiFiFi{% + 0 % + }% + \else + \BIC@AfterFiFiFi{% + \BIC@CmpDiff#2!#4!% + }% + \fi + \fi + \BIC@Fi +} +\def\bigintcalcMin#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@MinMax + \bigintcalcNum{#1}!-!% +} +\def\bigintcalcMax#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@MinMax + \bigintcalcNum{#1}!!% +} +\def\BIC@MinMax#1!#2!#3{% + \expandafter\expandafter\expandafter\BIC@@MinMax + \bigintcalcNum{#3}!#1!#2!% +} +\def\BIC@@MinMax#1!#2!#3!{% + \ifnum\BIC@@Cmp#1!#2!=#31 % + \BIC@AfterFi{ #1}% + \else + \BIC@AfterFi{ #2}% + \BIC@Fi +} +\def\bigintcalcOdd#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Odd + \bigintcalcAbs{#1}!% +} +\def\BigIntCalcOdd#1!{% + \romannumeral0% + \BIC@Odd#1!% +} +\def\BIC@Odd#1#2{% + \ifx#2!% + \ifodd#1 % + \BIC@AfterFiFi{ 1}% + \else + \BIC@AfterFiFi{ 0}% + \fi + \else + \expandafter\BIC@Odd\expandafter#2% + \BIC@Fi +} +\def\bigintcalcInc#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@IncSwitch + \bigintcalcNum{#1}!% +} +\def\BIC@IncSwitch#1#2!{% + \ifcase\BIC@@Cmp#1#2!-1!% + \BIC@AfterFi{ 0}% + \or + \BIC@AfterFi{% + \BIC@Inc#1#2!{}% + }% + \else + \BIC@AfterFi{% + \expandafter-\romannumeral0% + \BIC@Dec#2!{}% + }% + \BIC@Fi +} +\def\bigintcalcDec#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@DecSwitch + \bigintcalcNum{#1}!% +} +\def\BIC@DecSwitch#1#2!{% + \ifcase\BIC@Sgn#1#2! % + \BIC@AfterFi{ -1}% + \or + \BIC@AfterFi{% + \BIC@Dec#1#2!{}% + }% + \else + \BIC@AfterFi{% + \expandafter-\romannumeral0% + \BIC@Inc#2!{}% + }% + \BIC@Fi +} +\def\BigIntCalcInc#1!{% + \romannumeral0\BIC@Inc#1!{}% +} +\def\BigIntCalcDec#1!{% + \romannumeral0\BIC@Dec#1!{}% +} +\def\BIC@Inc#1#2!#3{% + \ifx\\#2\\% + \BIC@AfterFi{% + \BIC@@Inc1#1#3!{}% + }% + \else + \BIC@AfterFi{% + \BIC@Inc#2!{#1#3}% + }% + \BIC@Fi +} +\def\BIC@@Inc#1#2#3!#4{% + \ifcase#1 % + \ifx\\#3\\% + \BIC@AfterFiFi{ #2#4}% + \else + \BIC@AfterFiFi{% + \BIC@@Inc0#3!{#2#4}% + }% + \fi + \else + \ifnum#2<9 % + \BIC@AfterFiFi{% +& \expandafter\BIC@@@Inc\the\numexpr#2+1\relax +$ \expandafter\expandafter\expandafter\BIC@@@Inc +$ \ifcase#2 \expandafter1% +$ \or\expandafter2% +$ \or\expandafter3% +$ \or\expandafter4% +$ \or\expandafter5% +$ \or\expandafter6% +$ \or\expandafter7% +$ \or\expandafter8% +$ \or\expandafter9% +$? \else\BigIntCalcError:ThisCannotHappen% +$ \fi + 0#3!{#4}% + }% + \else + \BIC@AfterFiFi{% + \BIC@@@Inc01#3!{#4}% + }% + \fi + \BIC@Fi +} +\def\BIC@@@Inc#1#2#3!#4{% + \ifx\\#3\\% + \ifnum#2=1 % + \BIC@AfterFiFi{ 1#1#4}% + \else + \BIC@AfterFiFi{ #1#4}% + \fi + \else + \BIC@AfterFi{% + \BIC@@Inc#2#3!{#1#4}% + }% + \BIC@Fi +} +\def\BIC@Dec#1#2!#3{% + \ifx\\#2\\% + \BIC@AfterFi{% + \BIC@@Dec1#1#3!{}% + }% + \else + \BIC@AfterFi{% + \BIC@Dec#2!{#1#3}% + }% + \BIC@Fi +} +\def\BIC@@Dec#1#2#3!#4{% + \ifcase#1 % + \ifx\\#3\\% + \BIC@AfterFiFi{ #2#4}% + \else + \BIC@AfterFiFi{% + \BIC@@Dec0#3!{#2#4}% + }% + \fi + \else + \ifnum#2>0 % + \BIC@AfterFiFi{% +& \expandafter\BIC@@@Dec\the\numexpr#2-1\relax +$ \expandafter\expandafter\expandafter\BIC@@@Dec +$ \ifcase#2 +$? \BigIntCalcError:ThisCannotHappen% +$ \or\expandafter0% +$ \or\expandafter1% +$ \or\expandafter2% +$ \or\expandafter3% +$ \or\expandafter4% +$ \or\expandafter5% +$ \or\expandafter6% +$ \or\expandafter7% +$ \or\expandafter8% +$? \else\BigIntCalcError:ThisCannotHappen% +$ \fi + 0#3!{#4}% + }% + \else + \BIC@AfterFiFi{% + \BIC@@@Dec91#3!{#4}% + }% + \fi + \BIC@Fi +} +\def\BIC@@@Dec#1#2#3!#4{% + \ifx\\#3\\% + \ifcase#1 % + \ifx\\#4\\% + \BIC@AfterFiFiFi{ 0}% + \else + \BIC@AfterFiFiFi{ #4}% + \fi + \else + \BIC@AfterFiFi{ #1#4}% + \fi + \else + \BIC@AfterFi{% + \BIC@@Dec#2#3!{#1#4}% + }% + \BIC@Fi +} +\def\bigintcalcAdd#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Add + \bigintcalcNum{#1}!% +} +\def\BIC@Add#1!#2{% + \expandafter\expandafter\expandafter + \BIC@AddSwitch\bigintcalcNum{#2}!#1!% +} +\def\bigintcalcSub#1#2{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Add + \bigintcalcNum{-#2}!{#1}% +} +\def\BIC@AddSwitch#1#2!#3#4!{% + \ifx#1-% x < 0 + \ifx#3-% y < 0 + \expandafter-\romannumeral0% + \ifnum\BIC@PosCmp#2!#4!=1 % -x > -y + \BIC@AfterFiFiFi{% + \BIC@AddXY#2!#4!!!% + }% + \else % -x <= -y + \BIC@AfterFiFiFi{% + \BIC@AddXY#4!#2!!!% + }% + \fi + \else % y >= 0 + \ifcase\BIC@PosCmp#2!#3#4!% -x = y + \BIC@AfterFiFiFi{ 0}% + \or % -x > y + \expandafter-\romannumeral0% + \BIC@AfterFiFiFi{% + \BIC@SubXY#2!#3#4!!!% + }% + \else % -x <= y + \BIC@AfterFiFiFi{% + \BIC@SubXY#3#4!#2!!!% + }% + \fi + \fi + \else % x >= 0 + \ifx#3-% y < 0 + \ifcase\BIC@PosCmp#1#2!#4!% x = -y + \BIC@AfterFiFiFi{ 0}% + \or % x > -y + \BIC@AfterFiFiFi{% + \BIC@SubXY#1#2!#4!!!% + }% + \else % x <= -y + \expandafter-\romannumeral0% + \BIC@AfterFiFiFi{% + \BIC@SubXY#4!#1#2!!!% + }% + \fi + \else % y >= 0 + \ifnum\BIC@PosCmp#1#2!#3#4!=1 % x > y + \BIC@AfterFiFiFi{% + \BIC@AddXY#1#2!#3#4!!!% + }% + \else % x <= y + \BIC@AfterFiFiFi{% + \BIC@AddXY#3#4!#1#2!!!% + }% + \fi + \fi + \BIC@Fi +} +\def\BigIntCalcAdd#1!#2!{% + \romannumeral0\BIC@AddXY#1!#2!!!% +} +\def\BigIntCalcSub#1!#2!{% + \romannumeral0\BIC@SubXY#1!#2!!!% +} +\def\BIC@AddXY#1#2!#3#4!#5!#6!{% + \ifx\\#2\\% + \ifx\\#3\\% + \BIC@AfterFiFi{% + \BIC@DoAdd0!#1#5!#60!% + }% + \else + \BIC@AfterFiFi{% + \BIC@DoAdd0!#1#5!#3#6!% + }% + \fi + \else + \ifx\\#4\\% + \ifx\\#3\\% + \BIC@AfterFiFiFi{% + \BIC@AddXY#2!{}!#1#5!#60!% + }% + \else + \BIC@AfterFiFiFi{% + \BIC@AddXY#2!{}!#1#5!#3#6!% + }% + \fi + \else + \BIC@AfterFiFi{% + \BIC@AddXY#2!#4!#1#5!#3#6!% + }% + \fi + \BIC@Fi +} +\def\BIC@DoAdd#1#2!#3#4!#5#6!{% + \ifx\\#4\\% + \BIC@AfterFi{% +& \expandafter\BIC@Space +& \the\numexpr#1+#3+#5\relax#2% +$ \expandafter\expandafter\expandafter\BIC@AddResult +$ \BIC@AddDigit#1#3#5#2% + }% + \else + \BIC@AfterFi{% + \expandafter\expandafter\expandafter\BIC@DoAdd + \BIC@AddDigit#1#3#5#2!#4!#6!% + }% + \BIC@Fi +} +$ \def\BIC@AddResult#1{% +$ \ifx#10% +$ \expandafter\BIC@Space +$ \else +$ \expandafter\BIC@Space\expandafter#1% +$ \fi +$ }% +\def\BIC@AddDigit#1#2#3{% + \romannumeral0% +& \expandafter\BIC@@AddDigit\the\numexpr#1+#2+#3!% +$ \expandafter\BIC@@AddDigit\number% +$ \csname +$ BIC@AddCarry% +$ \ifcase#1 % +$ #2% +$ \else +$ \ifcase#2 1\or2\or3\or4\or5\or6\or7\or8\or9\or10\fi +$ \fi +$ \endcsname#3!% +} +\def\BIC@@AddDigit#1!{% + \ifnum#1<10 % + \BIC@AfterFi{ 0#1}% + \else + \BIC@AfterFi{ #1}% + \BIC@Fi +} +$ \expandafter\def\csname BIC@AddCarry0\endcsname#1{#1}% +$ \expandafter\def\csname BIC@AddCarry10\endcsname#1{1#1}% +$ \def\BIC@Temp#1#2{% +$ \expandafter\def\csname BIC@AddCarry#1\endcsname##1{% +$ \ifcase##1 #1\or +$ #2% +$? \else\BigIntCalcError:ThisCannotHappen% +$ \fi +$ }% +$ }% +$ \BIC@Temp 0{1\or2\or3\or4\or5\or6\or7\or8\or9}% +$ \BIC@Temp 1{2\or3\or4\or5\or6\or7\or8\or9\or10}% +$ \BIC@Temp 2{3\or4\or5\or6\or7\or8\or9\or10\or11}% +$ \BIC@Temp 3{4\or5\or6\or7\or8\or9\or10\or11\or12}% +$ \BIC@Temp 4{5\or6\or7\or8\or9\or10\or11\or12\or13}% +$ \BIC@Temp 5{6\or7\or8\or9\or10\or11\or12\or13\or14}% +$ \BIC@Temp 6{7\or8\or9\or10\or11\or12\or13\or14\or15}% +$ \BIC@Temp 7{8\or9\or10\or11\or12\or13\or14\or15\or16}% +$ \BIC@Temp 8{9\or10\or11\or12\or13\or14\or15\or16\or17}% +$ \BIC@Temp 9{10\or11\or12\or13\or14\or15\or16\or17\or18}% +\def\BIC@SubXY#1#2!#3#4!#5!#6!{% + \ifx\\#2\\% + \ifx\\#3\\% + \BIC@AfterFiFi{% + \BIC@DoSub0!#1#5!#60!% + }% + \else + \BIC@AfterFiFi{% + \BIC@DoSub0!#1#5!#3#6!% + }% + \fi + \else + \ifx\\#4\\% + \ifx\\#3\\% + \BIC@AfterFiFiFi{% + \BIC@SubXY#2!{}!#1#5!#60!% + }% + \else + \BIC@AfterFiFiFi{% + \BIC@SubXY#2!{}!#1#5!#3#6!% + }% + \fi + \else + \BIC@AfterFiFi{% + \BIC@SubXY#2!#4!#1#5!#3#6!% + }% + \fi + \BIC@Fi +} +\def\BIC@DoSub#1#2!#3#4!#5#6!{% + \ifx\\#4\\% + \BIC@AfterFi{% + \expandafter\expandafter\expandafter\BIC@SubResult + \BIC@SubDigit#1#3#5#2% + }% + \else + \BIC@AfterFi{% + \expandafter\expandafter\expandafter\BIC@DoSub + \BIC@SubDigit#1#3#5#2!#4!#6!% + }% + \BIC@Fi +} +\def\BIC@SubResult#1{% + \ifx#10% + \expandafter\BIC@SubResult + \else + \expandafter\BIC@Space\expandafter#1% + \fi +} +\def\BIC@SubDigit#1#2#3{% + \romannumeral0% +& \expandafter\BIC@@SubDigit\the\numexpr#2-#3-#1!% +$ \expandafter\BIC@@AddDigit\number +$ \csname +$ BIC@SubCarry% +$ \ifcase#1 % +$ #3% +$ \else +$ \ifcase#3 1\or2\or3\or4\or5\or6\or7\or8\or9\or10\fi +$ \fi +$ \endcsname#2!% +} +& \def\BIC@@SubDigit#1!{% +& \ifnum#1<0 % +& \BIC@AfterFi{% +& \expandafter\BIC@Space +& \expandafter1\the\numexpr#1+10\relax +& }% +& \else +& \BIC@AfterFi{ 0#1}% +& \BIC@Fi +& }% +$ \expandafter\def\csname BIC@SubCarry0\endcsname#1{#1}% +$ \expandafter\def\csname BIC@SubCarry10\endcsname#1{1#1}% +$ \def\BIC@Temp#1#2{% +$ \expandafter\def\csname BIC@SubCarry#1\endcsname##1{% +$ \ifcase##1 #2% +$? \else\BigIntCalcError:ThisCannotHappen% +$ \fi +$ }% +$ }% +$ \BIC@Temp 1{19\or0\or1\or2\or3\or4\or5\or6\or7\or8}% +$ \BIC@Temp 2{18\or19\or0\or1\or2\or3\or4\or5\or6\or7}% +$ \BIC@Temp 3{17\or18\or19\or0\or1\or2\or3\or4\or5\or6}% +$ \BIC@Temp 4{16\or17\or18\or19\or0\or1\or2\or3\or4\or5}% +$ \BIC@Temp 5{15\or16\or17\or18\or19\or0\or1\or2\or3\or4}% +$ \BIC@Temp 6{14\or15\or16\or17\or18\or19\or0\or1\or2\or3}% +$ \BIC@Temp 7{13\or14\or15\or16\or17\or18\or19\or0\or1\or2}% +$ \BIC@Temp 8{12\or13\or14\or15\or16\or17\or18\or19\or0\or1}% +$ \BIC@Temp 9{11\or12\or13\or14\or15\or16\or17\or18\or19\or0}% +\def\bigintcalcShl#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Shl + \bigintcalcNum{#1}!% +} +\def\BIC@Shl#1#2!{% + \ifx#1-% + \BIC@AfterFi{% + \expandafter-\romannumeral0% +& \BIC@@Shl#2!!% +$ \BIC@AddXY#2!#2!!!% + }% + \else + \BIC@AfterFi{% +& \BIC@@Shl#1#2!!% +$ \BIC@AddXY#1#2!#1#2!!!% + }% + \BIC@Fi +} +\def\BigIntCalcShl#1!{% + \romannumeral0% +& \BIC@@Shl#1!!% +$ \BIC@AddXY#1!#1!!!% +} +& \def\BIC@@Shl#1#2!{% +& \ifx\\#2\\% +& \BIC@AfterFi{% +& \BIC@@@Shl0!#1% +& }% +& \else +& \BIC@AfterFi{% +& \BIC@@Shl#2!#1% +& }% +& \BIC@Fi +& }% +& \def\BIC@@@Shl#1#2!#3#4!{% +& \ifx\\#4\\% +& \BIC@AfterFi{% +& \expandafter\BIC@Space +& \the\numexpr#3*2+#1\relax#2% +& }% +& \else +& \BIC@AfterFi{% +& \expandafter\BIC@@@@Shl\the\numexpr#3*2+#1!#2!#4!% +& }% +& \BIC@Fi +& }% +& \def\BIC@@@@Shl#1!{% +& \ifnum#1<10 % +& \BIC@AfterFi{% +& \BIC@@@Shl0#1% +& }% +& \else +& \BIC@AfterFi{% +& \BIC@@@Shl#1% +& }% +& \BIC@Fi +& }% +\def\bigintcalcShr#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Shr + \bigintcalcNum{#1}!% +} +\def\BIC@Shr#1#2!{% + \ifx#1-% + \expandafter-\romannumeral0% + \BIC@AfterFi{% + \BIC@@Shr#2!% + }% + \else + \BIC@AfterFi{% + \BIC@@Shr#1#2!% + }% + \BIC@Fi +} +\def\BigIntCalcShr#1!{% + \romannumeral0% + \BIC@@Shr#1!% +} +\def\BIC@@Shr#1#2!{% + \ifcase#1 % + \BIC@AfterFi{ 0}% + \or + \ifx\\#2\\% + \BIC@AfterFiFi{ 0}% + \else + \BIC@AfterFiFi{% + \BIC@@@Shr#1#2!!% + }% + \fi + \else + \BIC@AfterFi{% + \BIC@@@Shr0#1#2!!% + }% + \BIC@Fi +} +\def\BIC@@@Shr#1#2#3!#4!{% + \ifx\\#3\\% + \ifodd#1#2 % + \BIC@AfterFiFi{% +& \expandafter\BIC@ShrResult\the\numexpr(#1#2-1)/2\relax +$ \expandafter\expandafter\expandafter\BIC@ShrResult +$ \csname BIC@ShrDigit#1#2\endcsname + #4!% + }% + \else + \BIC@AfterFiFi{% +& \expandafter\BIC@ShrResult\the\numexpr#1#2/2\relax +$ \expandafter\expandafter\expandafter\BIC@ShrResult +$ \csname BIC@ShrDigit#1#2\endcsname + #4!% + }% + \fi + \else + \ifodd#1#2 % + \BIC@AfterFiFi{% +& \expandafter\BIC@@@@Shr\the\numexpr(#1#2-1)/2\relax1% +$ \expandafter\expandafter\expandafter\BIC@@@@Shr +$ \csname BIC@ShrDigit#1#2\endcsname + #3!#4!% + }% + \else + \BIC@AfterFiFi{% +& \expandafter\BIC@@@@Shr\the\numexpr#1#2/2\relax0% +$ \expandafter\expandafter\expandafter\BIC@@@@Shr +$ \csname BIC@ShrDigit#1#2\endcsname + #3!#4!% + }% + \fi + \BIC@Fi +} +& \def\BIC@ShrResult#1#2!{ #2#1}% +$ \def\BIC@ShrResult#1#2#3!{ #3#1}% +\def\BIC@@@@Shr#1#2#3!#4!{% + \BIC@@@Shr#2#3!#4#1!% +} +$ \def\BIC@Temp#1#2#3#4{% +$ \expandafter\def\csname BIC@ShrDigit#1#2\endcsname{#3#4}% +$ }% +$ \BIC@Temp 0000% +$ \BIC@Temp 0101% +$ \BIC@Temp 0210% +$ \BIC@Temp 0311% +$ \BIC@Temp 0420% +$ \BIC@Temp 0521% +$ \BIC@Temp 0630% +$ \BIC@Temp 0731% +$ \BIC@Temp 0840% +$ \BIC@Temp 0941% +$ \BIC@Temp 1050% +$ \BIC@Temp 1151% +$ \BIC@Temp 1260% +$ \BIC@Temp 1361% +$ \BIC@Temp 1470% +$ \BIC@Temp 1571% +$ \BIC@Temp 1680% +$ \BIC@Temp 1781% +$ \BIC@Temp 1890% +$ \BIC@Temp 1991% +\def\BIC@Tim#1!#2{% + \romannumeral0% + \ifcase#2 % 0 + \BIC@AfterFi{ 0}% + \or % 1 + \BIC@AfterFi{ #1}% + \or % 2 + \BIC@AfterFi{% + \BIC@Shl#1!% + }% + \else % 3-9 + \BIC@AfterFi{% + \BIC@@Tim#1!!#2% + }% + \BIC@Fi +} +\def\BIC@@Tim#1#2!{% + \ifx\\#2\\% + \BIC@AfterFi{% + \BIC@ProcessTim0!#1% + }% + \else + \BIC@AfterFi{% + \BIC@@Tim#2!#1% + }% + \BIC@Fi +} +\def\BIC@ProcessTim#1#2!#3#4!#5{% + \ifx\\#4\\% + \BIC@AfterFi{% + \expandafter\BIC@Space +& \the\numexpr#3*#5+#1\relax +$ \romannumeral0\BIC@TimDigit#3#5#1% + #2% + }% + \else + \BIC@AfterFi{% + \expandafter\BIC@@ProcessTim +& \the\numexpr#3*#5+#1% +$ \romannumeral0\BIC@TimDigit#3#5#1% + !#2!#4!#5% + }% + \BIC@Fi +} +\def\BIC@@ProcessTim#1#2!{% + \ifx\\#2\\% + \BIC@AfterFi{% + \BIC@ProcessTim0#1% + }% + \else + \BIC@AfterFi{% + \BIC@ProcessTim#1#2% + }% + \BIC@Fi +} +$ \def\BIC@TimDigit#1#2#3{% +$ \ifcase#1 % 0 +$ \BIC@AfterFi{ #3}% +$ \or % 1 +$ \BIC@AfterFi{% +$ \expandafter\BIC@Space +$ \number\csname BIC@AddCarry#2\endcsname#3 % +$ }% +$ \else +$ \ifcase#3 % +$ \BIC@AfterFiFi{% +$ \expandafter\BIC@Space +$ \number\csname BIC@MulDigit#2\endcsname#1 % +$ }% +$ \else +$ \BIC@AfterFiFi{% +$ \expandafter\BIC@Space +$ \romannumeral0% +$ \expandafter\BIC@AddXY +$ \number\csname BIC@MulDigit#2\endcsname#1!% +$ #3!!!% +$ }% +$ \fi +$ \BIC@Fi +$ }% +$ \def\BIC@Temp#1#2{% +$ \expandafter\def\csname BIC@MulDigit#1\endcsname##1{% +$ \ifcase##1 0% +$ \or ##1% +$ \or #2% +$? \else\BigIntCalcError:ThisCannotHappen% +$ \fi +$ }% +$ }% +$ \BIC@Temp 3{6\or9\or12\or15\or18\or21\or24\or27}% +$ \BIC@Temp 4{8\or12\or16\or20\or24\or28\or32\or36}% +$ \BIC@Temp 5{10\or15\or20\or25\or30\or35\or40\or45}% +$ \BIC@Temp 6{12\or18\or24\or30\or36\or42\or48\or54}% +$ \BIC@Temp 7{14\or21\or28\or35\or42\or49\or56\or63}% +$ \BIC@Temp 8{16\or24\or32\or40\or48\or56\or64\or72}% +$ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% +\def\bigintcalcMul#1#2{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Mul + \bigintcalcNum{#1}!{#2}% +} +\def\BIC@Mul#1!#2{% + \expandafter\expandafter\expandafter\BIC@MulSwitch + \bigintcalcNum{#2}!#1!% +} +\def\BIC@MulSwitch#1#2!#3#4!{% + \ifcase\BIC@Sgn#1#2! % x = 0 + \BIC@AfterFi{ 0}% + \or % x > 0 + \ifcase\BIC@Sgn#3#4! % y = 0 + \BIC@AfterFiFi{ 0}% + \or % y > 0 + \ifnum\BIC@PosCmp#1#2!#3#4!=1 % x > y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#1#2!#3#4!% + }% + \else % x <= y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#3#4!#1#2!% + }% + \fi + \else % y < 0 + \expandafter-\romannumeral0% + \ifnum\BIC@PosCmp#1#2!#4!=1 % x > -y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#1#2!#4!% + }% + \else % x <= -y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#4!#1#2!% + }% + \fi + \fi + \else % x < 0 + \ifcase\BIC@Sgn#3#4! % y = 0 + \BIC@AfterFiFi{ 0}% + \or % y > 0 + \expandafter-\romannumeral0% + \ifnum\BIC@PosCmp#2!#3#4!=1 % -x > y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#2!#3#4!% + }% + \else % -x <= y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#3#4!#2!% + }% + \fi + \else % y < 0 + \ifnum\BIC@PosCmp#2!#4!=1 % -x > -y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#2!#4!% + }% + \else % -x <= -y + \BIC@AfterFiFiFi{% + \BIC@ProcessMul0!#4!#2!% + }% + \fi + \fi + \BIC@Fi +} +\def\BigIntCalcMul#1!#2!{% + \romannumeral0% + \BIC@ProcessMul0!#1!#2!% +} +\def\BIC@ProcessMul#1!#2!#3#4!{% + \ifx\\#4\\% + \BIC@AfterFi{% + \expandafter\expandafter\expandafter\BIC@Space + \bigintcalcAdd{\BIC@Tim#2!#3}{#10}% + }% + \else + \BIC@AfterFi{% + \expandafter\expandafter\expandafter\BIC@ProcessMul + \bigintcalcAdd{\BIC@Tim#2!#3}{#10}!#2!#4!% + }% + \BIC@Fi +} + +\def\bigintcalcSqr#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Sqr + \bigintcalcNum{#1}!% +} +\def\BIC@Sqr#1{% + \ifx#1-% + \expandafter\BIC@@Sqr + \else + \expandafter\BIC@@Sqr\expandafter#1% + \fi +} +\def\BIC@@Sqr#1!{% + \BIC@ProcessMul0!#1!#1!% +} +\def\bigintcalcFac#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Fac + \bigintcalcNum{#1}!% +} +\def\BIC@Fac#1#2!{% + \ifx#1-% + \BIC@AfterFi{ 0\BigIntCalcError:FacNegative}% + \else + \ifnum\BIC@PosCmp#1#2!13!<0 % + \ifcase#1#2 % + \BIC@AfterFiFiFi{ 1}% 0! + \or\BIC@AfterFiFiFi{ 1}% 1! + \or\BIC@AfterFiFiFi{ 2}% 2! + \or\BIC@AfterFiFiFi{ 6}% 3! + \or\BIC@AfterFiFiFi{ 24}% 4! + \or\BIC@AfterFiFiFi{ 120}% 5! + \or\BIC@AfterFiFiFi{ 720}% 6! + \or\BIC@AfterFiFiFi{ 5040}% 7! + \or\BIC@AfterFiFiFi{ 40320}% 8! + \or\BIC@AfterFiFiFi{ 362880}% 9! + \or\BIC@AfterFiFiFi{ 3628800}% 10! + \or\BIC@AfterFiFiFi{ 39916800}% 11! + \or\BIC@AfterFiFiFi{ 479001600}% 12! +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \else + \BIC@AfterFiFi{% + \BIC@ProcessFac#1#2!479001600!% + }% + \fi + \BIC@Fi +} +\def\BIC@ProcessFac#1!#2!{% + \ifnum\BIC@PosCmp#1!12!=0 % + \BIC@AfterFi{ #2}% + \else + \BIC@AfterFi{% + \expandafter\BIC@@ProcessFac + \romannumeral0\BIC@ProcessMul0!#2!#1!% + !#1!% + }% + \BIC@Fi +} +\def\BIC@@ProcessFac#1!#2!{% + \expandafter\BIC@ProcessFac + \romannumeral0\BIC@Dec#2!{}% + !#1!% +} +\def\bigintcalcPow#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Pow + \bigintcalcNum{#1}!% +} +\def\BIC@Pow#1!#2{% + \expandafter\expandafter\expandafter\BIC@PowSwitch + \bigintcalcNum{#2}!#1!% +} +\def\BIC@PowSwitch#1#2!#3#4!{% + \ifcase\ifx\\#2\\% + \ifx#100 % y = 0 + \else\ifx#111 % y = 1 + \else\ifx#122 % y = 2 + \else4 % y > 2 + \fi\fi\fi + \else + \ifx#1-3 % y < 0 + \else4 % y > 2 + \fi + \fi + \BIC@AfterFi{ 1}% y = 0 + \or % y = 1 + \BIC@AfterFi{ #3#4}% + \or % y = 2 + \ifx#3-% x < 0 + \BIC@AfterFiFi{% + \BIC@ProcessMul0!#4!#4!% + }% + \else % x >= 0 + \BIC@AfterFiFi{% + \BIC@ProcessMul0!#3#4!#3#4!% + }% + \fi + \or % y < 0 + \ifcase\ifx\\#4\\% + \ifx#300 % x = 0 + \else\ifx#311 % x = 1 + \else3 % x > 1 + \fi\fi + \else + \ifcase\BIC@MinusOne#3#4! % + 3 % |x| > 1 + \or + 2 % x = -1 +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \fi + \BIC@AfterFiFi{ 0\BigIntCalcError:DivisionByZero}% x = 0 + \or % x = 1 + \BIC@AfterFiFi{ 1}% x = 1 + \or % x = -1 + \ifcase\BIC@ModTwo#2! % even(y) + \BIC@AfterFiFiFi{ 1}% + \or % odd(y) + \BIC@AfterFiFiFi{ -1}% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \or % |x| > 1 + \BIC@AfterFiFi{ 0}% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \or % y > 2 + \ifcase\ifx\\#4\\% + \ifx#300 % x = 0 + \else\ifx#311 % x = 1 + \else4 % x > 1 + \fi\fi + \else + \ifx#3-% + \ifcase\BIC@MinusOne#3#4! % + 3 % x < -1 + \else + 2 % x = -1 + \fi + \else + 4 % x > 1 + \fi + \fi + \BIC@AfterFiFi{ 0}% x = 0 + \or % x = 1 + \BIC@AfterFiFi{ 1}% x = 1 + \or % x = -1 + \ifcase\BIC@ModTwo#1#2! % even(y) + \BIC@AfterFiFiFi{ 1}% + \or % odd(y) + \BIC@AfterFiFiFi{ -1}% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \or % x < -1 + \ifcase\BIC@ModTwo#1#2! % even(y) + \BIC@AfterFiFiFi{% + \BIC@PowRec#4!#1#2!1!% + }% + \or % odd(y) + \expandafter-\romannumeral0% + \BIC@AfterFiFiFi{% + \BIC@PowRec#4!#1#2!1!% + }% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \or % x > 1 + \BIC@AfterFiFi{% + \BIC@PowRec#3#4!#1#2!1!% + }% +? \else\BigIntCalcError:ThisCannotHappen% + \fi +? \else\BigIntCalcError:ThisCannotHappen% + \BIC@Fi +} +\def\BIC@ModTwo#1#2!{% + \ifx\\#2\\% + \ifodd#1 % + \BIC@AfterFiFi1% + \else + \BIC@AfterFiFi0% + \fi + \else + \BIC@AfterFi{% + \BIC@ModTwo#2!% + }% + \BIC@Fi +} +\def\BIC@MinusOne#1#2!{% + \ifx#1-% + \BIC@@MinusOne#2!% + \else + 0% + \fi +} +\def\BIC@@MinusOne#1#2!{% + \ifx#11% + \ifx\\#2\\% + 1% + \else + 0% + \fi + \else + 0% + \fi +} +\def\BIC@PowRec#1!#2#3!#4!{% + \ifcase\ifx#21\ifx\\#3\\0 \else1 \fi\else1 \fi % y = 1 + \ifnum\BIC@PosCmp#1!#4!=1 % x > r + \BIC@AfterFiFi{% + \BIC@ProcessMul0!#1!#4!% + }% + \else + \BIC@AfterFiFi{% + \BIC@ProcessMul0!#4!#1!% + }% + \fi + \or + \ifcase\BIC@ModTwo#2#3! % even(y) + \BIC@AfterFiFi{% + \expandafter\BIC@@PowRec\romannumeral0% + \BIC@@Shr#2#3!% + !#1!#4!% + }% + \or % odd(y) + \ifnum\BIC@PosCmp#1!#4!=1 % x > r + \BIC@AfterFiFiFi{% + \expandafter\BIC@@@PowRec\romannumeral0% + \BIC@ProcessMul0!#1!#4!% + !#1!#2#3!% + }% + \else + \BIC@AfterFiFiFi{% + \expandafter\BIC@@@PowRec\romannumeral0% + \BIC@ProcessMul0!#1!#4!% + !#1!#2#3!% + }% + \fi +? \else\BigIntCalcError:ThisCannotHappen% + \fi +? \else\BigIntCalcError:ThisCannotHappen% + \BIC@Fi +} +\def\BIC@@PowRec#1!#2!#3!{% + \expandafter\BIC@PowRec\romannumeral0% + \BIC@ProcessMul0!#2!#2!% + !#1!#3!% +} +\def\BIC@@@PowRec#1!#2!#3!{% + \expandafter\BIC@@PowRec\romannumeral0% + \BIC@@Shr#3!% + !#2!#1!% +} +\def\bigintcalcDiv#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Div + \bigintcalcNum{#1}!% +} +\def\BIC@Div#1!#2{% + \expandafter\expandafter\expandafter\BIC@DivSwitchSign + \bigintcalcNum{#2}!#1!% +} +\def\BigIntCalcDiv#1!#2!{% + \romannumeral0% + \BIC@DivSwitchSign#2!#1!% +} +\def\BIC@DivSwitchSign#1#2!#3#4!{% + \ifcase\BIC@Sgn#1#2! % y = 0 + \BIC@AfterFi{ 0\BigIntCalcError:DivisionByZero}% + \or % y > 0 + \ifcase\BIC@Sgn#3#4! % x = 0 + \BIC@AfterFiFi{ 0}% + \or % x > 0 + \BIC@AfterFiFi{% + \BIC@DivSwitch{}#3#4!#1#2!% + }% + \else % x < 0 + \BIC@AfterFiFi{% + \BIC@DivSwitch-#4!#1#2!% + }% + \fi + \else % y < 0 + \ifcase\BIC@Sgn#3#4! % x = 0 + \BIC@AfterFiFi{ 0}% + \or % x > 0 + \BIC@AfterFiFi{% + \BIC@DivSwitch-#3#4!#2!% + }% + \else % x < 0 + \BIC@AfterFiFi{% + \BIC@DivSwitch{}#4!#2!% + }% + \fi + \BIC@Fi +} +\def\BIC@DivSwitch#1#2!#3#4!{% + \ifcase\BIC@PosCmp#3#4!#2!% y = x + \BIC@AfterFi{ #11}% + \or % y > x + \BIC@AfterFi{ 0}% + \else % y < x + \ifx\\#1\\% + \else + \expandafter-\romannumeral0% + \fi + \ifcase\ifx\\#4\\% + \ifx#310 % y = 1 + \else\ifx#321 % y = 2 + \else\ifx#342 % y = 4 + \else3 % y > 2 + \fi\fi\fi + \else + 3 % y > 2 + \fi + \BIC@AfterFiFi{ #2}% y = 1 + \or % y = 2 + \BIC@AfterFiFi{% + \BIC@@Shr#2!% + }% + \or % y = 4 + \BIC@AfterFiFi{% + \expandafter\BIC@@Shr\romannumeral0% + \BIC@@Shr#2!!% + }% + \or % y > 2 + \BIC@AfterFiFi{% + \BIC@DivStartX#2!#3#4!!!% + }% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \BIC@Fi +} +\def\BIC@DivStartX#1#2!#3#4!#5!#6!{% + \ifx\\#4\\% + \BIC@AfterFi{% + \BIC@DivStartYii#6#3#4!{#5#1}#2=!% + }% + \else + \BIC@AfterFi{% + \BIC@DivStartX#2!#4!#5#1!#6#3!% + }% + \BIC@Fi +} +\def\BIC@DivStartYii#1!{% + \expandafter\BIC@DivStartYiv\romannumeral0% + \BIC@Shl#1!% + !#1!% +} +\def\BIC@DivStartYiv#1!{% + \expandafter\BIC@DivStartYvi\romannumeral0% + \BIC@Shl#1!% + !#1!% +} +\def\BIC@DivStartYvi#1!#2!{% + \expandafter\BIC@DivStartYviii\romannumeral0% + \BIC@AddXY#1!#2!!!% + !#1!#2!% +} +\def\BIC@DivStartYviii#1!#2!{% + \expandafter\BIC@DivStart\romannumeral0% + \BIC@Shl#2!% + !#1!#2!% +} +\def\BIC@DivStart#1!#2!#3!#4!#5!#6!{% + \BIC@ProcessDiv#6!!#5!#4!#3!#2!#1!=% +} +\def\BIC@ProcessDiv#1#2#3!#4!#5!{% + \ifcase\BIC@PosCmp#5!#1!% y = #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#41}}% + \else + \BIC@AfterFiFi{% + \BIC@ProcessDiv#2#3!#41!#5!% + }% + \fi + \or % y > #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#40}}% + \else + \ifx\\#4\\% + \BIC@AfterFiFiFi{% + \BIC@ProcessDiv{#1#2}#3!!#5!% + }% + \else + \BIC@AfterFiFiFi{% + \BIC@ProcessDiv{#1#2}#3!#40!#5!% + }% + \fi + \fi + \else % y < #1 + \BIC@AfterFi{% + \BIC@@ProcessDiv{#1}#2#3!#4!#5!% + }% + \BIC@Fi +} +\def\BIC@DivCleanup#1#2={ #1}% +\def\BIC@@ProcessDiv#1#2#3!#4!#5!#6!#7!{% + \ifcase\BIC@PosCmp#7!#1!% 4y = #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#44}}% + \else + \BIC@AfterFiFi{% + \BIC@ProcessDiv#2#3!#44!#5!#6!#7!% + }% + \fi + \or % 4y > #1 + \ifcase\BIC@PosCmp#6!#1!% 2y = #1 + \ifx#2=% + \BIC@AfterFiFiFi{\BIC@DivCleanup{#42}}% + \else + \BIC@AfterFiFiFi{% + \BIC@ProcessDiv#2#3!#42!#5!#6!#7!% + }% + \fi + \or % 2y > #1 + \ifx#2=% + \BIC@AfterFiFiFi{\BIC@DivCleanup{#41}}% + \else + \BIC@AfterFiFiFi{% + \BIC@DivSub#1!#5!#2#3!#41!#5!#6!#7!% + }% + \fi + \else % 2y < #1 + \BIC@AfterFiFi{% + \expandafter\BIC@ProcessDivII\romannumeral0% + \BIC@SubXY#1!#6!!!% + !#2#3!#4!#5!23% + #6!#7!% + }% + \fi + \else % 4y < #1 + \BIC@AfterFi{% + \BIC@@@ProcessDiv{#1}#2#3!#4!#5!#6!#7!% + }% + \BIC@Fi +} +\def\BIC@DivSub#1!#2!#3{% + \expandafter\BIC@ProcessDiv\expandafter{% + \romannumeral0% + \BIC@SubXY#1!#2!!!% + #3% + }% +} +\def\BIC@ProcessDivII#1!#2#3!#4!#5!#6#7{% + \ifcase\BIC@PosCmp#5!#1!% y = #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#4#7}}% + \else + \BIC@AfterFiFi{% + \BIC@ProcessDiv#2#3!#4#7!#5!% + }% + \fi + \or % y > #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#4#6}}% + \else + \BIC@AfterFiFi{% + \BIC@ProcessDiv{#1#2}#3!#4#6!#5!% + }% + \fi + \else % y < #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#4#7}}% + \else + \BIC@AfterFiFi{% + \BIC@DivSub#1!#5!#2#3!#4#7!#5!% + }% + \fi + \BIC@Fi +} +\def\BIC@@@ProcessDiv#1#2#3!#4!#5!#6!#7!#8!#9!{% + \ifcase\BIC@PosCmp#8!#1!% 6y = #1 + \ifx#2=% + \BIC@AfterFiFi{\BIC@DivCleanup{#46}}% + \else + \BIC@AfterFiFi{% + \BIC@ProcessDiv#2#3!#46!#5!#6!#7!#8!#9!% + }% + \fi + \or % 6y > #1 + \BIC@AfterFi{% + \expandafter\BIC@ProcessDivII\romannumeral0% + \BIC@SubXY#1!#7!!!% + !#2#3!#4!#5!45% + #6!#7!#8!#9!% + }% + \else % 6y < #1 + \ifcase\BIC@PosCmp#9!#1!% 8y = #1 + \ifx#2=% + \BIC@AfterFiFiFi{\BIC@DivCleanup{#48}}% + \else + \BIC@AfterFiFiFi{% + \BIC@ProcessDiv#2#3!#48!#5!#6!#7!#8!#9!% + }% + \fi + \or % 8y > #1 + \BIC@AfterFiFi{% + \expandafter\BIC@ProcessDivII\romannumeral0% + \BIC@SubXY#1!#8!!!% + !#2#3!#4!#5!67% + #6!#7!#8!#9!% + }% + \else % 8y < #1 + \BIC@AfterFiFi{% + \expandafter\BIC@ProcessDivII\romannumeral0% + \BIC@SubXY#1!#9!!!% + !#2#3!#4!#5!89% + #6!#7!#8!#9!% + }% + \fi + \BIC@Fi +} +\def\bigintcalcMod#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\BIC@Mod + \bigintcalcNum{#1}!% +} +\def\BIC@Mod#1!#2{% + \expandafter\expandafter\expandafter\BIC@ModSwitchSign + \bigintcalcNum{#2}!#1!% +} +\def\BigIntCalcMod#1!#2!{% + \romannumeral0% + \BIC@ModSwitchSign#2!#1!% +} +\def\BIC@ModSwitchSign#1#2!#3#4!{% + \ifcase\ifx\\#2\\% + \ifx#100 % y = 0 + \else1 % y > 0 + \fi + \else + \ifx#1-2 % y < 0 + \else1 % y > 0 + \fi + \fi + \BIC@AfterFi{ 0\BigIntCalcError:DivisionByZero}% + \or % y > 0 + \ifcase\ifx\\#4\\\ifx#300 \else1 \fi\else1 \fi % x = 0 + \BIC@AfterFiFi{ 0}% + \else + \BIC@AfterFiFi{% + \BIC@ModSwitch{}#3#4!#1#2!% + }% + \fi + \else % y < 0 + \ifcase\ifx\\#4\\% + \ifx#300 % x = 0 + \else1 % x > 0 + \fi + \else + \ifx#3-2 % x < 0 + \else1 % x > 0 + \fi + \fi + \BIC@AfterFiFi{ 0}% + \or % x > 0 + \BIC@AfterFiFi{% + \BIC@ModSwitch--#3#4!#2!% + }% + \else % x < 0 + \BIC@AfterFiFi{% + \BIC@ModSwitch-#4!#2!% + }% + \fi + \BIC@Fi +} +\def\BIC@ModSwitch#1#2#3!#4#5!{% + \ifcase\ifx\\#5\\% + \ifx#410 % y = 1 + \else\ifx#421 % y = 2 + \else2 % y > 2 + \fi\fi + \else2 % y > 2 + \fi + \BIC@AfterFi{ 0}% y = 1 + \or % y = 2 + \ifcase\BIC@ModTwo#2#3! % even(x) + \BIC@AfterFiFi{ 0}% + \or % odd(x) + \BIC@AfterFiFi{ #11}% +? \else\BigIntCalcError:ThisCannotHappen% + \fi + \or % y > 2 + \ifx\\#1\\% + \else + \expandafter\BIC@Space\romannumeral0% + \expandafter\BIC@ModMinus\romannumeral0% + \fi + \ifx#2-% x < 0 + \BIC@AfterFiFi{% + \expandafter\expandafter\expandafter\BIC@ModX + \bigintcalcSub{#2#3}{% + \bigintcalcMul{#4#5}{\bigintcalcDiv{#2#3}{#4#5}}% + }!#4#5!% + }% + \else % x > 0 + \BIC@AfterFiFi{% + \expandafter\expandafter\expandafter\BIC@Space + \bigintcalcSub{#2#3}{% + \bigintcalcMul{#4#5}{\bigintcalcDiv{#2#3}{#4#5}}% + }% + }% + \fi +? \else\BigIntCalcError:ThisCannotHappen% + \BIC@Fi +} +\def\BIC@ModMinus#1{% + \ifx#10% + \BIC@AfterFi{ 0}% + \else + \BIC@AfterFi{ -#1}% + \BIC@Fi +} +\def\BIC@ModX#1#2!#3!{% + \ifx#1-% z < 0 + \BIC@AfterFi{% + \expandafter\BIC@Space\romannumeral0% + \BIC@SubXY#3!#2!!!% + }% + \else % z >= 0 + \BIC@AfterFi{ #1#2}% + \BIC@Fi +} +\BIC@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{bitset} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@bitset.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{bitset}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@bitset.sty\endcsname +\ProvidesPackage{bitset}% + [2011/01/30 v1.1 Data type bit set (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname BitSet@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\BitSet@AtEnd{% + \BitSet@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{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}{11}% : (letter!) +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{63}{14}% ? (comment!) +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\BitSet@AtEnd{\BitSet@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname BitSet@TestMode\endcsname\relax +\else + \catcode63=9 % ? (ignore) +\fi +? \let\BitSet@@TestMode\BitSet@TestMode +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{intcalc}[2007/09/27]% + \TMP@RequirePackage{bigintcalc}[2007/09/27]% +\else + \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{intcalc}[2007/09/27]% + \RequirePackage{bigintcalc}[2007/09/27]% +\fi +\def\BitSet@MaxSize{2147483647}% +\def\BitSet@Empty{} +\def\BitSet@FirstOfOne#1{#1} +\def\BitSet@Gobble#1{} +\def\BitSet@FirstOfTwo#1#2{#1} +\def\BitSet@SecondOfTwo#1#2{#2} +\def\BitSet@Space{ } +\def\BitSet@ZapSpace#1 #2{% + #1% + \ifx\BitSet@Empty#2% + \else + \expandafter\BitSet@ZapSpace + \fi + #2% +} +\let\BitSet@Fi\fi +\def\BitSet@AfterFi#1#2\BitSet@Fi{\fi#1} +\def\BitSet@AfterFiFi#1#2\BitSet@Fi{\fi\fi#1}% +\def\BitSet@AfterFiFiFi#1#2\BitSet@Fi{\fi\fi\fi#1}% +\def\BitSet@IfUndefined#1{% + \expandafter\ifx\csname BS@#1\endcsname\relax + \expandafter\BitSet@FirstOfTwo + \else + \expandafter\BitSet@SecondOfTwo + \fi +} +\def\BitSet@CheckIndex#1#2#3{% + \BitSet@IfUndefined{#2}{\bitsetReset{#2}}{}% + \expandafter\expandafter\expandafter\BitSet@@CheckIndex + \intcalcNum{#3}!% + {#2}{#1}% +} +\def\BitSet@@CheckIndex#1!#2#3{% + \ifnum#1<0 % + \BitSet@AfterFi{% + \@PackageError{bitset}{% + Invalid negative index (#1)% + }\@ehc + }% + \else + \BitSet@AfterFi{% + #3{#2}{#1}% + }% + \BitSet@Fi +} +\def\bitsetReset#1{% + \expandafter\def\csname BS@#1\endcsname{0}% +} +\def\bitsetLet#1#2{% + \BitSet@IfUndefined{#2}{% + \bitsetReset{#1}% + }{% + \expandafter\let\csname BS@#1\expandafter\endcsname + \csname BS@#2\endcsname + }% +} +\def\bitsetSetBin#1#2{% + \edef\BitSet@Temp{#2}% + \edef\BitSet@Temp{% + \expandafter\expandafter\expandafter\BitSet@ZapSpace + \expandafter\BitSet@Temp\BitSet@Space\BitSet@Empty + }% + \edef\BitSet@Temp{% + \expandafter\BitSet@KillZeros\BitSet@Temp\BitSet@Empty + }% + \ifx\BitSet@Temp\BitSet@Empty + \expandafter\let\csname BS@#1\endcsname\BitSet@Zero + \else + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\BitSet@Reverse\BitSet@Temp!% + }% + \fi +} +\def\BitSet@KillZeros#1{% + \ifx#10% + \expandafter\BitSet@KillZeros + \else + #1% + \fi +} +\def\BitSet@Reverse#1#2!{% + \ifx\\#2\\% + #1% + \else + \BitSet@AfterFi{% + \BitSet@Reverse#2!#1% + }% + \BitSet@Fi +} +\def\bitsetSetOct{% + \BitSet@SetOctHex\BitSet@FromFirstOct +} +\def\bitsetSetHex{% + \BitSet@SetOctHex\BitSet@FromFirstHex +} +\def\BitSet@SetOctHex#1#2#3{% + \edef\BitSet@Temp{#3}% + \edef\BitSet@Temp{% + \expandafter\expandafter\expandafter\BitSet@ZapSpace + \expandafter\BitSet@Temp\BitSet@Space\BitSet@Empty + }% + \edef\BitSet@Temp{% + \expandafter\BitSet@KillZeros\BitSet@Temp\BitSet@Empty + }% + \ifx\BitSet@Temp\BitSet@Empty + \expandafter\let\csname BS@#2\endcsname\BitSet@Zero + \else + \edef\BitSet@Temp{% + \expandafter#1\BitSet@Temp!% + }% + \ifx\BitSet@Temp\BitSet@Empty + \expandafter\let\csname BS@#2\endcsname\BitSet@Zero + \else + \expandafter\edef\csname BS@#2\endcsname{% + \expandafter\BitSet@Reverse\BitSet@Temp!% + }% + \fi + \fi +} +\def\BitSet@FromFirstOct#1{% + \ifx#1!% + \else + \ifcase#1 \BitSet@AfterFiFi\BitSet@FromFirstOct + \or 1% + \or 10% + \or 11% + \or 100% + \or 101% + \or 110% + \or 111% + \else \BitSetError:WrongOctalDigit% + \fi + \expandafter\BitSet@FromOct + \BitSet@Fi +} +\def\BitSet@FromOct#1{% + \ifx#1!% + \else + \ifcase#1 000% + \or 001% + \or 010% + \or 011% + \or 100% + \or 101% + \or 110% + \or 111% + \else \BitSetError:WrongOctalDigit% + \fi + \expandafter\BitSet@FromOct + \fi +} +\def\BitSet@FromFirstHex#1{% + \ifx#1!% + \else + \ifx#10% + \BitSet@AfterFiFi\BitSet@FromFirstHex + \fi + \expandafter\ifx\csname BitSet@Hex#1\endcsname\relax + \BitSetError:InvalidHexDigit% + \else + \expandafter\expandafter\expandafter\BitSet@KillZeros + \csname BitSet@Hex#1\endcsname + \fi + \expandafter\BitSet@FromHex + \BitSet@Fi +} +\def\BitSet@FromHex#1{% + \ifx#1!% + \else + \expandafter\ifx\csname BitSet@Hex#1\endcsname\relax + \BitSetError:InvalidHexDigit% + \else + \csname BitSet@Hex#1\endcsname + \fi + \expandafter\BitSet@FromHex + \fi +} +\def\BitSet@Temp#1{% + \expandafter\def\csname BitSet@Hex#1\endcsname +} +\BitSet@Temp 0{0000}% +\BitSet@Temp 1{0001}% +\BitSet@Temp 2{0010}% +\BitSet@Temp 3{0011}% +\BitSet@Temp 4{0100}% +\BitSet@Temp 5{0101}% +\BitSet@Temp 6{0110}% +\BitSet@Temp 7{0111}% +\BitSet@Temp 8{1000}% +\BitSet@Temp 9{1001}% +\BitSet@Temp A{1010}% +\BitSet@Temp B{1011}% +\BitSet@Temp C{1100}% +\BitSet@Temp D{1101}% +\BitSet@Temp E{1110}% +\BitSet@Temp F{1111}% +\BitSet@Temp a{1010}% +\BitSet@Temp b{1011}% +\BitSet@Temp c{1100}% +\BitSet@Temp d{1101}% +\BitSet@Temp e{1110}% +\BitSet@Temp f{1111}% +\def\bitsetSetDec#1#2{% + \edef\BitSet@Temp{#2}% + \edef\BitSet@Temp{% + \expandafter\expandafter\expandafter\BitSet@ZapSpace + \expandafter\BitSet@Temp\BitSet@Space\BitSet@Empty + }% + \edef\BitSet@Temp{% + \expandafter\BitSet@KillZeros\BitSet@Temp\BitSet@Empty + }% + \ifx\BitSet@Temp\BitSet@Empty + \expandafter\let\csname BS@#1\endcsname\BitSet@Zero + \else + \ifcase\bigintcalcSgn{\BitSet@Temp} % + \expandafter\let\csname BS@#1\endcsname\BitSet@Zero + \or + \ifnum\bigintcalcCmp\BitSet@Temp\BitSet@MaxSize>0 % + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\BitSet@SetDecBig\BitSet@Temp!% + }% + \else + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\BitSet@SetDec\BitSet@Temp!% + }% + \fi + \else + \@PackageError{bitset}{% + Bit sets cannot be negative% + }\@ehc + \fi + \fi +} +\def\BitSet@SetDecBig#1#2#3#4#5#6#7#8#9!{% + \ifx\\#9\\% + \BitSet@SetDec#1#2#3#4#5#6#7#8!% + \else + \ifcase\BigIntCalcOdd#1#2#4#5#6#7#8#9! % + 0% + \or + 1% +? \else\BitSetError:ThisCannotHappen% + \fi + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@SetDecBig + \BigIntCalcShr#1#2#3#4#5#6#7#8#9!!% + }% + \BitSet@Fi +} +\def\BitSet@SetDec#1!{% + \ifcase#1 % + \or 1% + \else + \ifodd#1 % + 1% + \else + 0% + \fi + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@SetDec + \IntCalcShr#1!!% + }% + \BitSet@Fi +} +\def\bitsetGetBin#1#2{% + \romannumeral0% + \expandafter\expandafter\expandafter\BitSet@@GetBin + \intcalcNum{#2}!{#1}% +} +\def\BitSet@@GetBin#1!#2{% + \BitSet@IfUndefined{#2}{% + \ifnum#1>1 % + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@Fill + \IntCalcDec#1!!0% + }% + \else + \BitSet@AfterFi{ 0}% + \BitSet@Fi + }{% + \expandafter\expandafter\expandafter\BitSet@NumBinRev + \expandafter\expandafter\expandafter1% + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!#1!% + }% +} +\def\BitSet@Fill#1!{% + \ifnum#1>0 % + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@Fill + \IntCalcDec#1!!0% + }% + \else + \BitSet@AfterFi{ }% + \BitSet@Fi +} +\def\BitSet@NumBinRev#1!#2#3!{% + \ifx\\#3\\% + \BitSet@AfterFi{% + \BitSet@NumBinFill#1!#2% + }% + \else + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@NumBinRev + \IntCalcInc#1!!#3!#2% + }% + \BitSet@Fi +} +\def\BitSet@NumBinFill#1!#2!#3!{% + \ifnum#3>#1 % + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@Fill + \IntCalcSub#3!#1!!#2% + }% + \else + \BitSet@AfterFi{ #2}% + \BitSet@Fi +} +\def\bitsetGetOct#1#2{% + \romannumeral0% + \bitsetIsEmpty{#1}{% + \expandafter\expandafter\expandafter\BitSet@@GetOctHex + \intcalcNum{#2}!3!230% + }{% + \expandafter\expandafter\expandafter\BitSet@@GetOct + \expandafter\expandafter\expandafter1% + \expandafter\expandafter\expandafter!% + \expandafter\expandafter\expandafter!% + \csname BS@#1\endcsname00% + \BitSet@Empty\BitSet@Empty\BitSet@Empty!{#2}% + }% +} +\def\bitsetGetHex#1#2{% + \romannumeral0% + \bitsetIsEmpty{#1}{% + \expandafter\expandafter\expandafter\BitSet@@GetOctHex + \intcalcNum{#2}!4!340% + }{% + \expandafter\expandafter\expandafter\BitSet@@GetHex + \expandafter\expandafter\expandafter1% + \expandafter\expandafter\expandafter!% + \expandafter\expandafter\expandafter!% + \csname BS@#1\endcsname000% + \BitSet@Empty\BitSet@Empty\BitSet@Empty\BitSet@Empty!{#2}% + }% +} +\def\BitSet@@GetOct#1!#2!#3#4#5{% + \ifx#5\BitSet@Empty + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@GetOctHex + \IntCalcDec#1!!#2!23% + }% + \else + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@@GetOct + \number\IntCalcInc#1!\expandafter\expandafter\expandafter!% + \csname BitSet@Oct#5#4#3\endcsname#2!% + }% + \BitSet@Fi +} +\def\BitSet@Temp#1#2#3#4{% + \expandafter\def\csname BitSet@Oct#1#2#3\endcsname{#4}% +} +\BitSet@Temp0000% +\BitSet@Temp0011% +\BitSet@Temp0102% +\BitSet@Temp0113% +\BitSet@Temp1004% +\BitSet@Temp1015% +\BitSet@Temp1106% +\BitSet@Temp1117% +\def\BitSet@@GetHex#1!#2!#3#4#5#6{% + \ifx#6\BitSet@Empty + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@GetOctHex + \IntCalcDec#1!!#2!34% + }% + \else + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@@GetHex + \number\IntCalcInc#1!\expandafter\expandafter\expandafter!% + \csname BitSet@Hex#6#5#4#3\endcsname#2!% + }% + \BitSet@Fi +} +\def\BitSet@Temp#1#2#3#4#5{% + \expandafter\def\csname BitSet@Hex#1#2#3#4\endcsname{#5}% +} +\BitSet@Temp00000% +\BitSet@Temp00011% +\BitSet@Temp00102% +\BitSet@Temp00113% +\BitSet@Temp01004% +\BitSet@Temp01015% +\BitSet@Temp01106% +\BitSet@Temp01117% +\BitSet@Temp10008% +\BitSet@Temp10019% +\BitSet@Temp1010A% +\BitSet@Temp1011B% +\BitSet@Temp1100C% +\BitSet@Temp1101D% +\BitSet@Temp1110E% +\BitSet@Temp1111F% +\def\BitSet@GetOctHex#1!#2!#3#4#5!#6{% + \expandafter\BitSet@@GetOctHex + \number\intcalcNum{#6}\expandafter\expandafter\expandafter!% + \IntCalcMul#1!#4!!#3#4#2% +} +\def\BitSet@@GetOctHex#1!#2!#3#4{% + \ifnum#1>#2 % + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter\BitSet@Fill + \expandafter\IntCalcDiv\number + \expandafter\expandafter\expandafter\IntCalcAdd + \IntCalcSub#1!#2!!#3!!#4!!% + }% + \else + \BitSet@AfterFi{ }% + \BitSet@Fi +} +\def\bitsetGetDec#1{% + \romannumeral0% + \BitSet@IfUndefined{#1}{ 0}{% + \expandafter\expandafter\expandafter\BitSet@GetDec + \csname BS@#1\endcsname!% + }% +} +\def\BitSet@GetDec#1#2!{% + \ifx\\#2\\% + \BitSet@AfterFi{ #1}% + \else + \BitSet@AfterFi{% + \BitSet@@GetDec2!#1!#2!% + }% + \BitSet@Fi +} +\def\BitSet@@GetDec#1!#2!#3#4!{% + \ifx\\#4\\% + \ifx#31% + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@Space + \IntCalcAdd#1!#2!% + }% + \else + \BitSet@AfterFiFi{ #2}% + \fi + \else + \ifx#31% + \BitSet@AfterFiFi{% + \csname BitSet@N#1% + \expandafter\expandafter\expandafter\endcsname + \IntCalcAdd#1!#2!!#4!% + }% + \else + \BitSet@AfterFiFi{% + \csname BitSet@N#1\endcsname#2!#4!% + }% + \fi + \BitSet@Fi +} +\def\BitSet@Temp#1#2{% + \expandafter\def\csname BitSet@N#1\endcsname{% + \BitSet@@GetDec#2!% + }% +} +\BitSet@Temp{1}{2} +\BitSet@Temp{2}{4} +\BitSet@Temp{4}{8} +\BitSet@Temp{8}{16} +\BitSet@Temp{16}{32} +\BitSet@Temp{32}{64} +\BitSet@Temp{64}{128} +\BitSet@Temp{128}{256} +\BitSet@Temp{256}{512} +\BitSet@Temp{512}{1024} +\BitSet@Temp{1024}{2048} +\BitSet@Temp{2048}{4096} +\BitSet@Temp{4096}{8192} +\BitSet@Temp{8192}{16384} +\BitSet@Temp{16384}{32768} +\BitSet@Temp{32768}{65536} +\BitSet@Temp{65536}{131072} +\BitSet@Temp{131072}{262144} +\BitSet@Temp{262144}{524288} +\BitSet@Temp{524288}{1048576} +\BitSet@Temp{1048576}{2097152} +\BitSet@Temp{2097152}{4194304} +\BitSet@Temp{4194304}{8388608} +\BitSet@Temp{8388608}{16777216} +\BitSet@Temp{16777216}{33554432} +\BitSet@Temp{33554432}{67108864} +\BitSet@Temp{67108864}{134217728} +\BitSet@Temp{134217728}{268435456} +\BitSet@Temp{268435456}{536870912} +\BitSet@Temp{536870912}{1073741824} +\expandafter\def\csname BitSet@N1073741824\endcsname{% + \BitSet@GetDecBig2147483648!% +}% +\def\BitSet@GetDecBig#1!#2!#3#4!{% + \ifx\\#4\\% + \ifx#31% + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@Space + \BigIntCalcAdd#1!#2!% + }% + \else + \BitSet@AfterFiFi{ #2}% + \fi + \else + \ifx#31% + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@@GetDecBig + \BigIntCalcAdd#1!#2!!#1!#4!% + }% + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@GetDecBig + \BigIntCalcShl#1!!#2!#4!% + }% + \fi + \BitSet@Fi +} +\def\BitSet@@GetDecBig#1!#2!{% + \expandafter\expandafter\expandafter\BitSet@GetDecBig + \BigIntCalcShl#2!!#1!% +} +\def\bitsetAnd#1#2{% + \bitsetIsEmpty{#1}{% + \bitsetReset{#1}% + }{% + \bitsetIsEmpty{#2}{% + \bitsetReset{#1}% + }{% + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\expandafter\expandafter\BitSet@And + \csname BS@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!% + }% + \expandafter\ifx\csname BS@#1\endcsname\BitSet@Empty + \bitsetReset{#1}% + \fi + }% + }% +} +\def\BitSet@And#1#2!#3#4!#5!{% + \ifx\\#2\\% + \ifnum#1#3=11 #51\fi + \else + \ifx\\#4\\% + \ifnum#1#3=11 #51\fi + \else + \ifnum#1#3=11 % + #51% + \BitSet@AfterFiFiFi{% + \BitSet@And#2!#4!!% + }% + \else + \BitSet@AfterFiFiFi{% + \BitSet@And#2!#4!#50!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetAndNot#1#2{% + \bitsetIsEmpty{#1}{% + \bitsetReset{#1}% + }{% + \bitsetIsEmpty{#2}{% + }{% + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\expandafter\expandafter\BitSet@AndNot + \csname BS@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!% + }% + \expandafter\ifx\csname BS@#1\endcsname\BitSet@Empty + \bitsetReset{#1}% + \fi + }% + }% +} +\def\BitSet@AndNot#1#2!#3#4!#5!{% + \ifx\\#2\\% + \ifnum#1#3=10 #51\fi + \else + \ifx\\#4\\% + #5% + \ifnum#1#3=10 1\else 0\fi + #2% + \else + \ifnum#1#3=10 % + #51% + \BitSet@AfterFiFiFi{% + \BitSet@AndNot#2!#4!!% + }% + \else + \BitSet@AfterFiFiFi{% + \BitSet@AndNot#2!#4!#50!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetOr#1#2{% + \bitsetIsEmpty{#2}{% + \BitSet@IfUndefined{#1}{\bitsetReset{#1}}{}% + }{% + \bitsetIsEmpty{#1}{% + \expandafter\let\csname BS@#1\expandafter\endcsname + \csname BS@#2\endcsname + }{% + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\expandafter\expandafter\BitSet@Or + \csname BS@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!% + }% + }% + }% +} +\def\BitSet@Or#1#2!#3#4!{% + \ifnum#1#3>0 1\else 0\fi + \ifx\\#2\\% + #4% + \else + \ifx\\#4\\% + #2% + \else + \BitSet@AfterFiFi{% + \BitSet@Or#2!#4!% + }% + \fi + \BitSet@Fi +} +\def\bitsetXor#1#2{% + \bitsetIsEmpty{#2}{% + \BitSet@IfUndefined{#1}{\bitsetReset{#1}}{}% + }{% + \bitsetIsEmpty{#1}{% + \expandafter\let\csname BS@#1\expandafter\endcsname + \csname BS@#2\endcsname + }{% + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\expandafter\expandafter\BitSet@Xor + \csname BS@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!% + }% + \expandafter\ifx\csname BS@#1\endcsname\BitSet@Empty + \bitsetReset{#1}% + \fi + }% + }% +} +\def\BitSet@Xor#1#2!#3#4!#5!{% + \ifx\\#2\\% + \ifx#1#3% + \ifx\\#4\\% + \else + #50#4% + \fi + \else + #51#4% + \fi + \else + \ifx\\#4\\% + #5% + \ifx#1#30\else 1\fi + #2% + \else + \ifx#1#3% + \BitSet@AfterFiFiFi{% + \BitSet@Xor#2!#4!#50!% + }% + \else + #51% + \BitSet@AfterFiFiFi{% + \BitSet@Xor#2!#4!!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetShiftLeft#1#2{% + \BitSet@IfUndefined{#1}{% + \bitsetReset{#1}% + }{% + \bitsetIsEmpty{#1}{% + }{% + \expandafter\expandafter\expandafter\BitSet@ShiftLeft + \intcalcNum{#2}!{#1}% + }% + }% +} +\def\BitSet@ShiftLeft#1!#2{% + \ifcase\intcalcSgn{#1} % + \or + \begingroup + \uccode`m=`0 % + \uppercase\expandafter{\expandafter\endgroup + \expandafter\edef\csname BS@#2\expandafter\endcsname + \expandafter{% + \romannumeral#1000\expandafter\BitSet@Space + \csname BS@#2\endcsname + }% + }% + \else + \expandafter\BitSet@ShiftRight\BitSet@Gobble#1!{#2}% + \fi +} +\def\bitsetShiftRight#1#2{% + \BitSet@IfUndefined{#1}{% + \bitsetReset{#1}% + }{% + \bitsetIsEmpty{#1}{% + }{% + \expandafter\expandafter\expandafter\BitSet@ShiftRight + \intcalcNum{#2}!{#1}% + }% + }% +} +\def\BitSet@ShiftRight#1!#2{% + \ifcase\intcalcSgn{#1} % + \or + \expandafter\edef\csname BS@#2\endcsname{% + \expandafter\expandafter\expandafter\BitSet@Kill + \csname BS@#2\expandafter\endcsname\expandafter\BitSet@Empty + \expandafter=% + \expandafter{\expandafter}\expandafter{\expandafter}% + \romannumeral#1000!% + }% + \else + \expandafter\BitSet@ShiftLeft\BitSet@Gobble#1!{#2}% + \fi +} +\def\BitSet@Kill#1#2=#3#4#5{% + #3#4% + \ifx#5!% + \ifx#1\BitSet@Empty + 0% + \else + #1#2% + \fi + \else + \ifx#1\BitSet@Empty + 0% + \BitSet@AfterFiFi\BitSet@Cleanup + \else + \BitSet@Kill#2=% + \fi + \BitSet@Fi +} +\def\bitsetClear{% + \BitSet@CheckIndex\BitSet@Clear +} +\def\bitsetSet{% + \BitSet@CheckIndex\BitSet@Set +} +\def\bitsetFlip{% + \BitSet@CheckIndex\BitSet@Flip +} +\def\bitsetSetValue#1#2#3{% + \expandafter\expandafter\expandafter\BitSet@SetValue + \intcalcNum{#3}!{#1}{#2}% +} +\def\BitSet@SetValue#1!{% + \BitSet@CheckIndex{% + \ifcase#1 % + \expandafter\BitSet@Clear + \or + \expandafter\BitSet@Set + \else + \BitSet@ErrorInvalidBitValue{#1}% + \expandafter\expandafter\expandafter\BitSet@Gobble + \expandafter\BitSet@Gobble + \fi + }% +} +\def\BitSet@ErrorInvalidBitValue#1{% + \@PackageError{bitset}{% + Invalid bit value (#1) not in range 0..1% + }\@ehc +} +\def\BitSet@Clear#1#2{% + \edef\BitSet@Temp{% + \expandafter\expandafter\expandafter\BitSet@@Clear + \csname BS@#1\expandafter\endcsname + \expandafter\BitSet@Empty\expandafter=\expandafter!% + \romannumeral#2000!% + }% + \expandafter\let\csname BS@#1\expandafter\endcsname + \ifx\BitSet@Temp\BitSet@Empty + \BitSet@Zero + \else + \BitSet@Temp + \fi +} +\def\BitSet@@Clear#1#2=#3!#4{% + \ifx#4!% + \ifx#1\BitSet@Empty + \else + \ifx\BitSet@Empty#2% + \else + #30#2% + \fi + \fi + \else + \ifx#1\BitSet@Empty + \BitSet@AfterFiFi\BitSet@Cleanup + \else + \ifx#10% + \BitSet@AfterFiFiFi{% + \BitSet@@Clear#2=#30!% + }% + \else + #31% + \BitSet@AfterFiFiFi{% + \BitSet@@Clear#2=!% + }% + \fi + \fi + \BitSet@Fi +} +\def\BitSet@Set#1#2{% + \expandafter\edef\csname BS@#1\endcsname{% + \expandafter\expandafter\expandafter\BitSet@@Set + \csname BS@#1\expandafter\endcsname + \expandafter\BitSet@Empty\expandafter=% + \expandafter{\expandafter}\expandafter{\expandafter}% + \romannumeral#2000!% + }% +} +\def\BitSet@@Set#1#2=#3#4#5{% + #3#4% + \ifx#5!% + 1#2% + \else + \ifx#1\BitSet@Empty + 0% + \BitSet@AfterFiFi\BitSet@@@Set + \else + #1% + \BitSet@@Set#2=% + \fi + \BitSet@Fi +} +\def\BitSet@@@Set#1{% + \ifx#1!% + 1% + \else + 0% + \expandafter\BitSet@@@Set + \fi +} +\def\BitSet@Flip#1#2{% + \edef\BitSet@Temp{% + \expandafter\expandafter\expandafter\BitSet@@Flip + \csname BS@#1\expandafter\endcsname + \expandafter\BitSet@Empty\expandafter=\expandafter!% + \romannumeral#2000!% + }% + \expandafter\let\csname BS@#1\expandafter\endcsname + \ifx\BitSet@Temp\BitSet@Empty + \BitSet@Zero + \else + \BitSet@Temp + \fi +} +\def\BitSet@@Flip#1#2=#3!#4{% + \ifx#4!% + \ifx#11% + \ifx\BitSet@Empty#2% + \else + #30#2% + \fi + \else + #31#2% + \fi + \else + \ifx#1\BitSet@Empty + #30% + \BitSet@AfterFiFi\BitSet@@@Set + \else + \ifx#10% + \BitSet@AfterFiFiFi{% + \BitSet@@Flip#2=#30!% + }% + \else + #31% + \BitSet@AfterFiFiFi{% + \BitSet@@Flip#2=!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetClearRange{% + \BitSet@Range\BitSet@Clear +} +\def\bitsetSetRange{% + \BitSet@Range\BitSet@Set +} +\def\bitsetFlipRange{% + \BitSet@Range\BitSet@Flip +} +\def\bitsetSetValueRange#1#2#3#4{% + \expandafter\expandafter\expandafter\BitSet@SetValueRange + \intcalcNum{#4}!{#1}{#2}{#3}% +} +\def\BitSet@SetValueRange#1!#2#3#4{% + \ifcase#1 % + \BitSet@Range\BitSet@Clear{#2}{#3}{#4}% + \or + \BitSet@Range\BitSet@Set{#2}{#3}{#4}% + \else + \BitSet@ErrorInvalidBitValue{#1}% + \fi +} +\def\BitSet@Range#1#2#3#4{% + \edef\BitSet@Temp{% + \noexpand\BitSet@@Range\noexpand#1{#2}% + \intcalcNum{#3}!\intcalcNum{#4}!% + }% + \BitSet@Temp +} +\def\BitSet@@Range#1#2#3!#4!{% + \ifnum#3<0 % + \BitSet@NegativeIndex#1{#2}#3!#4!0!#4!% + \else + \ifnum#4<0 % + \BitSet@NegativeIndex#1{#2}#3!#4!#3!0!% + \else + \ifcase\intcalcCmp{#3}{#4} % + \or + \@PackageError{bitset}{% + Wrong index numbers in range [#3..#4]\MessageBreak% hash-ok + for clear/set/flip on bit set `#2'.\MessageBreak + The lower index exceeds the upper index.\MessageBreak + Canceling the operation as error recovery% + }\@ehc + \else + \BitSet@@@Range#3!#4!#1{#2}% + \fi + \fi + \fi +} +\def\BitSet@NegativeIndex#1#2#3!#4!#5!#6!{% + \@PackageError{bitset}{% + Negative index in range [#3..#4]\MessageBreak % hash-ok + for \string\bitset + \ifx#1\BitSet@Clear + Clear% + \else + \ifx#1\BitSet@Set + Set% + \else + Flip% + \fi + \fi + Range on bit set `#2'.\MessageBreak + Using [#5..#6] as error recovery% hash-ok + }\@ehc + \BitSet@@Range#1{#2}#5!#6!% +} +\def\BitSet@@@Range#1!#2!#3#4{% + \ifnum#1<#2 % + #3{#4}{#1}% + \BitSet@AfterFi{% + \expandafter\expandafter\expandafter\BitSet@@@Range + \IntCalcInc#1!!#2!#3{#4}% + }% + \BitSet@Fi +} +\def\bitsetGet#1#2{% + \number + \expandafter\expandafter\expandafter\BitSet@Get + \intcalcNum{#2}!{#1}% +} +\def\BitSet@Get#1!#2{% + \ifnum#1<0 % + \BitSet@AfterFi{% + 0 \BitSetError:NegativeIndex% + }% + \else + \BitSet@IfUndefined{#2}{0}{% + \expandafter\expandafter\expandafter\BitSet@@Get + \csname BS@#2\expandafter\endcsname + \expandafter!\expandafter=% + \expandafter{\expandafter}\expandafter{\expandafter}% + \romannumeral\intcalcNum{#1}000!% + }% + \expandafter\BitSet@Space + \BitSet@Fi +} +\def\BitSet@@Get#1#2=#3#4#5{% + #3#4% + \ifx#5!% + \ifx#1!% + 0% + \else + #1% + \fi + \else + \ifx#1!% + 0% + \BitSet@AfterFiFi\BitSet@Cleanup + \else + \BitSet@@Get#2=% + \fi + \BitSet@Fi +} +\def\bitsetNextClearBit#1#2{% + \number + \expandafter\expandafter\expandafter\BitSet@NextClearBit + \intcalcNum{#2}!{#1} % +} +\def\BitSet@NextClearBit#1!#2{% + \ifnum#1<0 % + \BitSet@NextClearBit0!{#2}% + \BitSet@AfterFi{% + \expandafter\BitSet@Space + \expandafter\BitSetError:NegativeIndex\romannumeral0% + }% + \else + \bitsetIsEmpty{#2}{#1}{% + \expandafter\BitSet@Skip + \number#1\expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!!!!!!!!=% + {\BitSet@@NextClearBit#1!}% + }% + \BitSet@Fi +} +\def\BitSet@@NextClearBit#1!#2{% + \ifx#2!% + #1% + \else + \ifx#20% + #1% + \BitSet@AfterFiFi\BitSet@Cleanup + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@@NextClearBit + \IntCalcInc#1!!% + }% + \fi + \BitSet@Fi +} +\def\bitsetNextSetBit#1#2{% + \number + \expandafter\expandafter\expandafter\BitSet@NextSetBit + \intcalcNum{#2}!{#1} % +} +\def\BitSet@NextSetBit#1!#2{% + \ifnum#1<0 % + \BitSet@NextSetBit0!{#2}% + \BitSet@AfterFi{% + \expandafter\BitSet@Space + \expandafter\BitSetError:NegativeIndex\romannumeral0% + }% + \else + \bitsetIsEmpty{#2}{-1}{% + \expandafter\BitSet@Skip + \number#1\expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!!!!!!!!!=% + {\BitSet@@NextSetBit#1!}% + }% + \BitSet@Fi +} +\def\BitSet@@NextSetBit#1!#2{% + \ifx#2!% + -1% + \else + \ifx#21% + #1% + \BitSet@AfterFiFi\BitSet@Cleanup + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@@NextSetBit + \IntCalcInc#1!!% + }% + \fi + \BitSet@Fi +} +\def\BitSet@Cleanup#1!{} +\def\BitSet@Skip#1!#2{% + \ifx#2!% + \BitSet@AfterFi{% + \BitSet@SkipContinue% + }% + \else + \ifcase#1 % + \BitSet@AfterFiFi{% + \BitSet@SkipContinue#2% + }% + \or + \BitSet@AfterFiFi\BitSet@SkipContinue + \or + \BitSet@AfterFiFi{% + \expandafter\BitSet@SkipContinue\BitSet@Gobble + }% + \else + \ifnum#1>8 % + \BitSet@AfterFiFiFi{% + \expandafter\BitSet@Skip + \number\IntCalcSub#1!8!\expandafter!% + \BitSet@GobbleSeven + }% + \else + \BitSet@AfterFiFiFi{% + \expandafter\expandafter\expandafter\BitSet@Skip + \IntCalcDec#1!!% + }% + \fi + \fi + \BitSet@Fi +} +\def\BitSet@SkipContinue#1!#2=#3{% + #3#1!% +} +\def\BitSet@GobbleSeven#1#2#3#4#5#6#7{} +\def\bitsetGetSetBitList#1{% + \romannumeral0% + \bitsetIsEmpty{#1}{ }{% + \expandafter\BitSet@GetSetBitList + \number\BitSet@NextSetBit0!{#1}!{#1}{}!% + }% +} +\def\BitSet@GetSetBitList#1!#2#3#4!{% + \ifnum#1<0 % + \BitSet@AfterFi{ #4}% + \else + \BitSet@AfterFi{% + \expandafter\BitSet@GetSetBitList\number + \expandafter\expandafter\expandafter\BitSet@NextSetBit + \IntCalcInc#1!!{#2}!{#2},#4#3#1!% + }% + \BitSet@Fi +} +\def\bitsetSize#1{% + \number + \BitSet@IfUndefined{#1}{0 }{% + \expandafter\expandafter\expandafter\BitSet@Size + \expandafter\expandafter\expandafter1% + \expandafter\expandafter\expandafter!% + \csname BS@#1\endcsname!0!% + }% +} +\def\BitSet@Size#1!#2#3!#4!{% + \ifx#21% + \ifx\\#3\\% + \BitSet@AfterFiFi{#1 }% + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@Size + \IntCalcInc#1!!#3!#1!% + }% + \fi + \else + \ifx\\#3\\% + \BitSet@AfterFiFi{#4 }% + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@Size + \IntCalcInc#1!!#3!#4!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetCardinality#1{% + \number + \BitSet@IfUndefined{#1}{0 }{% + \expandafter\expandafter\expandafter\BitSet@Cardinality + \expandafter\expandafter\expandafter0% + \expandafter\expandafter\expandafter!% + \csname BS@#1\endcsname!% + }% +} +\def\BitSet@Cardinality#1!#2#3!{% + \ifx#21% + \ifx\\#3\\% + \BitSet@AfterFiFi{\IntCalcInc#1! }% + \else + \BitSet@AfterFiFi{% + \expandafter\expandafter\expandafter\BitSet@Cardinality + \IntCalcInc#1!!#3!% + }% + \fi + \else + \ifx\\#3\\% + \BitSet@AfterFiFi{#1 }% + \else + \BitSet@AfterFiFi{% + \BitSet@Cardinality#1!#3!% + }% + \fi + \fi + \BitSet@Fi +} +\def\bitsetIsDefined#1{% + \BitSet@IfUndefined{#1}% + \BitSet@SecondOfTwo + \BitSet@FirstOfTwo +} +\def\bitsetIsEmpty#1{% + \BitSet@IfUndefined{#1}\BitSet@FirstOfTwo{% + \expandafter\ifx\csname BS@#1\endcsname\BitSet@Zero + \expandafter\BitSet@FirstOfTwo + \else + \expandafter\BitSet@SecondOfTwo + \fi + }% +} +\def\BitSet@Zero{0} +\def\bitsetQuery#1#2{% + \ifnum\bitsetGet{#1}{#2}=1 % + \expandafter\BitSet@FirstOfTwo + \else + \expandafter\BitSet@SecondOfTwo + \fi +} +\def\bitsetEquals#1#2{% + \BitSet@IfUndefined{#1}{% + \BitSet@IfUndefined{#2}\BitSet@FirstOfTwo\BitSet@SecondOfTwo + }{% + \BitSet@IfUndefined{#2}\BitSet@SecondOfTwo{% + \expandafter\ifx\csname BS@#1\expandafter\endcsname + \csname BS@#2\endcsname + \expandafter\BitSet@FirstOfTwo + \else + \expandafter\BitSet@SecondOfTwo + \fi + }% + }% +} +\def\bitsetIntersects#1#2{% + \bitsetIsEmpty{#1}\BitSet@SecondOfTwo{% + \bitsetIsEmpty{#2}\BitSet@SecondOfTwo{% + \expandafter\expandafter\expandafter\BitSet@Intersects + \csname BS@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter!% + \csname BS@#2\endcsname!% + }% + }% +} +\def\BitSet@Intersects#1#2!#3#4!{% + \ifnum#1#3=11 % + \BitSet@AfterFi\BitSet@FirstOfTwo + \else + \ifx\\#2\\% + \BitSet@AfterFiFi\BitSet@SecondOfTwo + \else + \ifx\\#4\\% + \BitSet@AfterFiFiFi\BitSet@SecondOfTwo + \else + \BitSet@AfterFiFiFi{% + \BitSet@Intersects#2!#4!% + }% + \fi + \fi + \BitSet@Fi +} +\BitSet@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{uniquecounter} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@uniquecounter.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{uniquecounter}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@uniquecounter.sty\endcsname +\ProvidesPackage{uniquecounter}% + [2011/01/30 v1.2 Provides unlimited unique counter (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname uqc@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\uqc@AtEnd{% + \uqc@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\uqc@AtEnd{\uqc@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{bigintcalc}[2007/11/11]% + \TMP@RequirePackage{infwarerr}[2007/09/09]% +\else + \RequirePackage{bigintcalc}[2007/11/11]% + \RequirePackage{infwarerr}[2007/09/09]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax + \def\uqc@IncNum#1{% + \begingroup + \count@=\csname uqc@cnt@#1\endcsname\relax + \advance\count@\@ne + \expandafter\xdef\csname uqc@cnt@#1\endcsname{% + \number\count@ + }% + \ifnum\count@=2147483647 % + \global\expandafter\let\csname uqc@inc@#1\endcsname + \uqc@IncBig + \fi + \endgroup + }% +\else + \def\uqc@IncNum#1{% + \expandafter\xdef\csname uqc@cnt@#1\endcsname{% + \number\numexpr\csname uqc@cnt@#1\endcsname+1% + }% + \ifnum\csname uqc@cnt@#1\endcsname=2147483647 % + \global\expandafter\let\csname uqc@inc@#1\endcsname + \uqc@IncBig + \fi + }% +\fi +\def\uqc@IncBig#1{% + \expandafter\xdef\csname uqc@cnt@#1\endcsname{% + \expandafter\expandafter\expandafter + \BigIntCalcInc\csname uqc@cnt@#1\endcsname!% + }% +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newcommand\endcsname\relax + \def\uqc@Def#1{\def#1##1}% +\else + \def\uqc@Def#1{\newcommand*{#1}[1]}% +\fi +\uqc@Def\UniqueCounterNew{% + \expandafter\ifx\csname uqc@cnt@#1\endcsname\relax + \expandafter\xdef\csname uqc@cnt@#1\endcsname{0}% + \global\expandafter\let\csname uqc@inc@#1\endcsname\uqc@IncNum + \@PackageInfo{uniquecounter}{New unique counter `#1'}% + \else + \@PackageError{uniquecounter}{Unique counter `#1' is already defined}\@ehc + \fi +} +\uqc@Def\UniqueCounterIncrement{% + \expandafter\ifx\csname uqc@cnt@#1\endcsname\relax + \@PackageError{uniquecounter}{Unique counter `#1' is undefined}\@ehc + \else + \csname uqc@inc@#1\endcsname{#1}% + \fi +} +\uqc@Def\UniqueCounterGet{% + \csname uqc@cnt@#1\endcsname +} +\uqc@Def\UniqueCounterCall{% + \expandafter\ifx\csname uqc@cnt@#1\endcsname\relax + \@PackageError{uniquecounter}{Unique counter `#1' is undefined}\@ehc + \expandafter\uqc@Call\expandafter0% + \else + \UniqueCounterIncrement{#1}% + \expandafter\expandafter\expandafter\uqc@Call + \expandafter\expandafter\expandafter{% + \csname uqc@cnt@#1\expandafter\endcsname\expandafter + }% + \fi +} +\long\def\uqc@Call#1#2{#2{#1}}% +\uqc@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\HOBsub@AtEnd% +\endinput +%% +%% End of file `hobsub-generic.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty new file mode 100644 index 00000000000..fb4cc12a8ee --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty @@ -0,0 +1,2763 @@ +%% +%% This is file `hobsub-hyperref.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hobsub.dtx (with options: `hyperref,preamble,,letltxmacro') +%% letltxmacro.dtx (with options: `package') +%% hobsub.dtx (with options: `post,hopatch') +%% hopatch.dtx (with options: `package') +%% hobsub.dtx (with options: `post,xcolor-patch') +%% hycolor.dtx (with options: `xcolor') +%% hobsub.dtx (with options: `post,atveryend') +%% atveryend.dtx (with options: `package') +%% hobsub.dtx (with options: `post,atbegshi') +%% atbegshi.dtx (with options: `package') +%% hobsub.dtx (with options: `post,refcount') +%% refcount.dtx (with options: `package') +%% hobsub.dtx (with options: `post,hycolor') +%% hycolor.dtx (with options: `package') +%% hobsub.dtx (with options: `post') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file hobsub.dtx +%% and the derived files +%% hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty, +%% hobsub-hyperref.sty, hobsub-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@hobsub-hyperref.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{hobsub-hyperref}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@hobsub-hyperref.sty\endcsname +\ProvidesPackage{hobsub-hyperref}% + [2011/01/30 v1.0 Bundle oberdiek, subset hyperref (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOBsub@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOBsub@AtEnd{% + \HOBsub@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\edef\HOBsub@AtEnd{\HOBsub@AtEnd\noexpand\endinput} +\NeedsTeXFormat{LaTeX2e} +\RequirePackage{hobsub-generic}[2011/01/30] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ver@hobsub.sty\endcsname\relax +\else + \expandafter\hobsub@GobbleRemainingPackage +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname HOBsub@OrgEndinput\endcsname\relax + \let\HOBsub@OrgEndinput\endinput +\fi +\def\hobsub@GobbleRemainingPackage{% + \begingroup + \catcode92=14 % backslash: comment + \catcode32=14 % space: comment + \catcode123=14 % left brace: comment + \catcode125=14 % right brace: comment + \catcode60=3 % less: math + \catcode62=4 % greater: align + \endlinechar=-1 % + \HOBsub@GobbleRemainingPackage +} +\catcode60=3 % less: dollar +\catcode62=4 % greater: align +\long\def\HOBsub@GobbleRemainingPackage#1<hobsub>{% + \endgroup +} +\catcode60=12 % less: other +\catcode62=12 % greater: other +\def\hobsub@StartPackage#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \let\HOBsub@OrgCurrName\@currname + \let\HOBsub@OrgCurrExt\@currext + \csname @pushfilename\endcsname + \def\@currname{#1}% + \def\@currext{sty}% + \expandafter\def\csname\@currname.\@currext-h@@k\endcsname{}% + \let\endinput\hobsub@GobbleRemainingPackage + \def\hobsub@StopPackage{% + \let\hobsub@StopPackage\relax + \HOBsub@StopPackage + }% + \hobsub@AddToFileList{#1.sty}% + \else + \hobsub@Info{hobsub}{Skipping package `#1' (already loaded)}% + \let\hobsub@StopPackage\relax + \expandafter\hobsub@GobbleRemainingPackage + \fi +} +\let\hobsub@StopPackage\relax +\def\hobsub@Info#1#2{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @PackageInfoNoLine\endcsname\relax + \immediate\write-1{Package #1 Info: #2.}% + \else + \let\hobsub@Info\@PackageInfoNoLine + \hobsub@Info{#1}{#2}% + \fi +} +\def\HOBsub@StopPackage{% + \csname\@currname.\@currext-h@@k\endcsname + \let\endinput\HOBsub@OrgEndinput + \csname @popfilename\endcsname + \let\@currname\HOBsub@OrgCurrName + \let\@currext\HOBsub@OrgCurrExt +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname @addtofilelist\endcsname\relax + \def\hobsub@AddToFileList#1{}% +\else + \def\hobsub@AddToFileList#1{% + \@addtofilelist{#1}% + }% +\fi +\hobsub@GobbleRemainingPackage +<hobsub> +\hobsub@StartPackage{hobsub}% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname ProvidesPackage\endcsname\relax + \immediate\write-1{% + Package: hobsub 2011/01/30 v1.0 Subsetting bundle oberdiek (HO)% + }% +\else + \ProvidesPackage{hobsub}% + [2011/01/30 v1.0 Subsetting bundle oberdiek (HO)]% +\fi + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{letltxmacro} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname llm@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\llm@AtEnd{% + \llm@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\llm@AtEnd{% + \llm@AtEnd + \escapechar\the\escapechar\relax + \noexpand\endinput +} +\escapechar=92 % `\\ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{letltxmacro}% + [2010/09/02 v1.4 Let assignment for LaTeX macros (HO)] +\newcommand*{\LetLtxMacro}{% + \llm@ModeLetLtxMacro{}% +} +\newcommand*{\GlobalLetLtxMacro}{% + \llm@ModeLetLtxMacro\global +} +\newcommand*{\llm@ModeLetLtxMacro}[3]{% + \edef\llm@escapechar{\the\escapechar}% + \escapechar=-1 % + \edef\reserved@a{% + \noexpand\protect + \expandafter\noexpand + \csname\string#3 \endcsname + }% + \ifx\reserved@a#3\relax + #1\edef#2{% + \noexpand\protect + \expandafter\noexpand + \csname\string#2 \endcsname + }% + #1\expandafter\let + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname + \expandafter\llm@LetLtxMacro + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname{#1}% + \else + \llm@LetLtxMacro{#2}{#3}{#1}% + \fi + \escapechar=\llm@escapechar\relax +} +\def\llm@LetLtxMacro#1#2#3{% + \escapechar=92 % + \expandafter\llm@CheckParams\meaning#2:->\@nil{% + \begingroup + \def\@protected@testopt{% + \expandafter\@testopt\@gobble + }% + \def\@testopt##1##2{% + \toks@={##2}% + }% + \let\llm@testopt\@empty + \edef\x{% + \noexpand\@protected@testopt + \noexpand#2% + \expandafter\noexpand\csname\string#2\endcsname + }% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter\y + \expandafter\expandafter\expandafter{% + \expandafter\llm@CarThree#2{}{}{}\llm@nil + }% + \ifx\x\y + #2% + \def\llm@testopt{% + \noexpand\@protected@testopt + \noexpand#1% + }% + \else + \edef\x{% + \noexpand\@testopt + \expandafter\noexpand + \csname\string#2\endcsname + }% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter\y + \expandafter\expandafter\expandafter{% + \expandafter\llm@CarTwo#2{}{}\llm@nil + }% + \ifx\x\y + #2% + \def\llm@testopt{% + \noexpand\@testopt + }% + \fi + \fi + \ifx\llm@testopt\@empty + \else + \llm@protected\xdef\llm@GlobalTemp{% + \llm@testopt + \expandafter\noexpand + \csname\string#1\endcsname + {\the\toks@}% + }% + \fi + \expandafter\endgroup\ifx\llm@testopt\@empty + #3\let#1=#2\relax + \else + #3\let#1=\llm@GlobalTemp + #3\expandafter\let + \csname\string#1\expandafter\endcsname + \csname\string#2\endcsname + \fi + }{% + #3\let#1=#2\relax + }% +} +\def\llm@CheckParams#1:->#2\@nil{% + \begingroup + \def\x{#1}% + \ifx\x\llm@macro + \endgroup + \def\llm@protected{}% + \expandafter\@firstoftwo + \else + \ifx\x\llm@protectedmacro + \endgroup + \def\llm@protected{\protected}% + \expandafter\expandafter\expandafter\@firstoftwo + \else + \endgroup + \expandafter\expandafter\expandafter\@secondoftwo + \fi + \fi +} +\def\llm@macro{macro} +\@onelevel@sanitize\llm@macro +\def\llm@protectedmacro{\protected macro} +\@onelevel@sanitize\llm@protectedmacro +\def\llm@CarThree#1#2#3#4\llm@nil{#1#2#3}% +\def\llm@CarTwo#1#2#3\llm@nil{#1#2}% +\llm@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{hopatch} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOpatch@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOpatch@AtEnd{% + \HOpatch@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\HOpatch@AtEnd{\HOpatch@AtEnd\noexpand\endinput} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{hopatch}% + [2011/01/30 v1.0 Wrapper for package hooks (HO)] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/12/12]% +\else + \RequirePackage{ltxcmds}[2010/12/12]% +\fi +\def\HOpatch@counter{0}% +\ltx@ifundefined{numexpr}{% + \def\HOpatch@StepCounter{% + \begingroup + \count@\HOpatch@counter\relax + \advance\count@\ltx@one\relax + \edef\x{\endgroup + \noexpand\def\noexpand\HOpatch@counter{\the\count@}% + }% + }% +}{% + \def\HOpatch@StepCounter{% + \edef\HOpatch@counter{% + \the\numexpr\HOpatch@counter+\ltx@one\relax + }% + }% +} +\def\HOpatch@list{} +\def\HOpatch@Add{% + \ltx@LocalAppendToMacro\HOpatch@list +} +\def\hopatch@AfterPackage#1{% + \ltx@ifpackageloaded{#1}{% + \ltx@firstofone + }{% + \HOpatch@AfterPackage{#1}% + }% +} +\def\HOpatch@AfterPackage#1{% + \edef\HOpatch@temp{#1}% + \HOpatch@StepCounter + \expandafter\HOpatch@@AfterPackage + \csname HOpatch@\HOpatch@counter\expandafter\endcsname{% + \HOpatch@temp + }% +} +\def\HOpatch@@AfterPackage#1#2#3{% + \begingroup + \toks@{#3}% + \xdef\HOpatch@gtemp{% + \noexpand\ltx@ifpackageloaded{#2}{% + \noexpand\let\noexpand#1\noexpand\relax + \the\toks@ + }{}% + }% + \endgroup + \let#1\HOpatch@gtemp + \HOpatch@Add#1% + \HOpatch@Try{AfterPackage}{#2}#1% + \HOpatch@Try{AtEndPackage}{#2}#1% + \HOpatch@Try{AtEndOfPackageFile}{#2}#1% +} +\def\HOpatch@Try#1#2#3{% + \ltx@ifundefined{#1}{}{% + \csname #1\endcsname{#2}{#3}% + }% +} +\AtBeginDocument{\HOpatch@list} +\ltx@ifundefined{AtEndPreamble}{}{% + \AtEndPreamble{\HOpatch@list}% +} +\ltx@ifundefined{AfterEndPreamble}{}{% + \AfterEndPreamble{% + \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded + \let\HOpatch@OrgIfPackageLater\@ifpackagelater + \let\HOpatch@OrgIfClassLoaded\@ifclassloaded + \let\HOpatch@OrgIfClassLater\@ifclasslater + \let\@ifpackageloaded\ltx@ifpackageloaded + \let\@ifpackagelater\ltx@ifpackagelater + \let\@ifclassloaded\ltx@ifclassloaded + \let\@ifclasslater\ltx@ifclasslater + \HOpatch@list + \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded + \let\@ifpackagelater\HOpatch@OrgIfPackageLater + \let\@ifclassloaded\HOpatch@OrgIfClassLoaded + \let\@ifclasslater\HOpatch@OrgIfClassLater + }% +} +\HOpatch@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{xcolor-patch} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{xcolor-patch}[2011/01/30 xcolor patch] +\RequirePackage{hopatch}[2011/01/30] +\hopatch@AfterPackage{xcolor}{% + \long\def\reserved@a#1#2#3{% + \long\def\@@tmp##1##2{% + \ifx#1##1% + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\@@tmp + \fi + }% + \@@tmp#2#1{#3}\@nnil\the\toks@ + }% + \ifx\XC@ifxcase\reserved@a + \long\def\XC@ifxcase#1#2#3{% + \long\def\XC@if@##1##2{% + \ifx#1##1% + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\XC@if@ + \fi + }% + \XC@if@#2#1{#3}\@nnil + \the\toks@ + }% + \fi + \long\def\reserved@a#1#2#3{% + \long\def\@@tmp##1##2{% + \@expandtwoargs\in@{,#1,}{,##1,}% + \ifin@ + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\@@tmp + \fi + }% + \@@tmp#2{#1}{#3}\@nnil + \the\toks@ + }% + \ifx\XC@ifcase\reserved@a + \long\def\XC@ifcase#1#2#3{% + \long\def\XC@if@##1##2{% + \@expandtwoargs\in@{,#1,}{,##1,}% + \ifin@ + \toks@{##2}% + \expandafter\remove@to@nnil + \else + \expandafter\XC@if@ + \fi + }% + \XC@if@#2{#1}{#3}\@nnil + \the\toks@ + }% + \fi + \def\reserved@a#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% + \ifx\XC@cnv@gray\reserved@a + \def\XC@cnv@gray#1,{% + \XC@ifxcase\tm{% + \XC@mod@rgb{% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@gray{}% + \XC@mod@cmy{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@cmyk{% + \XC@calcC{#1}\@@tmp + \edef\@@tmp{0,0,0,\@@tmp}% + }% + \XC@mod@RGB{% + \edef\@@scl{\rangeRGB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{\@@tmp,\@@tmp,\@@tmp}% + }% + \XC@mod@HTML{% + \edef\@@scl{\@cclv}% + \XC@calcM{#1}\@@tmp + \XC@calcH\@@tmp\@@tmp + \edef\@@tmp{\@@tmp\@@tmp\@@tmp}% + }% + \XC@mod@HSB{% + \edef\@@scl{\rangeHSB}% + \XC@calcM{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + \XC@mod@Gray{% + \edef\@@scl{\rangeGray}% + \XC@calcM{#1}\@@tmp + }% + }% + {% + \XC@calcN{#1}\@@tmp + \edef\@@tmp{0,0,\@@tmp}% + }% + }% + \fi + \@ifundefined{XC@frameb@x }{% + \expandafter\let\csname XC@frameb@x \endcsname\XC@frameb@x + \edef\XC@frameb@x{% + \noexpand\protect + \expandafter\noexpand\csname XC@frameb@x \endcsname + }% + \expandafter\ifx\csname XC@frameb@x \endcsname\@frameb@x + \let\@frameb@x\XC@frameb@x + \fi + }{}% +} + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{atveryend} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname AtVeryEnd@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\AtVeryEnd@AtEnd{% + \AtVeryEnd@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{9}{10}% (tab) +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{atveryend}% + [2010/03/24 v1.5 Hooks at very end of document (HO)] +\let\AtVeryEnd@BeforeClearDocumentHook\@empty +\let\AtVeryEnd@AfterLastShipoutHook\@empty +\let\AtVeryEnd@AtVeryEndDocumentHook\@empty +\newcommand*{\BeforeClearDocument}{% + \g@addto@macro\AtVeryEnd@BeforeClearDocumentHook +} +\newcommand*{\AfterLastShipout}{% + \g@addto@macro\AtVeryEnd@AfterLastShipoutHook +} +\newcommand*{\AtVeryEndDocument}{% + \g@addto@macro\AtVeryEnd@AtVeryEndDocumentHook +} +\newcommand*{\Call@BeforeClearDocument}{% + \let\BeforeClearDocument\@firstofone + \ifx\AtVeryEnd@BeforeClearDocumentHook\@empty + \PackageInfo{atveryend}{Empty hook `BeforeClearDocument'}% + \else + \PackageInfo{atveryend}{Executing hook `BeforeClearDocument'}% + \AtVeryEnd@BeforeClearDocumentHook + \fi + \global\let\AtVeryEnd@BeforeClearDocumentHook\@undefined + \global\let\Call@BeforeClearDocument\relax +} +\newcommand*{\Call@AfterLastShipout}{% + \let\AfterLastShipout\@firstofone + \ifx\AtVeryEnd@AfterLastShipoutHook\@empty + \PackageInfo{atveryend}{Empty hook `AfterLastShipout'}% + \else + \PackageInfo{atveryend}{Executing hook `AfterLastShipout'}% + \AtVeryEnd@AfterLastShipoutHook + \fi + \global\let\AtVeryEnd@AfterLastShipoutHook\@undefined + \global\let\Call@AfterLastShipout\relax +} +\newcommand*{\Call@AtVeryEndDocument}{% + \let\AtVeryEndDocument\@firstofone + \ifx\AtVeryEnd@AtVeryEndDocumentHook\@empty + \PackageInfo{atveryend}{Empty hook `AtVeryEndDocument'}% + \else + \PackageInfo{atveryend}{Executing hook `AtVeryEndDocument'}% + \AtVeryEnd@AtVeryEndDocumentHook + \fi + \global\let\AtVeryEnd@AtVeryEndDocumentHook\@undefined + \global\let\Call@AtVeryEndDocument\relax +} +\def\AtVeryEnd@test@standard{% + \let\AtEndDocument\@firstofone + \@enddocumenthook + \@checkend{document}% + \clearpage + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter + \input\jobname.aux % + \fi + \@dofilelist + \ifdim \font@submax >\fontsubfuzz\relax + \@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% + \fi + \@defaultsubs + \@refundefined + \if@filesw + \ifx \@multiplelabels \relax + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% + \fi + \else + \@multiplelabels + \fi + \fi + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@enddocument@standard{% + \let\AtEndDocument\@firstofone + \@enddocumenthook + \@checkend{document}% + \Call@BeforeClearDocument + \clearpage + \Call@AfterLastShipout + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter + \input\jobname.aux % + \fi + \Call@AtVeryEndDocument + \@dofilelist + \ifdim \font@submax >\fontsubfuzz\relax + \@font@warning{Size substitutions with differences\MessageBreak + up to \font@submax\space have occurred.\@gobbletwo}% + \fi + \@defaultsubs + \@refundefined + \if@filesw + \ifx \@multiplelabels \relax + \if@tempswa + \@latex@warning@no@line{Label(s) may have changed. % + Rerun to get cross-references right}% + \fi + \else + \@multiplelabels + \fi + \fi + \endgroup + \deadcycles\z@ + \@@end +} +\expandafter\def\expandafter\AtVeryEnd@test@booklet\expandafter{% + \expandafter\twoupclearpage + \AtVeryEnd@test@standard +} +\expandafter\def\expandafter\AtVeryEnd@enddocument@booklet\expandafter{% + \expandafter\twoclearpage + \AtVeryEnd@enddocument@standard +} +\def\AtVeryEnd@test@dinbrief{% + \@checkend{document} % + \newpage + \begingroup + \if@filesw + \ifnum\c@labelgen>0 % + \immediate\closeout\@mainlbl + \makeatletter + \input \jobname@lbl\relax + \clearpage + \fi + \immediate\closeout\@mainaux + \fi + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@enddocument@dinbrief{% + \@checkend{document}% + \Call@BeforeClearDocument + \newpage + \Call@AfterLastShipout + \begingroup + \if@filesw + \ifnum\c@labelgen>\z@ + \immediate\closeout\@mainlbl + \makeatletter + \input \jobname@lbl\relax + \clearpage + \fi + \immediate\closeout\@mainaux + \fi + \Call@AtVeryEndDocument + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@test@combine{% + \@enddocumenthook + \@checkend{document}% + \clearpage + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \immediate\closeout\@partaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter \input\c@lmainauxfile %% change here + \fi + \c@lenddoca %% a replacement + \@refundefined + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@enddocument@combine{% + \@enddocumenthook + \@checkend{document}% + \Call@BeforeClearDocument + \clearpage + \Call@AfterLastShipout + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \immediate\closeout\@partaux + \let\@setckpt\@gobbletwo + \let\@newl@bel\@testdef + \@tempswafalse + \makeatletter \input\c@lmainauxfile %% change here + \fi + \Call@AtVeryEndDocument + \c@lenddoca %% a replacement + \@refundefined + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@test@jpsj{% + \if@lastpagebalancing + \global\let\@outputdblcol=\balancing@outputdblcol + \fi + \@checkend{document}% + \clearpage + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \def\global\@namedef##1##2{}% + \def\newlabel{\@testdef r}% + \def\bibcite{\@testdef b}% + \@tempswafalse + \makeatletter + \input \jobname.aux % + \if@tempswa + \@warning{% + Label(s) may have changed. % + Rerun to get cross-references right% + }% + \fi + \fi + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@enddocument@jpsj{% + \if@lastpagebalancing + \global\let\@outputdblcol=\balancing@outputdblcol + \fi + \@checkend{document}% + \Call@BeforeClearDocument + \clearpage + \Call@AfterLastShipout + \begingroup + \if@filesw + \immediate\closeout\@mainaux + \def\global\@namedef##1##2{}% + \def\newlabel{\@testdef r}% + \def\bibcite{\@testdef b}% + \@tempswafalse + \makeatletter + \input \jobname.aux % + \if@tempswa + \@warning{% + Label(s) may have changed. % + Rerun to get cross-references right% + }% + \fi + \fi + \Call@AtVeryEndDocument + \endgroup + \deadcycles\z@ + \@@end +} +\def\AtVeryEnd@Test#1#2{% + \expandafter\ifx\csname AtVeryEnd@test@#2\endcsname#1% + \expandafter\let\expandafter#1% + \csname AtVeryEnd@enddocument@#2\endcsname + \begingroup + \let\on@line\@empty + \PackageInfo{atveryend}{% + \string#1 detected (#2)% + }% + \endgroup + \expandafter\AtVeryEnd@SkipToNil + \fi +} +\def\AtVeryEnd@SkipToNil#1\@nil{} +\def\AtVeryEnd@RedefEndDocument#1{% + \ifx#1\@undefined + \else + \AtVeryEnd@Test#1{standard}% + \AtVeryEnd@Test#1{booklet}% + \AtVeryEnd@Test#1{dinbrief}% + \AtVeryEnd@Test#1{combine}% + \AtVeryEnd@Test#1{jpsj}% + \AtVeryEnd@SkipToNil + \@nil + \fi +} +\AtVeryEnd@RedefEndDocument\enddocument +\AtVeryEnd@RedefEndDocument\AP@enddocument % afterpage.sty +\AtVeryEnd@RedefEndDocument\hyper@back@cite@enddocument % htx-bc.sty +\AtVeryEnd@RedefEndDocument\hyper@enddocument % hyper.sty +\AtVeryEnd@RedefEndDocument\hyper@fn@enddocument % hyper.sty +\AtVeryEnd@RedefEndDocument\cweb@save@enddocument % cweb.cls +\AtVeryEnd@RedefEndDocument\prev@enddocument % flushend.sty +\AtVeryEnd@RedefEndDocument\endorigdocument % gaceta.cls +\AtVeryEnd@RedefEndDocument\keependdoc % aguplus.sty +\AtVeryEnd@RedefEndDocument\EMenddocument % t-angles.sty +\AtVeryEnd@RedefEndDocument\docmute@enddocument % docmute.sty +\AtVeryEnd@RedefEndDocument\a@enddocument % alatex.sty +\AtVeryEnd@RedefEndDocument\enddocumentasusual % frenchle.sty +\AtVeryEnd@RedefEndDocument\old@enddocument % uwthesis.cls +\AtBeginDocument{% + \@ifpackageloaded{scrlfile}{% + \@ifundefined{BeforeClosingMainAux}{}{% + \BeforeClosingMainAux{\Call@AfterLastShipout}% + }% + \@ifundefined{AfterReadingMainAux}{}{% + \AfterReadingMainAux{\Call@AtVeryEndDocument}% + }% + }{}% + \@ifpackageloaded{etoolbox}{% + \@ifundefined{AfterEndDocument}{}{% + \AfterEndDocument{\Call@AtVeryEndDocument}% + }% + }{}% + \def\AtVeryEnd@document{document}% + \def\AtVeryEnd@RedefCheckEnd{% + \expandafter\def\expandafter\@checkend + \expandafter##\expandafter1\expandafter{% + \@checkend{##1}% + \def\AtVeryEnd@temp{##1}% + \ifx\AtVeryEnd@temp\AtVeryEnd@document + \let\AtVeryEnd@OrgClearpage\clearpage + \def\clearpage{% + \let\clearpage\AtVeryEnd@OrgClearpage + \Call@BeforeClearDocument + \clearpage + \Call@AfterLastShipout + }% + \fi + }% + \aftergroup\AtVeryEnd@RedefCheckEnd + }% + \AtEndDocument{% + \AtVeryEnd@RedefCheckEnd + }% +} +\AtEndDocument{% + \@ifundefined{@dofilelist}{% + \gdef\@dofilelist{\Call@AtVeryEndDocument}% + }{% + \begingroup + \toks@\expandafter{\@dofilelist}% + \xdef\@dofilelist{% + \noexpand\Call@AtVeryEndDocument + \the\toks@ + }% + \endgroup + }% +} +\def\AtVeryEnd@temp{% + \AtBeginDocument{% + \let\@startlabels\startlabels + \let\@mlabel\mlabel + \if@filesw + \immediate\write\@mainaux{\string\@startlabels}% + \fi + }% + \AtEndDocument{% + \if@filesw + \immediate\write\@mainaux{\string\clearpage}% + \fi + }% +} +\ifx\makelabels\AtVeryEnd@temp +\else + \expandafter\AtVeryEnd@AtEnd +\fi% +\let\AtVeryEnd@PatchLetter=N% +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname endletter\endcsname\relax +\else + \long\def\AtVeryEnd@TestEndLetter#1\@auxout#2#3\AtVeryEnd@Nil{% + \def\AtVeryEnd@temp{#2}% + \ifx\AtVeryEnd@temp\@empty + \else + \@onelevel@sanitize\AtVeryEnd@temp + \edef\AtVeryEnd@StringMlabel{% + \string\string + \string\@mlabel + \expandafter\@gobble\string\{% + }% + \def\AtVeryEnd@CatchFirst##1##2##3##4##5##6##7##8{% + ##1##2##3##4##5##6##7##8\AtVeryEnd@CatchSecond + }% + \def\AtVeryEnd@CatchSecond##1##2##3##4##5##6##7##8##9\@nil{% + ##1##2##3##4##5##6##7##8% + }% + \edef\AtVeryEnd@temp{% + \expandafter\AtVeryEnd@CatchFirst\AtVeryEnd@temp + {}{}{}{}{}{}{}{}% + {}{}{}{}{}{}{}{}% + \@nil + }% + \ifx\AtVeryEnd@temp\AtVeryEnd@StringMlabel + \expandafter\def\expandafter\endletter\expandafter{% + \endletter + \begingroup + \let\\=\relax + \let\protect\@unexpandable@protect + \let\@mlabel=\relax + \edef\x{\endgroup + \noexpand\AtEndDocument{% + \@gobble#2% + }% + }% + \x + }% + \let\AtVeryEnd@PatchLetter=Y% + \fi + \fi + }% + \expandafter\AtVeryEnd@TestEndLetter\endletter + \@auxout{}\AtVeryEnd@Nil +\fi +\ifx\AtVeryEnd@PatchLetter Y% + \begingroup + \let\on@line\@empty + \PackageInfo{atveryend}{% + \@backslashchar makelabels detected. % + Moving labels\MessageBreak + from `.aux' file to \@backslashchar AtEndDocument% + }% + \endgroup + \def\makelabels{% + \AtBeginDocument{% + \let\@startlabels\startlabels + \let\@mlabel\mlabel + }% + }% + \AtEndDocument{% + \@ifundefined{@startlabels}{% + }{% + \clearpage + \@startlabels + }% + }% + \AfterLastShipout{% + \let\@startlabels\relax + \let\@mlabel\@gobbletwo + }% +\else + \PackageWarningNoLine{atveryend}{% + \@backslashchar makelabels detected, but labels cannot\MessageBreak + be moved to \@backslashchar AtEndDocument, because\MessageBreak + \@backslashchar endletter is not in expected form% + }% +\fi +\AtVeryEnd@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{atbegshi} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@atbegshi.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{atbegshi}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@atbegshi.sty\endcsname +\ProvidesPackage{atbegshi}% + [2011/01/30 v1.15 At begin shipout hook (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname AtBegShi@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\AtBegShi@AtEnd{% + \AtBegShi@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{94}{7}% ^(superscript) +\TMP@EnsureCode{96}{12}% ` +\edef\AtBegShi@AtEnd{\AtBegShi@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ltxcmds}[2010/03/01]% +\else + \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ltxcmds}[2010/03/01]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname @ifdefinable\endcsname\relax + \def\AtBegShi@CheckDefinable#1{% + \ifcase\ifx#1\relax + \ltx@one + \else + \ifx#1\@undefined + \ltx@one + \else + \ltx@zero + \fi + \fi + \@PackageError{atbegshi}{% + \string#1\space is already defined% + }\@ehd + \fi + }% +\else + \def\AtBegShi@CheckDefinable#1{% + \@ifdefinable{#1}{}% + }% +\fi +\ltx@newif\ifAtBegShi@Discarded +\AtBegShi@CheckDefinable\AtBeginShipoutDiscard +\def\AtBeginShipoutDiscard{% + \deadcycles=\ltx@zero + \global\AtBegShi@Discardedtrue +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname currentgrouplevel\endcsname\relax + \catcode`X=9 % ignore + \catcode`E=14 % comment +\else + \catcode`X=14 % comment + \catcode`E=9 % ignore +\fi +\def\AtBegShi@Shipout{% +X \begingroup +X \setbox\AtBeginShipoutBox=\hbox\bgroup +X \kern\p@ +E \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}% + \afterassignment\AtBegShi@Test +X \global + \setbox\AtBeginShipoutBox=% +} +\def\AtBegShi@Test{% +X \ifdim\lastkern=0pt % +E \ifnum\AtBegShi@GroupLevel<\currentgrouplevel + \expandafter\aftergroup + \fi + \AtBegShi@Output +} +\def\AtBegShi@Output{% +X \egroup +X \endgroup + \ifvoid\AtBeginShipoutBox + \@PackageWarning{atbegshi}{Ignoring void shipout box}% + \else + \let\AtBegShi@OrgProtect\protect + \csname set@typeset@protect\endcsname + \global\AtBegShi@Discardedfalse + \AtBegShi@Hook + \expandafter\gdef\expandafter\AtBegShi@HookNext + \expandafter{\expandafter}% + \AtBegShi@HookNext + \ifAtBegShi@Discarded + \@PackageInfoNoLine{atbegshi}{Shipout page discarded}% + \global\AtBegShi@Discardedfalse + \begingroup + \setbox\AtBeginShipoutBox\box\AtBeginShipoutBox + \endgroup + \let\protect\AtBegShi@OrgProtect + \else + \AtBegShi@First + \let\protect\AtBegShi@OrgProtect + \AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox + \fi + \fi +} +\catcode`\X=11 % +\catcode`\E=11 % +\def\AtBegShi@First{% + \begingroup + \def\@empty{}% + \ifx\AtBegShi@HookFirst\@empty + \else + \setbox\ltx@zero=\vbox{% + \begingroup + \AtBegShi@HookFirst + \endgroup + }% + \wd\ltx@zero=0pt % + \ht\ltx@zero=0pt % + \dp\ltx@zero=0pt % + \global\setbox\AtBeginShipoutBox=\vbox{% + \baselineskip 0pt\relax + \lineskip 0pt\relax + \lineskiplimit 0pt\relax + \copy\ltx@zero + \copy\AtBeginShipoutBox + }% + \fi + \global\let\AtBegShi@First\@empty + \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled + \endgroup +} +\gdef\AtBegShi@Hook{} +\gdef\AtBegShi@HookNext{} +\gdef\AtBegShi@HookFirst{} +\AtBegShi@CheckDefinable\AtBeginShipout +\def\AtBeginShipout{% + \AtBegShi@AddHook\AtBegShi@Hook +} +\AtBegShi@CheckDefinable\AtBeginShipoutNext +\def\AtBeginShipoutNext{% + \AtBegShi@AddHook\AtBegShi@HookNext +} +\AtBegShi@CheckDefinable\AtBeginShipoutFirst +\def\AtBeginShipoutFirst{% + \AtBegShi@AddTo\AtBegShi@HookFirst +} +\long\def\AtBegShi@FirstDisabled#1{% + \@PackageWarning{atbegshi}{% + First page is already shipped out, ignoring\MessageBreak + \string\AtBeginShipoutFirst + }% +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname g@addto@macro\endcsname\relax + \long\def\AtBegShi@AddTo#1#2{% + \begingroup + \toks\ltx@zero\expandafter{#1#2}% + \xdef#1{\the\toks\ltx@zero}% + \endgroup + }% +\else + \let\AtBegShi@AddTo\g@addto@macro +\fi +\long\def\AtBegShi@AddHook#1#2{% + \AtBegShi@AddTo#1{\AtBegShi@Item{#2}}% +} +\long\def\AtBegShi@Item#1{% + \ifAtBegShi@Discarded + \else + #1% + \ifAtBegShi@Discarded + \else + \ifvoid\AtBeginShipoutBox + \@PackageWarning{atbegshi}{% + Shipout box was voided by hook,\MessageBreak + ignoring shipout box% + }% + \AtBeginShipoutDiscard + \fi + \fi + \fi +} +\AtBegShi@CheckDefinable\AtBeginShipoutInit +\def\AtBeginShipoutInit{% + \ltx@IfUndefined{newbox}{% + \@PackageError{atbegshi}{% + \string\AtBeginShipoutInit\space failed\MessageBreak + because of missing \expandafter\string\csname newbox\endcsname + }\@ehc + }{% + \csname newbox\endcsname\AtBeginShipoutBox + \AtBegShi@CheckDefinable\AtBeginShipoutOriginalShipout + \global\let\AtBeginShipoutOriginalShipout\shipout + \global\let\shipout\AtBegShi@Shipout + }% + \gdef\AtBeginShipoutInit{}% +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname AtBeginDocument\endcsname\relax + \AtBeginShipoutInit +\else + \AtBeginDocument{\AtBeginShipoutInit}% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ifpdf.sty\relax +\else + \RequirePackage{ifpdf}\relax +\fi +\ifpdf + \def\AtBegShi@horigin{\pdfhorigin}% + \def\AtBegShi@vorigin{\pdfvorigin}% +\else + \def\AtBegShi@horigin{72.27pt}% + \def\AtBegShi@vorigin{72.27pt}% +\fi +\begingroup +\ifcase + \expandafter\ifx\csname picture\endcsname\relax + 1% + \else + \expandafter\ifx\csname endpicture\endcsname\relax + 1% + \else + 0% + \fi + \fi + \endgroup + \def\AtBegShi@BeginPicture{% + \begingroup + \picture(0,0)\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname unitlength\endcsname\relax + \else + \unitlength=1pt\relax + \fi + \ignorespaces + }% + \def\AtBegShi@EndPicture{% + \endpicture + \endgroup + }% +\else + \endgroup + \def\AtBegShi@BeginPicture{% + \setbox\ltx@zero=\hbox\bgroup + \begingroup + \ignorespaces + }% + \def\AtBegShi@EndPicture{% + \endgroup + \egroup + \ht\ltx@zero=0pt\relax + \dp\ltx@zero=0pt\relax + \copy\ltx@zero + }% +\fi +\def\AtBeginShipoutUpperLeft#1{% + \global\setbox\AtBeginShipoutBox=\hbox{% + \rlap{% + \kern-\AtBegShi@horigin\relax + \vbox to 0pt{% + \kern-\AtBegShi@vorigin\relax + \kern-\ht\AtBeginShipoutBox + \AtBegShi@BeginPicture + #1% + \AtBegShi@EndPicture + \vss + }% + }% + \box\AtBeginShipoutBox + }% +} +\def\AtBeginShipoutUpperLeftForeground#1{% + \global\setbox\AtBeginShipoutBox=\hbox to \wd\AtBeginShipoutBox{% + \rlap{% + \copy\AtBeginShipoutBox + }% + \rlap{% + \kern-\AtBegShi@horigin\relax + \vbox to 0pt{% + \kern-\AtBegShi@vorigin\relax + \kern-\ht\AtBeginShipoutBox + \AtBegShi@BeginPicture + #1% + \AtBegShi@EndPicture + \vss + }% + }% + \hss + }% +} +\def\AtBegShi@AbortIfUndefined#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname#1\endcsname\relax + \expandafter\AtBegShi@AtEnd + \fi +} +\AtBegShi@AbortIfUndefined{currentgrouplevel}% +\AtBegShi@AbortIfUndefined{AtBeginDocument}% +\AtBegShi@AbortIfUndefined{@ifpackageloaded}% +\AtBegShi@AbortIfUndefined{@ifclassloaded}% +\def\AtBegShi@PatchCrop{% + \begingroup + \def\AtBegShi@Crop@shipout{% + \afterassignment\CROP@ship + \setbox\@cclv=% + }% + \def\AtBegShi@Crop@ship{% + \ifvoid\@cclv + \expandafter\aftergroup + \fi + \CROP@@ship + }% + \def\AtBegShi@Crop@shiplist{% + \lineskip\z@ + \lineskiplimit\z@ + \baselineskip\z@ + \CROP@kernel + \box\@cclv + }% + \def\AtBegShi@Crop@@ship{% + \CROP@shipout\vbox{% + \CROP@shiplist + }% + }% + \ifx\AtBegShi@Crop@ship\CROP@ship + \ifx\AtBegShi@Crop@shiplist\CROP@shiplist + \ifx\AtBegShi@Crop@@ship\CROP@@ship + \let\AtBegShi@found\relax + \ifx\shipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\shipout}% + \else\ifx\AtBeginShipoutOriginalShipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\AtBeginShipoutOriginalShipout}% + \else\ifx\@EveryShipout@Org@Shipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\@EveryShipout@Org@Shipout}% + \else\ifx\GPTorg@shipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\GPTorg@shipout}% + \else\ifx\THBorg@shipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\THBorg@shipout}% + \else\ifx\mem@oldshipout\AtBegShi@Crop@shipout + \def\AtBegShi@found{\mem@oldshipout}% + \fi\fi\fi\fi\fi\fi + \ifx\AtBegShi@found\relax + \else + \expandafter\endgroup + \expandafter\def\AtBegShi@found{% + \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}% + \afterassignment\CROP@ship + \setbox\AtBeginShipoutBox=% + }% + \def\CROP@ship{% + \ifnum\AtBegShi@GroupLevel=\currentgrouplevel + \else + \expandafter\aftergroup + \fi + \CROP@@ship + }% + \def\CROP@shiplist{% + \lineskip 0pt\relax + \lineskiplimit 0pt\relax + \baselineskip 0pt\relax + \CROP@kernel + \box\AtBeginShipoutBox + }% + \def\CROP@@ship{% + \ifvoid\AtBeginShipoutBox + \else + \setbox\AtBeginShipoutBox=\vbox{% + \CROP@shiplist + }% + \expandafter\CROP@shipout + \expandafter\box + \expandafter\AtBeginShipoutBox + \fi + }% + \@PackageInfoNoLine{atbegshi}{Package `crop' patched}% + \begingroup + \fi + \fi + \fi + \fi + \endgroup + \let\AtBegShi@PatchCrop\relax +} +\@ifpackageloaded{crop}{% + \AtBegShi@PatchCrop +}{% + \AtBeginDocument{\AtBegShi@PatchCrop}% +} +\def\AtBegShi@PatchEveryshi{% + \begingroup + \long\def\AtBegShi@Everyshi@shipout{% + \afterassignment\@EveryShipout@Test + \global\setbox\@cclv= % + }% + \long\def\AtBegShi@Everyshi@Test{% + \ifvoid\@cclv\relax + \aftergroup\@EveryShipout@Output + \else + \@EveryShipout@Output + \fi + }% + \ifx\AtBegShi@Everyshi@Test\@EveryShipout@Test + \let\AtBegShi@found\relax + \ifx\shipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\shipout}% + \else\ifx\AtBeginShipoutOriginalShipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\AtBeginShipoutOriginalShipout}% + \else\ifx\CROP@shipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\CROP@shipout}% + \else\ifx\GPTorg@shipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\GPTorg@shipout}% + \else\ifx\THBorg@shipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\THBorg@shipout}% + \else\ifx\mem@oldshipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\mem@oldshipout}% + \else + \expandafter\ifx\csname @EveryShipout@Org@Shipout\endcsname + \relax + \ifx\@EveryShipout@Shipout\AtBegShi@Everyshi@shipout + \def\AtBegShi@found{\@EveryShipout@Shipout}% + \fi + \fi + \fi\fi\fi\fi\fi\fi + \ifx\AtBegShi@found\relax + \else + \expandafter\endgroup + \expandafter\def\AtBegShi@found{% + \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}% + \afterassignment\@EveryShipout@Test + \setbox\AtBeginShipoutBox=% + }% + \def\@EveryShipout@Test{% + \ifnum\AtBegShi@GroupLevel=\currentgrouplevel + \else + \expandafter\aftergroup + \fi + \AtBegShi@Everyshi@Output + }% + \def\AtBegShi@Everyshi@Output{% + \ifvoid\AtBeginShipoutBox + \else + \global\setbox\ltx@cclv\box\AtBeginShipoutBox + \expandafter\@EveryShipout@Output + \fi + }% + \@PackageInfoNoLine{atbegshi}{Package `everyshi' patched}% + \begingroup + \fi + \fi + \endgroup + \let\AtBegShi@PatchEveryshi\relax +} +\@ifpackageloaded{everyshi}{% + \AtBegShi@PatchEveryshi +}{% + \AtBeginDocument{\AtBegShi@PatchEveryshi}% +} +\def\AtBegShi@PatchMemoir{% + \begingroup + \def\AtBegShi@Memoir@shipout{% + \afterassignment\mem@shipi + \setbox\@cclv=% + }% + \def\AtBegShi@Memoir@shipi{% + \ifvoid\@cclv + \expandafter\aftergroup + \fi + \mem@shipii + }% + \def\AtBegShi@Memoir@shipiiA{% + \mem@oldshipout\vbox{% + \trimmarks + \unvbox\@cclv + }% + }% + \def\AtBegShi@Memoir@shipiiB{% + \ifvoid\@cclv + \mem@oldshipout\box\@cclv + \else + \mem@oldshipout\vbox{% + \trimmarks + \unvbox\@cclv + }% + \fi + }% + \ifx\AtBegShi@Memoir@shipi\mem@shipi + \ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii + \ltx@zero + \else + \ifx\AtBegShi@Memoir@shipiiB\mem@shipii + \ltx@zero + \else + \ltx@one + \fi + \fi + \let\AtBegShi@found\relax + \ifx\shipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\shipout}% + \else\ifx\AtBeginShipoutOriginalShipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\AtBeginShipoutOriginalShipout}% + \else\ifx\CROP@shipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\CROP@shipout}% + \else\ifx\GPTorg@shipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\GPTorg@shipout}% + \else\ifx\THBorg@shipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\THBorg@shipout}% + \else\ifx\@EveryShipout@Org@Shipout\AtBegShi@Memoir@shipout + \def\AtBegShi@found{\@EveryShipout@Org@Shipout}% + \fi\fi\fi\fi\fi\fi + \ifx\AtBegShi@found\relax + \else + \expandafter\endgroup + \expandafter\def\AtBegShi@found{% + \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}% + \afterassignment\mem@shipi + \setbox\AtBeginShipoutBox=% + }% + \def\mem@shipi{% + \ifnum\AtBegShi@GroupLevel=\currentgrouplevel + \else + \expandafter\aftergroup + \fi + \mem@shipii + }% + \def\mem@shipii{% + \ifvoid\AtBeginShipoutBox + \else + \setbox\AtBeginShipoutBox=\vbox{% + \trimmarks + \ifvbox\AtBeginShipoutBox + \unvbox\AtBeginShipoutBox + \else + \box\AtBeginShipoutBox + \fi + }% + \expandafter\mem@oldshipout + \expandafter\box + \expandafter\AtBeginShipoutBox + \fi + }% + \@PackageInfoNoLine{atbegshi}{Class `memoir' patched}% + \begingroup + \fi + \fi + \fi + \endgroup + \let\AtBegShi@PatchMemoir\relax +} +\@ifclassloaded{memoir}{% + \AtBegShi@PatchMemoir +}{% + \AtBeginDocument{\AtBegShi@PatchMemoir}% +} +\AtBegShi@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{refcount} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@refcount.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{refcount}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@refcount.sty\endcsname +\ProvidesPackage{refcount}% + [2010/12/01 v3.2 Data extraction from references (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname rc@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\rc@AtEnd{% + \rc@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\rc@AtEnd{\rc@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ltxcmds.sty\relax + \input infwarerr.sty\relax +\else + \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{infwarerr}[2010/04/08]% +\fi +\ltx@IfUndefined{@ifdefinable}{% + \def\rc@IfDefinable#1{% + \ifx#1\ltx@undefined + \expandafter\ltx@firstofone + \else + \ifx#1\relax + \expandafter\expandafter\expandafter\ltx@firstofone + \else + \@PackageError{refcount}{% + Command \string#1 is already defined.\MessageBreak + It will not redefined by this package% + }\@ehc + \expandafter\expandafter\expandafter\ltx@gobble + \fi + \fi + }% +}{% + \let\rc@IfDefinable\@ifdefinable +} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + #1\def#3##1{#4}% + }% + }% + }{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \DeclareRobustCommand#2#3[1]{#4}% + }% + }% + }% +}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \protected#1\def#3##1{#4}% + }% + }% +} +\ltx@IfUndefined{newcommand}{% + \def\rc@newcommand*#1[#2]#3{% hash-ok + \rc@IfDefinable#1{% + \ifcase#2 % + \def#1{#3}% + \or + \def#1##1{#3}% + \or + \def#1##1##2{#3}% + \else + \rc@InternalError + \fi + }% + }% +}{% + \let\rc@newcommand\newcommand +} +\rc@RobustDefOne\long{}\setrefcountdefault{% + \def\rc@default{#1}% +} +\setrefcountdefault{0} +\ltx@IfUndefined{G@refundefinedtrue}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \protect\G@refundefinedtrue + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \csname protect\expandafter\endcsname + \csname G@refundefinedtrue\endcsname + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +} +\ltx@IfUndefined{@latex@warning}{% + \def\rc@WarningUndefined#1{% + \ltx@ifundefined{thepage}{% + \def\thepage{\number\count0 }% + }{}% + \@PackageWarning{refcount}{% + Reference `#1' on page \thepage\space undefined% + }% + }% +}{% + \def\rc@WarningUndefined#1{% + \@latex@warning{% + Reference `#1' on page \thepage\space undefined% + }% + }% +} +\def\rc@set#1#2#3#4{% + \begingroup + \csname @safe@activestrue\endcsname + \rc@refused{#4}% + \expandafter\rc@@set\csname r@#4\endcsname{#1}{#2}{#3}% + \endgroup +} +\def\rc@@set#1#2#3#4{% + \ifx#1\relax + #2{#4}{\rc@default}% + \else + #2{#4}{% + \expandafter#3#1\rc@default\rc@default\@nil + }% + \fi +} +\rc@newcommand*{\setcounterref}[0]{% + \rc@set\setcounter\ltx@car +} +\rc@newcommand*{\addtocounterref}[0]{% + \rc@set\addtocounter\ltx@car +} +\rc@newcommand*{\setcounterpageref}[0]{% + \rc@set\setcounter\ltx@cartwo +} +\rc@newcommand*{\addtocounterpageref}[0]{% + \rc@set\addtocounter\ltx@cartwo +} +\rc@newcommand*{\getrefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero + \rc@default + }{% + \expandafter\expandafter\expandafter\rc@extract@ + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\endcsname + \expandafter{\rc@default}\@nil + }% +} +\rc@newcommand*{\getpagerefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero + \rc@default + }{% + \expandafter\expandafter\expandafter\rc@extract@page + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter{% + \expandafter\rc@default + \expandafter}\expandafter{\rc@default}\@nil + }% +} +\rc@newcommand*{\getrefbykeydefault}[2]{% + \romannumeral + \expandafter\rc@getrefbykeydefault + \csname r@#1\expandafter\endcsname + \csname rc@extract@#2\endcsname +} +\long\def\rc@getrefbykeydefault#1#2#3{% + \ifx#1\relax + % reference is undefined + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3% + }% + \else + \ltx@ReturnAfterFi{% + \ifx#2\relax + % extract method is missing + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3% + }% + \else + \ltx@ReturnAfterFi{% + \expandafter + \rc@generic#1{#3}{#3}{#3}{#3}{#3}\@nil#2{#3}% + }% + \fi + }% + \fi +} +\long\def\rc@generic#1#2\@nil#3#4{% + #3{#1\TR@TitleReference\@empty{#4}\@nil}{#1}#2\@nil +} +\long\def\rc@extract@#1#2#3\@nil{% + \ltx@zero + #2% +} +\long\def\rc@extract@page#1#2#3#4\@nil{% + \ltx@zero + #3% +} +\long\def\rc@extract@name#1#2#3#4#5\@nil{% + \ltx@zero + #4% +} +\long\def\rc@extract@anchor#1#2#3#4#5#6\@nil{% + \ltx@zero + #5% +} +\long\def\rc@extract@url#1#2#3#4#5#6#7\@nil{% + \ltx@zero + #6% +} +\long\def\rc@extract@title#1#2\@nil{% + \rc@@extract@title#1% +} +\long\def\rc@@extract@title#1\TR@TitleReference#2#3#4\@nil{% + \ltx@zero + #3% +} +\rc@newcommand*{\IfRefUndefinedExpandable}[1]{% + \ltx@ifundefined{r@#1}\ltx@firstoftwo\ltx@secondoftwo +} +\rc@RobustDefOne{}*\IfRefUndefinedBabel{% + \begingroup + \csname safe@actives@true\endcsname + \expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname r@#1\endcsname\relax + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +\rc@AtEnd% + \endinput +<hobsub> +\hobsub@StopPackage +\hobsub@StartPackage{hycolor} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{hycolor}% + [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]% +\RequirePackage{xcolor-patch}[2011/01/30] +\begingroup + \catcode`\!=13 % + \catcode`\:=13 % + \catcode`\-=13 % + \catcode`\+=13 % + \catcode`\;=13 % + \catcode`\"=13 % + \catcode`\>=13 % + \edef\x{% + \def\noexpand!{\string!}% + \def\noexpand:{\string:}% + \def\noexpand-{\string-}% + \def\noexpand+{\string+}% + \def\noexpand;{\string;}% + \def\noexpand"{\string"}% + \def\noexpand>{\string>}% + }% + \def\y#1{\endgroup + \def\HyColor@DefSanitized##1##2{% + \begingroup + \csname @safe@activestrue\endcsname + #1% + \edef\x{\endgroup + \def\noexpand##1{##2}% + }% + \x + \@onelevel@sanitize##1% + }% + }% +\expandafter\y\expandafter{\x} +\def\HyColor@NormalizeNum#1#2{% + \ifdim#1pt<\z@ + \def#2{0}% + \else + \edef#2{\zap@space#1 \@empty}% + \expandafter\HyColor@CheckDot#2..\@nil#2% + \fi +} +\def\HyColor@CheckDot#1.#2.#3\@nil#4{% + \ifnum0#1<\@ne + \ifx\\#2\\% + \def#4{0}% + \else + \edef#4{\HyColor@ReverseString#2\@nil{}}% + \edef#4{\expandafter\HyColor@StripLeadingZeros#4\@empty}% + \ifx#4\@empty + \def#4{0}% + \else + \edef#4{.\expandafter\HyColor@ReverseString#4\@nil{}}% + \fi + \fi + \else + \def#4{1}% + \fi +} +\def\HyColor@ReverseString#1#2\@nil#3{% + \ifx\\#2\\% + #1#3% + \else + \@ReturnAfterFi{% + \HyColor@ReverseString#2\@nil{#1#3}% + }% + \fi +} +\long\def\@ReturnAfterFi#1\fi{\fi#1} +\def\HyColor@StripLeadingZeros#1{% + \ifx#10% + \expandafter\HyColor@StripLeadingZeros + \else + #1% + \fi +} +\def\HyColor@NormalizeCommaRGB#1,#2,#3\@nil#4{% + \HyColor@NormalizeNum{#1}\HyColor@temp + \let#4\HyColor@temp + \HyColor@NormalizeNum{#2}\HyColor@temp + \edef#4{#4 \HyColor@temp}% + \HyColor@NormalizeNum{#3}\HyColor@temp + \edef#4{#4 \HyColor@temp}% +} +\def\HyColor@NormalizeCommaCMYK#1,#2,#3,#4\@nil#5{% + \HyColor@NormalizeNum{#1}\HyColor@temp + \let#5\HyColor@temp + \HyColor@NormalizeNum{#2}\HyColor@temp + \edef#5{#5 \HyColor@temp}% + \HyColor@NormalizeNum{#3}\HyColor@temp + \edef#5{#5 \HyColor@temp}% + \HyColor@NormalizeNum{#4}\HyColor@temp + \edef#5{#5 \HyColor@temp}% +} +\def\HyColor@BookmarkColor#1#2#3#4{% + \HyColor@IfModel{#1}{% + \HyColor@IfXcolor{% + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + }{% + \ifx\HyColor@model\HyColor@model@rgb + \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2% + \else + \ifx\HyColor@model\HyColor@model@gray + \expandafter\HyColor@NormalizeNum + \expandafter{\HyColor@values}#2% + \edef#2{#2 #2 #2}% + \else + \let#2\@empty + \HyColor@ErrorModelNoXcolor{#3}{#4}% + \fi + \fi + }% + }{% + \let#2\HyColor@values + \ifx#2\@empty + \else + \HyColor@IfXcolor{% + \extractcolorspec{#1}#2% + \expandafter\convertcolorspec#2\HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + }{% + \let#2\@empty + \HyColor@ErrorSpecNoXcolor{#3}{#4}% + }% + \fi + }% +} +\def\HyColor@ErrorModelNoXcolor#1#2{% + \PackageError{#1}{% + Color model `\HyColor@model' is not supported\MessageBreak + without package `xcolor' in\MessageBreak + `#2=[\HyColor@model]{\HyColor@values}'% + }\@ehc +} +\def\HyColor@ErrorSpecNoXcolor#1#2{% + \PackageError{#1}{% + This color specification is not supported\MessageBreak + without package `xcolor' in\MessageBreak + `#2=\HyColor@values'% + }\@ehc +} +\def\HyColor@IfModel#1{% + \@ifnextchar[{% + \HyColor@WithModel + }{% + \HyColor@WithoutModel + }% + #1\@nil +} +\def\HyColor@WithModel[#1]#2\@nil{% + \HyColor@DefSanitized\HyColor@model{#1}% + \HyColor@DefSanitized\HyColor@values{#2}% + \@firstoftwo +} +\def\HyColor@WithoutModel#1\@nil{% + \let\HyColor@model\relax + \HyColor@DefSanitized\HyColor@values{#1}% + \@secondoftwo +} +\long\def\@ReturnAfterFi#1\fi{\fi#1} +\def\HyColor@IfXcolor{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname convertcolorspec\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi +} +\def\HyColor@model@empty{empty} +\@onelevel@sanitize\HyColor@model@empty +\def\HyColor@model@gray{gray} +\@onelevel@sanitize\HyColor@model@gray +\def\HyColor@model@rgb{rgb} +\@onelevel@sanitize\HyColor@model@rgb +\def\HyColor@model@cmyk{cmyk} +\@onelevel@sanitize\HyColor@model@cmyk +\def\HyColor@model@Gray{Gray} +\@onelevel@sanitize\HyColor@model@Gray +\def\HyColor@UseColor#1{% + \ifx#1\relax + \else + \ifx#1\@empty + \else + \expandafter\HyColor@@UseColor#1\@nil + \fi + \fi +} +\def\HyColor@@UseColor{% + \@ifnextchar[\HyColor@@@UseColor\HyColor@@@@UseColor +} +\def\HyColor@@@UseColor[#1]#2\@nil{% + \color[{#1}]{#2}% +} +\def\HyColor@@@@UseColor#1\@nil{% + \color{#1}% +} +\def\HyColor@HyperrefColor#1#2{% + \HyColor@IfModel{#1}{% + \edef#2{[{\HyColor@model}]{\HyColor@values}}% + }{% + \let#2\HyColor@values + \ifx#2\@empty + \let#2\relax + \fi + }% +} +\def\HyColor@XZeroOneThreeFour#1#2#3#4{% + \HyColor@IfModel{#1}{% + \ifx\HyColor@model\HyColor@model@empty + \let#2\@empty + \else\ifx\HyColor@model\HyColor@model@gray + \expandafter\HyColor@NormalizeNum + \expandafter{\HyColor@values}#2% + \else\ifx\HyColor@model\HyColor@model@rgb + \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2% + \else\ifx\HyColor@model\HyColor@model@cmyk + \expandafter\HyColor@NormalizeCommaCMYK\HyColor@values\@nil#2% + \else\ifx\HyColor@model\HyColor@model@Gray + \HyColor@IfXcolor{% + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@gray#2% + \expandafter\HyColor@NormalizeNum\expandafter{#2}#2% + \let\HyColor@model\HyColor@model@gray + }{% + \let#2\relax + \HyColor@ErrorModelNoXcolor{#3}{#4}% + }% + \else + \HyColor@IfXcolor{% + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + \let\HyColor@model\HyColor@model@rgb + }{% + \let#2\relax + \HyColor@ErrorModelNoXcolor{#3}{#4}% + }% + \fi\fi\fi\fi\fi + }{% + \let#2\HyColor@values + \ifx#2\@empty + \let#2\relax + \else + \expandafter\HyColor@IfRGB\expandafter{\HyColor@values}{% + \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2% + }{% + \HyColor@IfXcolor{% + \expandafter\extractcolorspec\expandafter{\HyColor@values}#2% + \edef\HyColor@model{\expandafter\@firstoftwo#2}% + \edef\HyColor@values{\expandafter\@secondoftwo#2}% + \ifx\HyColor@model\HyColor@model@gray + \expandafter\HyColor@NormalizeNum\expandafter + {\HyColor@values}#2% + \else\ifx\HyColor@model\HyColor@model@rgb + \expandafter\HyColor@NormalizeCommaRGB + \HyColor@values\@nil#2% + \else\ifx\HyColor@model\HyColor@model@cmyk + \expandafter\HyColor@NormalizeCommaCMYK + \HyColor@values\@nil#2% + \else\ifx\HyColor@model\HyColor@model@Gray + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@gray#2% + \expandafter\HyColor@NormalizeNum\expandafter + {\HyColor@values}#2% + \let\HyColor@model\HyColor@model@gray + \else + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + \let\HyColor@model\HyColor@model@rgb + \fi\fi\fi\fi + }{% + \let#2\relax + \HyColor@ErrorSpecNoXcolor{#3}{#4}% + }% + }% + \fi + }% +} +\let\HyColor@FieldBColor\HyColor@XZeroOneThreeFour +\def\HyColor@FieldColor#1#2#3#4{% + \let\HyColor@model\@empty + \HyColor@XZeroOneThreeFour{#1}{#2}{#3}{#4}% + \ifx#2\relax + \let#2\@empty + \else + \ifx#2\@empty + \else + \ifx\HyColor@model\HyColor@model@gray + \edef#2{#2 g}% + \else\ifx\HyColor@model\HyColor@model@rgb + \edef#2{#2 rg}% + \else\ifx\HyColor@model\HyColor@model@cmyk + \edef#2{#2 k}% + \else + \PackageError{#3}{Internal error: unsupported color model}\@ehc + \fi\fi\fi + \fi + \fi +} +\newif\ifHyColor@result +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfmatch\endcsname\relax + \expandafter\@firstoftwo +\else + \expandafter\@secondoftwo +\fi +{% + \begingroup + \def\x#1{\endgroup + \def\HyColor@IfRGB##1{% + \HyColor@@IfRGB##1#1#1#1\@nil + }% + }% + \x{ }% + \edef\HyColor@TwoSpaces{\space\space}% + \def\HyColor@@IfRGB#1 #2 #3 #4\@nil{% + \HyColor@resulttrue + \def\HyColor@temp{#4}% + \ifx\HyColor@temp\HyColor@TwoSpaces + \HyColor@CheckNum{#1}% + \ifHyColor@result + \HyColor@CheckNum{#2}% + \ifHyColor@result + \HyColor@CheckNum{#3}% + \fi + \fi + \else + \HyColor@resultfalse + \fi + \ifHyColor@result + \let\HyColor@model\HyColor@model@rgb + \edef\HyColor@values{#1,#2,#3}% + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + }% + \def\HyColor@zero{0}% + \def\HyColor@one{1}% + \def\HyColor@dot{.}% + \def\HyColor@CheckNum#1{% + \def\HyColor@temp{#1}% + \ifx\HyColor@temp\@empty + \HyColor@resultfalse + \else + \edef\HyColor@temp{\@car#1\@nil}% + \ifx\HyColor@temp\HyColor@zero + \else + \ifx\HyColor@temp\HyColor@one + \else + \ifx\HyColor@temp\HyColor@dot + \else + \HyColor@resultfalse + \fi + \fi + \fi + \fi + }% +}{% + \def\HyColor@MatchNum{% + (0*1\string\.0*|0*1|0+\string\.?[0-9]*|\string\.[0-9]+)% + }% + \def\HyColor@IfRGB#1{% + \ifnum\pdfmatch{^\HyColor@MatchNum\space\HyColor@MatchNum + \space\HyColor@MatchNum$}{#1}>\z@ + \let\HyColor@model\HyColor@model@rgb + \edef\HyColor@values{% + \expandafter\strip@prefix\pdflastmatch1,% + \expandafter\strip@prefix\pdflastmatch2,% + \expandafter\strip@prefix\pdflastmatch3% + }% + \HyColor@resulttrue + \expandafter\@firstoftwo + \else + \HyColor@resultfalse + \expandafter\@secondoftwo + \fi + }% +} +\def\HyColor@HyperrefBorderColor#1#2#3#4{% + \HyColor@IfModel{#1}{% + \HyColor@IfXcolor{% + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + }{% + \ifx\HyColor@model\HyColor@model@rgb + \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2% + \else + \ifx\HyColor@model\HyColor@model@gray + \expandafter\HyColor@NormalizeNum + \expandafter{\HyColor@values}#2% + \edef#2{#2 #2 #2}% + \else + \let#2\relax + \HyColor@ErrorModelNoXcolor{#3}{#4}% + \fi + \fi + }% + }{% + \let#2\HyColor@values + \ifx#2\@empty + \let#2\relax + \else + \expandafter\HyColor@IfRGB\expandafter{\HyColor@values}{% + \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2% + }{% + \HyColor@IfXcolor{% + \extractcolorspec{#1}#2% + \expandafter\convertcolorspec#2\HyColor@model@rgb#2% + \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2% + }{% + \let#2\relax + \HyColor@ErrorSpecNoXcolor{#3}{#4}% + }% + }% + \fi + }% +} +\def\HyColor@DetectPdfVersion{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname Hy@pdfversion\endcsname\relax + \global\chardef\HyColor@PdfVersion=0 % + \else + \global\chardef\HyColor@PdfVersion=\Hy@pdfversion\relax + \fi + \global\let\HyColor@DetectPdfVersion\relax +} +\def\HyColor@SpaceToComma#1 #2\@nil{% + #1% + \ifx\relax#2\relax + \expandafter\@gobble + \else + ,% + \expandafter\@firstofone + \fi + {% + \HyColor@SpaceToComma#2\@nil + }% +}% +\def\HyColor@AttachfileColor#1#2#3#4#5#6{% + \def#2{#1}% + \ifx#2\@empty + \let#3\@gobble + \let#4\@empty + \else + \HyColor@resultfalse + \HyColor@XZeroOneThreeFour{#1}#3{#5}{#6}% + \ifHyColor@result + \edef#2{% + [rgb]{\expandafter\HyColor@SpaceToComma#3 \@nil}% + }% + \fi + \ifx\HyColor@model\HyColor@model@rgb + \edef#4{/C[#3]}% hash-ok + \edef#3##1{% + #3 % + \noexpand\csname atfi@SETRGBCOLOR##1\noexpand\endcsname + }% + \else + \ifx\HyColor@model\HyColor@model@gray + \HyColor@DetectPdfVersion + \ifnum\HyColor@PdfVersion<7 % + \edef#4{/C[#3 #3 #3]}% hash-ok + \else + \edef#4{/C[#3]}% hash-ok + \fi + \edef#3##1{% + #3 % + \noexpand\csname atfi@SETGRAYCOLOR##1\noexpand\endcsname + }% + \else + \ifx\HyColor@model\HyColor@model@cmyk + \HyColor@DetectPdfVersion + \ifnum\HyColor@PdfVersion<7 % + \HyColor@IfModel{#1}{% + \HyColor@IfXcolor{% + \convertcolorspec\HyColor@model\HyColor@values + \HyColor@model@rgb#4% + \expandafter\HyColor@NormalizeCommaRGB#4\@nil#4% + \edef#4{/C[#4]}% hash-ok + }{% + \let#4\@empty + \HyColor@ErrorModelNoXcolor{#5}{#6}% + }% + }{% + \HyColor@IfXcolor{% + \extractcolorspec{#1}#4% + \expandafter\convertcolorspec#4% + \HyColor@model@rgb#4% + \expandafter\HyColor@NormalizeCommaRGB#4\@nil#4% + \edef#4{/C[#4]}% hash-ok + }{% + \let#4\@empty + \HyColor@ErrorSpecNoXcolor{#5}{#6}% + }% + }% + \else + \edef#4{/C[#3]}% hash-ok + \fi + \edef#3##1{% + #3 % + \noexpand\csname atfi@SETCMYKCOLOR##1\noexpand\endcsname + }% + \else + \ifx\HyColor@model\HyColor@model@empty + \PackageError{#5}{% + Color model `empty' is not permitted for option `#6'% + }\@ehc + \let#2\@empty + \let#3\@gobble + \let#4\@empty + \else + \ifx\HyColor@model\relax % (missing xcolor) + \let#3\@gobble + \let#4\@empty + \else + \PackageError{#5}{% + Internal error: unsupported color model% + }\@ehc + \fi + \fi + \fi + \fi + \fi + \fi +} + \endinput +<hobsub> +\hobsub@StopPackage +\endinput +%% +%% End of file `hobsub-hyperref.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty new file mode 100644 index 00000000000..2f533c54d2f --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub.sty @@ -0,0 +1,217 @@ +%% +%% This is file `hobsub.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hobsub.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file hobsub.dtx +%% and the derived files +%% hobsub.sty, hobsub.pdf, hobsub.ins, hobsub.drv, hobsub-generic.sty, +%% hobsub-hyperref.sty, hobsub-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@hobsub.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{hobsub}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@hobsub.sty\endcsname +\ProvidesPackage{hobsub}% + [2011/01/30 v1.0 Subsetting bundle oberdiek (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOBsub@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOBsub@AtEnd{% + \HOBsub@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\edef\HOBsub@AtEnd{\HOBsub@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname HOBsub@OrgEndinput\endcsname\relax + \let\HOBsub@OrgEndinput\endinput +\fi +\def\hobsub@GobbleRemainingPackage{% + \begingroup + \catcode92=14 % backslash: comment + \catcode32=14 % space: comment + \catcode123=14 % left brace: comment + \catcode125=14 % right brace: comment + \catcode60=3 % less: math + \catcode62=4 % greater: align + \endlinechar=-1 % + \HOBsub@GobbleRemainingPackage +} +\catcode60=3 % less: dollar +\catcode62=4 % greater: align +\long\def\HOBsub@GobbleRemainingPackage#1<hobsub>{% + \endgroup +} +\catcode60=12 % less: other +\catcode62=12 % greater: other +\def\hobsub@StartPackage#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \let\HOBsub@OrgCurrName\@currname + \let\HOBsub@OrgCurrExt\@currext + \csname @pushfilename\endcsname + \def\@currname{#1}% + \def\@currext{sty}% + \expandafter\def\csname\@currname.\@currext-h@@k\endcsname{}% + \let\endinput\hobsub@GobbleRemainingPackage + \def\hobsub@StopPackage{% + \let\hobsub@StopPackage\relax + \HOBsub@StopPackage + }% + \hobsub@AddToFileList{#1.sty}% + \else + \hobsub@Info{hobsub}{Skipping package `#1' (already loaded)}% + \let\hobsub@StopPackage\relax + \expandafter\hobsub@GobbleRemainingPackage + \fi +} +\let\hobsub@StopPackage\relax +\def\hobsub@Info#1#2{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @PackageInfoNoLine\endcsname\relax + \immediate\write-1{Package #1 Info: #2.}% + \else + \let\hobsub@Info\@PackageInfoNoLine + \hobsub@Info{#1}{#2}% + \fi +} +\def\HOBsub@StopPackage{% + \csname\@currname.\@currext-h@@k\endcsname + \let\endinput\HOBsub@OrgEndinput + \csname @popfilename\endcsname + \let\@currname\HOBsub@OrgCurrName + \let\@currext\HOBsub@OrgCurrExt +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname @addtofilelist\endcsname\relax + \def\hobsub@AddToFileList#1{}% +\else + \def\hobsub@AddToFileList#1{% + \@addtofilelist{#1}% + }% +\fi +\HOBsub@AtEnd% +\endinput +%% +%% End of file `hobsub.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex index 78e23862846..3d9f4669a5e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2010 by +%% Copyright (C) 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{hologo}[2010/04/24] +\usepackage{hologo}[2011/03/25] \usepackage{kvsetkeys} \usepackage{qstest} \IncludeTests{*} @@ -53,6 +53,7 @@ AmSLaTeX,% AmSTeX,% eTeX,% + iniTeX,% LaTeX,% LaTeX2e,% LaTeX3,% @@ -66,6 +67,7 @@ plainTeX={variant=hyphen},% plainTeX={variant=runtogether},% TeX,% + virTeX,% VTeX,% XeLaTeX,% XeTeX,% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex index 9413b288492..5ae2310e80c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2010 by +%% Copyright (C) 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -85,6 +85,22 @@ \advance\count@ 1 % \repeat } +\def\RangeCatcodeCheck#1#2#3{% + \count@=#1\relax + \loop + \ifnum#3=\catcode\count@ + \else + \errmessage{% + Character \the\count@\space + with wrong catcode \the\catcode\count@\space + instead of \number#3% + }% + \fi + \ifnum\count@<#2\relax + \advance\count@ 1 % + \repeat +} +\def\space{ } \expandafter\ifx\csname LoadCommand\endcsname\relax \def\LoadCommand{\input hologo.sty\relax}% \fi @@ -95,15 +111,20 @@ \RangeCatcodeInvalid{123}{255}% \catcode`\@=12 % \catcode`\\=0 % - \catcode`\{=1 % - \catcode`\}=2 % - \catcode`\#=6 % - \catcode`\[=12 % - \catcode`\]=12 % \catcode`\%=14 % - \catcode`\ =10 % - \catcode13=5 % \LoadCommand + \RangeCatcodeCheck{0}{36}{15}% + \RangeCatcodeCheck{37}{37}{14}% + \RangeCatcodeCheck{38}{47}{15}% + \RangeCatcodeCheck{48}{57}{12}% + \RangeCatcodeCheck{58}{63}{15}% + \RangeCatcodeCheck{64}{64}{12}% + \RangeCatcodeCheck{65}{90}{11}% + \RangeCatcodeCheck{91}{91}{15}% + \RangeCatcodeCheck{92}{92}{0}% + \RangeCatcodeCheck{93}{96}{15}% + \RangeCatcodeCheck{97}{122}{11}% + \RangeCatcodeCheck{123}{255}{15}% \RestoreCatcodes } \Test diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index 00d8dadd553..50c43d15164 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2010 by +%% Copyright (C) 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -33,14 +33,18 @@ %% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, %% hologo-test-spacefactor.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@hologo.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2010/04/24 v1.2 Logo collection (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/03/25 v1.4 Logo collection (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname HOLOGO@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\HOLOGO@AtEnd{% \HOLOGO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -132,7 +147,6 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ @@ -234,6 +248,7 @@ \ifx\HOLOGO@name\relax \chardef\HOLOGOOPT@hyphenbreak=\HOLOGOOPT@break \chardef\HOLOGOOPT@spacebreak=\HOLOGOOPT@break + \chardef\HOLOGOOPT@discretionarybreak=\HOLOGOOPT@break \else \expandafter\chardef \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname=% @@ -241,6 +256,10 @@ \expandafter\chardef \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname=% \csname HoLogoOpt@break@\HOLOGO@name\endcsname + \expandafter\chardef + \csname HoLogoOpt@discretionarybreak@\HOLOGO@name + \endcsname=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname \fi \fi } @@ -250,6 +269,7 @@ \HOLOGO@DeclareBoolOption{break} \HOLOGO@DeclareBoolOption{hyphenbreak} \HOLOGO@DeclareBoolOption{spacebreak} +\HOLOGO@DeclareBoolOption{discretionarybreak} \kv@define@key{HoLogo}{variant}{% \ifx\HOLOGO@name\relax \@PackageError{hologo}{% @@ -317,6 +337,23 @@ -% \fi } +\def\HOLOGO@discretionary{% + \ltx@ifundefined{HoLogoOpt@discretionarybreak@\HOLOGO@name}{% + \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% + \chardef\HOLOGO@temp=\HOLOGOOPT@discretionarybreak + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@break@\HOLOGO@name\endcsname + }% + }{% + \chardef\HOLOGO@temp=% + \csname HoLogoOpt@discretionarybreak@\HOLOGO@name\endcsname + }% + \ifcase\HOLOGO@temp + \else + \-% + \fi +} \def\HOLOGO@mbox#1{% \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{% \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak @@ -336,14 +373,14 @@ Package loading is aborted% }\@ehc \HOLOGO@AtEnd -} +}% \HOLOGO@IfExists\hologorobust{% \@PackageError{hologo}{% \string\hologorobust\ltx@space is already defined.\MessageBreak Package loading is aborted% }\@ehc \HOLOGO@AtEnd -} +}% \ltx@IfUndefined{protected}{% \ltx@IfUndefined{DeclareRobustCommand}{% \def\hologorobust#1% @@ -532,6 +569,16 @@ -% \hologo{TeX}% } +\def\HoLogo@iniTeX#1{% + \HOLOGO@mbox{% + ini\hologo{TeX}% + }% +} +\def\HoLogo@virTeX#1{% + \HOLOGO@mbox{% + ini\hologo{TeX}% + }% +} \def\HoLogo@LuaTeX#1{% \HOLOGO@mbox{% Lua% @@ -605,6 +652,18 @@ \hologo{LaTeX}% } \def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}% +\def\HoLogo@ConTeXt@simple#1{% + \HOLOGO@mbox{Con}% + \HOLOGO@discretionary + \HOLOGO@mbox{\hologo{TeX}t}% +} +\def\HoLogo@ConTeXt@narrow#1{% + \HOLOGO@mbox{C\kern-.0333emon}% + \HOLOGO@discretionary + \kern-.0667em% + \HOLOGO@mbox{\hologo{TeX}\kern-.0333emt}% +} +\def\HoLogo@ConTeXt{\HoLogo@ConTeXt@narrow} \HOLOGO@IfExists\InputIfFileExists{% \InputIfFileExists{hologo.cfg}{}{}% }{% @@ -724,7 +783,7 @@ \reflectbox }% \HOLOGO@AtEnd -} +}% \ltx@ifundefined{hologodriver}{% \def\hologodriver{dvips}% \@PackageInfoNoLine{hologo}{Using default driver `\hologodriver'}% @@ -807,7 +866,7 @@ \special{r)}% }% } -\HOLOGO@AtEnd +\HOLOGO@AtEnd% \endinput %% %% End of file `hologo.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty index 3d7d64fe369..0237299f59a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hyphsubst.sty @@ -33,14 +33,18 @@ %% hyphsubst.sty, hyphsubst.pdf, hyphsubst.ins, hyphsubst.drv, %% hyphsubst-test1.tex, hyphsubst-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@hyphsubst.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,36 +99,47 @@ \fi \expandafter\x\csname ver@hyphsubst.sty\endcsname \ProvidesPackage{hyphsubst}% - [2008/06/09 v0.2 Substitute hyphenation patterns (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2008/06/09 v0.2 Substitute hyphenation patterns (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname HyphSubst@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\HyphSubst@AtEnd{% \HyphSubst@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\HyphSubst@AtEnd{\HyphSubst@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax @@ -192,9 +209,8 @@ \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname documentclass\endcsname\relax - \HyphSubst@AtEnd - \expandafter\endinput -\fi + \expandafter\HyphSubst@AtEnd +\fi% \DeclareOption*{% \expandafter\HyphSubst@Option\CurrentOption==\relax } @@ -202,7 +218,7 @@ \HyphSubstLet{#1}{#2}% } \ProcessOptions*\relax -\HyphSubst@AtEnd +\HyphSubst@AtEnd% \endinput %% %% End of file `hyphsubst.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index a4c52c9c699..94b68d11725 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -34,14 +34,18 @@ %% iflang-test2.tex, iflang-test3.tex, iflang-test4.tex, %% iflang-test5.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@iflang.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/11/11 v1.5 Language checks (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2007/11/11 v1.5 Language checks (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\IfLang@AtEnd{% \IfLang@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -125,7 +140,9 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\IfLang@AtEnd{\IfLang@AtEnd\noexpand\endinput} \expandafter\ifx\csname @firstoftwo\endcsname\relax \long\def\@firstoftwo#1#2{#1}% \fi @@ -296,7 +313,7 @@ }% }% \fi -\IfLang@AtEnd +\IfLang@AtEnd% \endinput %% %% End of file `iflang.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty index 1b0ab97d108..5896bce39cb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifluatex.sty @@ -33,14 +33,18 @@ %% ifluatex.sty, ifluatex.pdf, ifluatex.ins, ifluatex.drv, %% ifluatex-test1.tex, ifluatex-test2.tex, ifluatex-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@ifluatex.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@ifluatex.sty\endcsname \ProvidesPackage{ifluatex}% - [2010/03/01 v1.3 Provides the ifluatex switch (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v1.3 Provides the ifluatex switch (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ifluatex@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ifluatex@AtEnd{% \ifluatex@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{39}{12}% ' @@ -127,9 +142,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{94}{7}% ^ \TMP@EnsureCode{96}{12}% ` +\edef\ifluatex@AtEnd{\ifluatex@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname PackageError\endcsname\relax \def\ifluatex@Error#1#2{% @@ -155,9 +170,8 @@ therefore package loading is aborted.% }% \endgroup - \ifluatex@AtEnd - \expandafter\endinput - \fi + \expandafter\ifluatex@AtEnd + \fi% \endgroup \let\ifluatex\iffalse \begingroup\expandafter\expandafter\expandafter\endgroup @@ -242,7 +256,7 @@ \fi \x{ifluatex}{LuaTeX \ifluatex\else not \fi detected}% \endgroup -\ifluatex@AtEnd +\ifluatex@AtEnd% \endinput %% %% End of file `ifluatex.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index fcf4914e004..92db7463120 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2001, 2005-2010 by +%% Copyright (C) 2001, 2005-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -32,14 +32,18 @@ %% and the derived files %% ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv, ifpdf-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@ifpdf.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -47,7 +51,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -59,21 +62,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -92,29 +98,38 @@ \fi \expandafter\x\csname ver@ifpdf.sty\endcsname \ProvidesPackage{ifpdf}% - [2010/01/28 v2.1 Provides the ifpdf switch (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/01/30 v2.3 Provides the ifpdf switch (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ifpdf@AtEnd{% \ifpdf@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{39}{12}% ' @@ -126,9 +141,11 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ \TMP@EnsureCode{96}{12}% ` +\edef\ifpdf@AtEnd{\ifpdf@AtEnd\noexpand\endinput} \begingroup \expandafter\ifx\csname ifpdf\endcsname\relax \else @@ -152,34 +169,41 @@ therefore package loading is aborted.% }% \endgroup - \ifpdf@AtEnd - \expandafter\endinput - \fi + \expandafter\ifpdf@AtEnd + \fi% \endgroup \begingroup + \def\skip#1\relax\begingroup{}% \expandafter\ifx\csname pdfoutput\endcsname\relax \else - \def\skip#1\relax\endgroup{\csname fi\endcsname\endgroup}% - \skip + \expandafter\skip \fi \expandafter\ifx\csname directlua\endcsname\relax - \def\skip#1\endgroup{\csname fi\endcsname\endgroup}% - \skip + \expandafter\skip \fi - \expandafter\ifx\csname RequirePackage\endcsname\relax - \input ifluatex.sty\relax +\endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ifluatex}[2009/04/10]% +\else + \RequirePackage{ifluatex}[2009/04/10]% +\fi +\ifluatex + \ifnum\luatexversion<36 % \else - \RequirePackage{ifluatex}[2009/04/10]% - \fi - \ifluatex - \ifnum\luatexversion<36 % - \else + \begingroup \directlua{tex.enableprimitives('ifpdf', {'pdfoutput'})}% \global\let\pdfoutput\ifpdfpdfoutput - \fi + \endgroup \fi - \relax -\endgroup +\fi +\relax\begingroup\endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newif\endcsname\relax \edef\pdffalse{% @@ -207,12 +231,9 @@ \begingroup \expandafter\ifx\csname pdfoutput\endcsname\relax \else - \escapechar=-1 % + \escapechar=92 % \edef\m{\meaning\pdfoutput}% - \edef\p{% - \string p\string d\string f% - \string o\string u\string t\string p\string u\string t% - }% + \edef\p{\string\pdfoutput}% \ifx\m\p \else \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax @@ -223,7 +244,7 @@ }% \fi \PackageWarningNoLine{ifpdf}{% - Someone has redefined \string\\pdfoutput% + Someone has redefined \string\pdfoutput% }% \fi \fi @@ -237,9 +258,9 @@ \let\x\PackageInfo \expandafter\let\csname on@line\endcsname\empty \fi - \x{ifpdf}{pdfTeX in pdf mode \ifpdf\else not \fi detected}% + \x{ifpdf}{pdfTeX in PDF mode is \ifpdf\else not \fi detected}% \endgroup -\ifpdf@AtEnd +\ifpdf@AtEnd% \endinput %% %% End of file `ifpdf.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index d7fb25e6ef7..49e1efb1922 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty @@ -32,14 +32,18 @@ %% and the derived files %% ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv, ifvtex-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@ifvtex.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -47,7 +51,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -59,21 +62,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -92,29 +98,38 @@ \fi \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% - [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v1.5 Switches for detecting VTeX and its modes (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ifvtex@AtEnd{% \ifvtex@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{39}{12}% ' @@ -124,10 +139,10 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{94}{7}% ^ \TMP@EnsureCode{96}{12}% ` +\edef\ifvtex@AtEnd{\ifvtex@AtEnd\noexpand\endinput} \begingroup \expandafter\ifx\csname ifvtex\endcsname\relax \else @@ -151,9 +166,8 @@ therefore package loading is aborted.% }% \endgroup - \ifvtex@AtEnd - \expandafter\endinput - \fi + \expandafter\ifvtex@AtEnd + \fi% \endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newif\endcsname\relax @@ -238,7 +252,7 @@ detected% }% \endgroup -\ifvtex@AtEnd +\ifvtex@AtEnd% \endinput %% %% End of file `ifvtex.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty index c20ab20c5c7..0d0d68483f2 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -34,14 +34,18 @@ %% infwarerr-test1.tex, infwarerr-test2.tex, %% infwarerr-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@infwarerr.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% - [2010/04/08 v1.3 Providing info/warning/message (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/04/08 v1.3 Providing info/warning/message (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\InfWarErr@AtEnd{% \InfWarErr@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{39}{12}% ' @@ -127,9 +142,9 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{94}{7}% ^ +\edef\InfWarErr@AtEnd{\InfWarErr@AtEnd\noexpand\endinput} \begingroup \let\x=Y% \def\check#1{% @@ -165,9 +180,8 @@ \let\@ClassWarningNoLine\ClassWarningNoLine \let\@PackageError\PackageError \let\@ClassError\ClassError - \InfWarErr@AtEnd - \expandafter\endinput -\fi + \expandafter\InfWarErr@AtEnd +\fi% \begingroup\expandafter\endgroup \ifcase\expandafter\ifx\csname inputlineno\endcsname\relax 0 % @@ -299,7 +313,7 @@ See the #1 class documentation for explanation.% }{#3}% } -\InfWarErr@AtEnd +\InfWarErr@AtEnd% \endinput %% %% End of file `infwarerr.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty index e6b572dbf6c..f7f094f7eb5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty @@ -34,14 +34,18 @@ %% intcalc-test1.tex, intcalc-test2.tex, intcalc-test3.tex, %% intcalc-test4.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@intcalc.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@intcalc.sty\endcsname \ProvidesPackage{intcalc}% - [2007/09/27 v1.1 Expandable integer calculations (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2007/09/27 v1.1 Expandable integer calculations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\InCa@AtEnd{% \InCa@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{40}{12}% ( @@ -127,9 +142,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{11}% : (letter!) \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{14}% ? (comment!) +\edef\InCa@AtEnd{\InCa@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname InCa@TestMode\endcsname\relax \else @@ -466,9 +481,8 @@ \the\numexpr#1+#2\relax \fi }% - \InCa@AtEnd - \expandafter\endinput -\fi + \expandafter\InCa@AtEnd +\fi% \def\intcalcNum#1{% \number\expandafter\InCa@FirstOfOne\number#1! % } @@ -1707,7 +1721,7 @@ \fi \long\def\@ReturnAfterFi#1\fi{\fi#1}% \long\def\@ReturnAfterElseFi#1\else#2\fi{\fi#1}% -\InCa@AtEnd +\InCa@AtEnd% \endinput diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty index ccc377ae7af..262a9d0ad00 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty @@ -33,14 +33,18 @@ %% kvdefinekeys.sty, kvdefinekeys.pdf, kvdefinekeys.ins, kvdefinekeys.drv, %% kvdefinekeys-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@kvdefinekeys.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,39 +99,76 @@ \fi \expandafter\x\csname ver@kvdefinekeys.sty\endcsname \ProvidesPackage{kvdefinekeys}% - [2010/03/01 v1.0 Defining keys (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/04/07 v1.3 Defining keys (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname KVD@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVD@AtEnd{% \KVD@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\KVD@AtEnd{\KVD@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input ltxcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/03/01]% \else \RequirePackage{ltxcmds}[2010/03/01]% \fi -\def\kv@define@key#1#2{% +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\kv@define@key#1#2% + }{% + \DeclareRobustCommand*{\kv@define@key}[2]% + }% +}{% + \protected\def\kv@define@key#1#2% +}% +{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \edef\KVD@temp{\endgroup + \noexpand\KVD@DefineKey{#1}{#2}% + }% + \KVD@temp +} +\def\KVD@DefineKey#1#2{% \ltx@ifnextchar[{% \KVD@DefineKeyWithDefault{#1}{#2}% }{% @@ -139,7 +182,7 @@ }% \long\expandafter\def\csname KV@#1@#2\endcsname##1% } -\KVD@AtEnd +\KVD@AtEnd% \endinput %% %% End of file `kvdefinekeys.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index 029b2121e59..22eeb8d2696 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007, 2009, 2010 by +%% Copyright (C) 2006, 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,14 +34,18 @@ %% kvsetkeys-example.tex, kvsetkeys-test1.tex, %% kvsetkeys-test2.tex, kvsetkeys-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@kvsetkeys.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% - [2010/03/01 v1.9 Key value parser (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/04/07 v1.13 Key value parser (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVS@AtEnd{% \KVS@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{36}{3}% $ \TMP@EnsureCode{38}{4}% & @@ -124,14 +139,22 @@ \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{126}{13}% ~ (active) +\edef\KVS@AtEnd{\KVS@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input etexcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{etexcmds}[2010/01/28]% \else \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{etexcmds}[2010/01/28]% @@ -303,12 +326,14 @@ $ \expandafter\endgroup }{% \KVS@Process#1=\KVS@Nil{#3}% }% + \KVS@MaybeBreak \KVS@IfEmpty{#2}{% }{% \KVS@Parse#2\KVS@Nil{#3}% }% } \long\def\KVS@Process#1=#2\KVS@Nil#3{% + \let\KVS@MaybeBreak\relax \def\kv@key{#1}% \KVS@IfEmpty{#2}{% \let\kv@value\relax @@ -326,6 +351,13 @@ $ \endgroup $ \let\kv@value\KVS@Global #3{#1}{#2}% } +\let\KVS@MaybeBreak\relax +\def\KVS@break#1#2#3#4{% + \let\KVS@MaybeBreak\relax +} +\def\kv@break{% + \let\KVS@MaybeBreak\KVS@break +} \def\comma@parse#1{% \comma@normalize{#1}% \expandafter\comma@parse@normalized\expandafter{\comma@list}% @@ -339,12 +371,25 @@ $ \let\kv@value\KVS@Global \def\comma@entry{#1}% #3{#1}% }% + \KVS@MaybeBreak \KVS@IfEmpty{#2}{% }{% \KVS@CommaParse#2\KVS@Nil{#3}% }% } -\long\def\kv@processor@default#1#2#3{% +\def\comma@break{% + \let\KVS@MaybeBreak\KVS@break +} +\def\kv@processor@default#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \edef\KVS@temp{\endgroup + \noexpand\KVS@ProcessorDefault{#1}{#2}% + }% + \KVS@temp +} +\long\def\KVS@ProcessorDefault#1#2#3{% & \unless\ifcsname KV@#1@#2\endcsname $ \begingroup\expandafter\expandafter\expandafter\endgroup $ \expandafter\ifx\csname KV@#1@#2\endcsname\relax @@ -371,11 +416,12 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \fi } -\def\kv@set@family@handler#1{% - \KVS@SetFamilyHandler{#1}\@nil -} -\def\KVS@SetFamilyHandler#1\@nil#{% - \expandafter\def\csname KVS@#1@handler\endcsname##1##2% +\long\def\kv@set@family@handler#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \let\ifincsname\iftrue + \expandafter\endgroup + \expandafter\def\csname KVS@#1@handler\endcsname##1##2{#2}% } \def\kv@error@novalue{% \kv@error@generic{No value specified for}% @@ -388,6 +434,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax #1 key `#3'% }{% The keyval family of the key `#3' is `#2'.\MessageBreak + The setting of the key is ignored because of the error.\MessageBreak \MessageBreak \@ehc }% @@ -395,7 +442,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \long\def\kvsetkeys#1#2{% \kv@parse{#2}{\kv@processor@default{#1}}% } -\KVS@AtEnd +\KVS@AtEnd% \endinput %% %% End of file `kvsetkeys.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty index 6df197f2554..156908c07c2 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2009, 2010 by +%% Copyright (C) 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,16 +31,22 @@ %% This work consists of the main source file ltxcmds.dtx %% and the derived files %% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv, -%% ltxcmds-test1.tex, ltxcmds-test-gobble.tex. +%% ltxcmds-test1.tex, ltxcmds-test-gobble.tex, +%% ltxcmds-test-ifempty.tex, ltxcmds-test-zapspace.tex, +%% ltxcmds-test-ifboxempty.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@ltxcmds.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +54,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +65,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,48 +101,62 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/04/26 v1.7 LaTeX kernel commands for general use (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/03/16 v1.18 LaTeX kernel commands for general use (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname LTXcmds@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\LTXcmds@AtEnd{% \LTXcmds@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{12}% ^ (superscript) (!) \TMP@EnsureCode{124}{12}% | +\edef\LTXcmds@AtEnd{\LTXcmds@AtEnd\noexpand\endinput} \chardef\ltx@zero=0 % \chardef\ltx@one=1 % \chardef\ltx@two=2 % \chardef\ltx@active=13 % \chardef\ltx@cclv=255 % +\def\ltx@minusone{% + -\ltx@one +} \long\def\ltx@gobble#1{} \long\def\ltx@gobbletwo#1#2{} \long\def\ltx@gobblethree#1#2#3{} @@ -143,8 +165,7 @@ \romannumeral \csname ltx@zero% \expandafter\LTXcmds@GobbleNum - \romannumeral\expandafter\ltx@firstofone - \expandafter{\LTXcmds@num#1}000{m\endcsname}% + \romannumeral\LTXcmds@num{#1}000{m\endcsname}% } \def\LTXcmds@GobbleNum#1{% \csname LTXcmds@G#1\LTXcmds@GobbleNum @@ -155,6 +176,13 @@ \long\def\ltx@firstofone#1{#1} \long\def\ltx@firstoftwo#1#2{#1} \long\def\ltx@secondoftwo#1#2{#2} +\long\def\ltx@firstofthree#1#2#3{#1} +\long\def\ltx@secondofthree#1#2#3{#2} +\long\def\ltx@thirdofthree#1#2#3{#3}% +\long\def\ltx@firstoffour#1#2#3#4{#1} +\long\def\ltx@secondoffour#1#2#3#4{#2} +\long\def\ltx@thirdoffour#1#2#3#4{#3}% +\long\def\ltx@fourthoffour#1#2#3#4{#4}% \long\def\ltx@car#1#2\@nil{#1} \long\def\ltx@cdr#1#2\@nil{#2} \long\def\ltx@carzero#1\@nil{}% @@ -170,8 +198,7 @@ \romannumeral \csname LTXcmds@CarNumFinish% \expandafter\LTXcmds@CarNum - \romannumeral\expandafter\ltx@firstofone - \expandafter{\LTXcmds@num#1}000{x\endcsname}% + \romannumeral\LTXcmds@num{#1}000{x\endcsname}% } \def\LTXcmds@CarNum#1{% \csname LTXcmds@C#1\LTXcmds@CarNum @@ -211,6 +238,16 @@ \lowercase{\endgroup \def\ltx@hashchar{0}% } +\begingroup + \lccode`0=`\{\relax +\lowercase{\endgroup + \def\ltx@leftbracechar{0}% +} +\begingroup + \lccode`0=`\}\relax +\lowercase{\endgroup + \def\ltx@rightbracechar{0}% +} \def\ltx@newif#1{% \begingroup \escapechar=-1 % @@ -233,6 +270,29 @@ }% \csname#1false\endcsname } +\def\ltx@newglobalif#1{% + \begingroup + \escapechar=-1 % + \expandafter\endgroup + \expandafter\LTXcmds@newglobalif\string#1\@nil +} +\begingroup + \escapechar=-1 % +\expandafter\endgroup +\expandafter +\def\expandafter\LTXcmds@newglobalif\string\if#1\@nil{% + \expandafter\edef\csname#1true\endcsname{% + \global\let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iftrue + }% + \expandafter\edef\csname#1false\endcsname{% + \global\let + \expandafter\noexpand\csname if#1\endcsname + \noexpand\iffalse + }% + \csname#1false\endcsname +} \def\ltx@LocalExpandAfter{% \begingroup \expandafter\expandafter\expandafter @@ -278,6 +338,12 @@ \def\ltx@StripPrefix{% \expandafter\ltx@RemovePrefix } +\def\ltx@onelevel@sanitize#1{% + \edef#1{% + \expandafter + \ltx@RemovePrefix\meaning#1% + }% +} \def\ltx@clsextension{cls} \def\ltx@pkgextension{sty} \def\ltx@iffileloaded#1{% @@ -322,7 +388,7 @@ \fi } \def\ltx@ifclasslater#1{% - \ltx@ifclasslater{#1.\ltx@clsextension}% + \ltx@iffilelater{#1.\ltx@clsextension}% } \def\ltx@ifpackagelater#1{% \ltx@iffilelater{#1.\ltx@pkgextension}% @@ -350,7 +416,7 @@ \fi }% } -\def\ltx@GlobalAppendToMacro#1#2{% +\long\def\ltx@GlobalAppendToMacro#1#2{% \ifx\ltx@undefined#1% \let#1\ltx@empty \else @@ -363,7 +429,7 @@ \xdef#1{\the\toks0}% \endgroup } -\def\ltx@LocalAppendToMacro#1#2{% +\long\def\ltx@LocalAppendToMacro#1#2{% \global\let\LTXcmds@gtemp#1% \ifx\ltx@undefined\LTXcmds@gtemp \global\let\LTXcmds@gtemp\ltx@empty @@ -447,11 +513,139 @@ \hbox } \ltx@IfUndefined{numexpr}{% - \let\LTXcmds@num\number + \def\LTXcmds@num#1{% + \expandafter\ltx@firstofone\expandafter{% + \number#1% + }% + }% +}{% + \def\LTXcmds@num#1{% + \expandafter\ltx@firstofone\expandafter{% + \the\numexpr#1% + }% + }% +} +\ltx@IfUndefined{detokenize}{% + \def\LTXcmds@temp#1{% + \long\def\ltx@ifempty##1{% + \romannumeral0% + \iffalse{\fi + \expandafter\ltx@gobble\expandafter{% + \expandafter{\string##1}% + \expandafter\ltx@gobble\string + }% + \expandafter\ltx@firstofthree\expandafter + {\iffalse}\fi + \expandafter#1\ltx@secondoftwo + }% + \expandafter#1\ltx@firstoftwo + }% + \long\def\ltx@ifblank##1{% + \romannumeral0% + \iffalse{\fi + \expandafter\expandafter\expandafter\ltx@gobble + \expandafter\expandafter\expandafter{% + \expandafter\expandafter\expandafter{% + \expandafter\string\ltx@gobble##1.% + }% + \expandafter\ltx@gobble\string + }% + \expandafter\ltx@firstofthree\expandafter + {\iffalse}\fi + \expandafter#1\ltx@secondoftwo + }% + \expandafter#1\ltx@firstoftwo + }% + }% + \LTXcmds@temp{ }% +}{% + \long\def\ltx@ifempty#1{% + \romannumeral% + \csname + LTXcmds@ifempty% + \ifcat$\detokenize{#1}$% + @% + \fi + \endcsname + }% + \long\def\LTXcmds@ifempty@#1#2{0 #1}% + \long\def\LTXcmds@ifempty#1#2{0 #2}% + \long\def\ltx@ifblank#1{% + \romannumeral% + \csname + LTXcmds@ifempty% + \ifcat$\detokenize\expandafter{\ltx@gobble#1.}$% + @% + \fi + \endcsname + }% +} +\long\def\ltx@zapspace#1{% + \romannumeral + \LTXcmds@zapspace\ltx@zero#1 \@nil +} +\long\def\LTXcmds@zapspace#1 #2\@nil{% + \ltx@ifempty{#2}{% + #1% + }{% + \LTXcmds@zapspace#1#2\@nil + }% +} +\ltx@IfUndefined{lastnodetype}{% + \catcode`\$=9 % + \catcode`\&=14 % }{% - \let\LTXcmds@num\numexpr + \catcode`\$=14 % + \catcode`\&=9 % } -\LTXcmds@AtEnd +\def\ltx@IfBoxEmpty#1{% + \ifvoid#1\relax + \expandafter\ltx@secondoftwo + \else +& \begingroup +& \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +& \ifhmode\unhcopy\else\unvcopy\fi#1\relax +& \expandafter +& }% +& \expandafter\endgroup +& \ifnum\lastnodetype<\ltx@zero +& \expandafter\expandafter\expandafter\ltx@firstoftwo +& \else +& \expandafter\expandafter\expandafter\ltx@secondoftwo +& \fi +$ \begingroup +$ \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +$ \penalty\ltx@one +$ \ifhmode\unhcopy\else\unvcopy\fi#1\relax +$ \expandafter +$ }% +$ \ifnum\lastpenalty=\ltx@one +$ \endgroup +$ \begingroup +$ \setbox\ltx@zero=\ifhbox#1\hbox\else\vbox\fi{% +$ \penalty\ltx@two +$ \ifhmode\unhcopy\else\unvcopy\fi#1\relax +$ \expandafter +$ }% +$ \ifnum\lastpenalty=\ltx@two +$ \def\next{\endgroup\expandafter\ltx@firstoftwo}% +$ \else +$ \def\next{\endgroup\expandafter\ltx@secondoftwo}% +$ \fi +$ \else +$ \def\next{\endgroup\expandafter\ltx@secondoftwo}% +$ \fi +$ \next + \fi +} +\def\ltx@IfBoxVoidOrEmpty#1{% + \ifvoid#1\relax + \expandafter\ltx@thirdoffour + \fi + \ltx@IfBoxEmpty{#1}% +} +\LTXcmds@AtEnd% + \endinput %% %% End of file `ltxcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty index 037053d65f1..9beee8df1c8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty @@ -34,14 +34,18 @@ %% luatex-test1.tex, luatex-test2.tex, luatex-test3.tex, %% luatex-test4.tex, luatex-test5.tex, oberdiek.luatex.lua. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@luatex-loader.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,19 +100,22 @@ \fi \expandafter\x\csname ver@luatex-loader.sty\endcsname \ProvidesPackage{luatex-loader}% - [2010/03/09 v0.4 Lua module loader (HO)] -\begingroup - \catcode10 12 % ^^J - \catcode34 12 % " - \catcode39 12 % ' - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode46 12 % . - \catcode60 12 % < - \catcode61 12 % = - \catcode95 12 % _ (other!) - \catcode96 12 % ` + [2010/03/09 v0.4 Lua module loader (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5\endlinechar=13\relax% + \catcode10=12 % ^^J + \catcode34=12 % " + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode46=12 % . + \catcode60=12 % < + \catcode61=12 % = + \catcode95=12 % _ (other!) + \catcode96=12 % ` + \catcode123=1 % { + \catcode125=2 % } \endlinechar=10 % \ifnum\luatexversion<36 % \directlua0% @@ -125,7 +134,7 @@ end end }% -\endgroup% +\endgroup\endinput% \endinput %% %% End of file `luatex-loader.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty index 8e81486371c..e71c21781f6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty @@ -34,14 +34,18 @@ %% luatex-test1.tex, luatex-test2.tex, luatex-test3.tex, %% luatex-test4.tex, luatex-test5.tex, oberdiek.luatex.lua. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@luatex.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@luatex.sty\endcsname \ProvidesPackage{luatex}% - [2010/03/09 v0.4 LuaTeX basic definition package (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/09 v0.4 LuaTeX basic definition package (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname LuT@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\LuT@AtEnd{% \LuT@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{34}{12}% " @@ -131,10 +146,12 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{95}{12}% _ (other!) \TMP@EnsureCode{96}{12}% ` +\edef\LuT@AtEnd{\LuT@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax @@ -148,9 +165,8 @@ \@PackageError{luatex}{% This package may only be run using LuaTeX% }\@ehc - \LuT@AtEnd - \expandafter\endinput -\fi + \expandafter\LuT@AtEnd +\fi% \ifnum\luatexversion<36 % \def\LuT@MakePrimitive#1{% \expandafter\let\csname luatex#1\expandafter\endcsname @@ -489,7 +505,7 @@ \else \RequirePackage{luatex-loader}[2010/03/09]% \fi -\LuT@AtEnd +\LuT@AtEnd% \endinput %% %% End of file `luatex.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty index 0d58d65afb8..26d896a03b7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/magicnum.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2009, 2010 by +%% Copyright (C) 2007, 2009, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -32,16 +32,20 @@ %% and the derived files %% magicnum.sty, magicnum.pdf, magicnum.ins, magicnum.drv, magicnum.txt, %% magicnum-test1.tex, magicnum-test2.tex, magicnum-test3.tex, -%% magicnum.lua, oberdiek.magicnum.lua. +%% magicnum-test4.tex, magicnum.lua, oberdiek.magicnum.lua. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@magicnum.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,31 +100,41 @@ \fi \expandafter\x\csname ver@magicnum.sty\endcsname \ProvidesPackage{magicnum}% - [2010/03/09 v1.2 Magic numbers (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/04/10 v1.4 Magic numbers (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname magicnum@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\magicnum@AtEnd{% \magicnum@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) \TMP@EnsureCode{42}{12}% * @@ -126,14 +142,18 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\magicnum@AtEnd{\magicnum@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newcommand\endcsname\relax \expandafter\ifx\csname magicnum\endcsname\relax \else \input infwarerr.sty\relax - \@PackageErrorNoLine{magicnum}{% + \@PackageError{magicnum}{% \string\magicnum\space is already defined% }\@ehc \fi @@ -166,26 +186,63 @@ \else \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input luatex.sty\relax + \input ifluatex.sty\relax + \input infwarerr.sty\relax \else - \RequirePackage{luatex}[2010/03/09]% + \RequirePackage{ifluatex}[2010/03/01]% + \RequirePackage{infwarerr}[2010/04/08]% \fi \ifnum\luatexversion<36 % \def\magicnum@directlua{\directlua0 }% \else \let\magicnum@directlua\directlua \fi + \magicnum@directlua{% + require("oberdiek.magicnum")% + }% + \begingroup + \def\x{2011/04/10 v1.4}% + \def\StripPrefix#1>{}% + \edef\x{\expandafter\StripPrefix\meaning\x}% + \edef\y{% + \magicnum@directlua{% + if oberdiek.magicnum.getversion then % + oberdiek.magicnum.getversion()% + end% + }% + }% + \ifx\x\y + \else + \@PackageError{magicnum}{% + Wrong version of lua module.\MessageBreak + Package version: \x\MessageBreak + Lua module: \y + }\@ehc + \fi + \endgroup + \begingroup + \expandafter\ifx\csname luaescapestring\endcsname\relax + \directlua{% + if tex.enableprimitives then % + tex.enableprimitives('magicnum@', {'luaescapestring'})% + end% + }% + \global\let\luaescapestring\magicnum@luaescapestring + \fi + \expandafter\ifx\csname luaescapestring\endcsname\relax + \escapechar=92 % + \@PackageError{magicnum}{% + Missing \string\luaescapestring + }\@ehc + \fi + \endgroup \def\magicnum#1{% \magicnum@directlua{% - require("oberdiek.magicnum")% - oberdiek.magicnum.get(% - "\luatexluaescapestring{#1}",\number\CatcodeTableString - )% + oberdiek.magicnum.get("\luaescapestring{#1}")% }% }% - \magicnum@AtEnd - \expandafter\endinput -\fi + \expandafter\magicnum@AtEnd +\fi% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname detokenize\endcsname\relax \def\magicnum@add#1#2#3{% @@ -294,7 +351,7 @@ \magicnum@add{luatex.pdfliteral.mode}{setorigin}{0} \magicnum@add{luatex.pdfliteral.mode}{page}{1} \magicnum@add{luatex.pdfliteral.mode}{direct}{2} -\magicnum@AtEnd +\magicnum@AtEnd% \endinput %% %% End of file `magicnum.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty b/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty new file mode 100644 index 00000000000..12c538ad9d9 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/mleftright.sty @@ -0,0 +1,274 @@ +%% +%% This is file `mleftright.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% mleftright.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file mleftright.dtx +%% and the derived files +%% mleftright.sty, mleftright.pdf, mleftright.ins, mleftright.drv, +%% mleftright-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@mleftright.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{mleftright}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@mleftright.sty\endcsname +\ProvidesPackage{mleftright}% + [2010/09/25 v1.0 Usual delimiter spacing with left and right (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname mleftright@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\mleftright@AtEnd{% + \mleftright@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{38}{4}% & +\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{60}{12}% < +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\mleftright@AtEnd{% + \mleftright@AtEnd + \escapechar\the\escapechar\relax + \noexpand\endinput +} +\escapechar=92 % +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax + \input ltxcmds.sty\relax +\else + \RequirePackage{infwarerr}[2010/04/08]% + \RequirePackage{ltxcmds}[2010/04/26]% +\fi +\let\mleftright@OrgLeft\left +\let\mleftright@OrgRight\right +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\mleftright@Def{\def}% + }{% + \def\mleftright@Def{\DeclareRobustCommand*}% + }% +}{% + \def\mleftright@Def{\protected\def}% +} +\edef\mleftright@Def#1{% + \noexpand\ltx@IfUndefined{% + \noexpand\expandafter\noexpand\ltx@gobble\noexpand\string#1% + }{% + \expandafter\noexpand\mleftright@Def#1% + }{% + \noexpand\@PackageError{mleftright}{% + Command \noexpand\string#1 already defined% + }\noexpand\@ehd + \noexpand\ltx@gobble + }% +} +\ltx@IfUndefined{currentgrouplevel}{% + \catcode38=14 % & = comment +}{% + \catcode38=9 % & = ignore_ +} +& \def\mleftright@GroupLevel{-1}% +& \def\mleftright@WrongGroup#1(#2){% +& \ifnum\mleftright@GroupLevel<\ltx@zero +& \@PackageError{mleftright}{% +& Missing previous \string\mleft +& }\@ehc +& \else +& \@PackageError{mleftright}{% +& Unexpected group status for \string\mright% +& \ifnum\mleftright@GroupLevel=#1 % +& \else +& .\MessageBreak +& Group level is #1, % +& expected is \mleftright@GroupLevel +& \fi +& \ifnum16=#2 % +& \else +& .\MessageBreak +& Group type is #2 (% +& \ifcase#2 % +& bottom level% +& \expandafter\expandafter\expandafter\ltx@gobblefour +& \expandafter\ltx@gobbletwo +& \or simple% +& \or hbox% +& \or adjusted hbox% +& \or vbox% +& \or vtop% +& \or align% +& \or no align% +& \or output% +& \or math% +& \or disc% +& \or insert% +& \or vcenter% +& \or math choice% +& \or semi simple% +& \or math shift% +& \or math left% +& \else +& unknown% +& \fi +& \space group),\MessageBreak +& expected is 16 (math left group)% +& \fi +& }\@ehd +& \fi +& }% +\mleftright@Def\mleft{% + \mathopen{}\mathclose\bgroup +& \edef\mleftright@GroupLevel{\the\numexpr\the\currentgrouplevel+1}% + \mleftright@OrgLeft +} +\mleftright@Def\mright{% +& \ifnum\mleftright@GroupLevel=\currentgrouplevel +& \ifnum16=\currentgrouptype + \aftergroup\egroup +& \else +& \expandafter\mleftright@WrongGroup +& \the\expandafter\currentgrouplevel +& \expandafter(\the\currentgrouptype)% +& \fi +& \else +& \expandafter\mleftright@WrongGroup +& \the\expandafter\currentgrouplevel +& \expandafter(\the\currentgrouptype)% +& \fi + \mleftright@OrgRight +} +\mleftright@Def\mleftright{% + \let\left\mleft + \let\right\mright +} +\mleftright@Def\mleftrightrestore{% + \ifx\left\mleft + \let\left\mleftright@OrgLeft + \fi + \ifx\right\mright + \let\right\mleftright@OrgRight + \fi +} +\mleftright@AtEnd% +\endinput +%% +%% End of file `mleftright.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index 80cf713ad9c..9c585d5a4e5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty @@ -33,14 +33,18 @@ %% pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv, pdfcol-test1.tex, %% pdfcol-test2.tex, pdfcol-test3.tex, pdfcol-test4.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@pdfcol.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% - [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2007/12/12 v1.2 Maintaining additional color stacks for pdfTeX (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\PDFCOL@AtEnd{% \PDFCOL@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -124,8 +139,10 @@ \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\PDFCOL@AtEnd{\PDFCOL@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\PDFCOL@RequirePackage#1[#2]{\input #1.sty\relax}% @@ -304,7 +321,7 @@ \PDFCOL@Disabled }% \fi -\PDFCOL@AtEnd +\PDFCOL@AtEnd% \endinput %% %% End of file `pdfcol.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index fbad931ec12..964577f21dd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2010 by +%% Copyright (C) 2007, 2010, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -33,16 +33,20 @@ %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, %% pdfescape-test3.tex, pdfescape-test4.tex, -%% pdfescape-test5.tex. +%% pdfescape-test5.tex, pdfescape-test6.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -50,7 +54,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -62,21 +65,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -95,29 +101,38 @@ \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2010/03/01 v1.9 Provides hex, PDF name and string conversions (HO)] -\begingroup + [2011/04/04 v1.12 Provides string conversions (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % \catcode123 1 % { \catcode125 2 % } + \catcode64 11 % \def\x{\endgroup \expandafter\edef\csname PE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2#3{% \edef\PE@AtEnd{% \PE@AtEnd - #1#2 \the#1#2\relax + #1#2=\the#1#2\relax }% - #1#2 #3\relax + #1#2=#3\relax } \TMP@EnsureCode\catcode{0}{12}% ^^@ \TMP@EnsureCode\catcode{34}{12}% " @@ -127,13 +142,27 @@ \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}% > +\TMP@EnsureCode\catcode{91}{12}% [ +\TMP@EnsureCode\catcode{93}{12}% ] \TMP@EnsureCode\catcode{94}{7}% ^ \TMP@EnsureCode\catcode{96}{12}% ` \TMP@EnsureCode\uccode{34}{0}% " \TMP@EnsureCode\uccode{48}{0}% 0 \TMP@EnsureCode\uccode{61}{0}% = +\edef\PE@AtEnd{\PE@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/04/08]% +\else + \RequirePackage{ltxcmds}[2010/04/08]% +\fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname detokenize\endcsname\relax \long\def\EdefSanitize#1#2{% @@ -180,12 +209,11 @@ \ifx\\#2\\% \else \PE@space@other - \@ReturnAfterFi{% + \ltx@ReturnAfterFi{% \PE@SpaceToOther#2\relax }% \fi } -\long\def\@ReturnAfterFi#1\fi{\fi#1} \def\EdefUnescapeName#1#2{% \EdefSanitize#1{#2}% \PE@SanitizeSpaceOther#1% @@ -219,18 +247,18 @@ }% \ifcase\ifcase\expandafter\PE@TestUcHexDigit\PE@testA \ifcase\expandafter\PE@TestUcHexDigit\PE@testB - \z@ + \ltx@zero \else - \@ne + \ltx@one \fi \else - \@ne + \ltx@one \fi - \uccode\z@="\PE@testA\PE@testB\relax + \uccode\ltx@zero="\PE@testA\PE@testB\relax \uppercase{% \def\PE@temp{^^@}% }% - \uccode\z@=\z@ + \uccode\ltx@zero=\ltx@zero \edef\PE@result{\PE@result$1\PE@temp}% \let\PE@next\PE@DeName \else @@ -250,38 +278,38 @@ \uccode`d=`D\relax \uccode`e=`E\relax \uccode`f=`F\relax - \uccode`A=\z@ - \uccode`B=\z@ - \uccode`C=\z@ - \uccode`D=\z@ - \uccode`E=\z@ - \uccode`F=\z@ - \uccode`0=\z@ - \uccode`1=\z@ - \uccode`2=\z@ - \uccode`3=\z@ - \uccode`4=\z@ - \uccode`5=\z@ - \uccode`6=\z@ - \uccode`7=\z@ - \uccode`8=\z@ - \uccode`9=\z@ + \uccode`A=\ltx@zero + \uccode`B=\ltx@zero + \uccode`C=\ltx@zero + \uccode`D=\ltx@zero + \uccode`E=\ltx@zero + \uccode`F=\ltx@zero + \uccode`0=\ltx@zero + \uccode`1=\ltx@zero + \uccode`2=\ltx@zero + \uccode`3=\ltx@zero + \uccode`4=\ltx@zero + \uccode`5=\ltx@zero + \uccode`6=\ltx@zero + \uccode`7=\ltx@zero + \uccode`8=\ltx@zero + \uccode`9=\ltx@zero } \def\PE@TestUcHexDigit#1{% \ifnum`#1<48 % 0 - \@ne + \ltx@one \else \ifnum`#1>70 % F - \@ne + \ltx@one \else \ifnum`#1>57 % 9 \ifnum`#1<65 % A - \@ne + \ltx@one \else - \z@ + \ltx@zero \fi \else - \z@ + \ltx@zero \fi \fi \fi @@ -336,19 +364,19 @@ |let|PE@next|relax |else |if n#2% - |uccode|z@=10 % + |uccode|ltx@zero=10 % |else|if r#2% - |uccode|z@=13 % + |uccode|ltx@zero=13 % |else|if t#2% - |uccode|z@=9 % + |uccode|ltx@zero=9 % |else|if b#2% - |uccode|z@=8 % + |uccode|ltx@zero=8 % |else|if f#2% - |uccode|z@=12 % + |uccode|ltx@zero=12 % |else - |uccode|z@=|z@ + |uccode|ltx@zero=|ltx@zero |fi|fi|fi|fi|fi - |ifnum|uccode|z@>|z@ + |ifnum|uccode|ltx@zero>|ltx@zero |uppercase{% |edef|PE@temp{^^@}% }% @@ -386,12 +414,12 @@ |endgroup \def\PE@TestOctDigit#1{% \ifnum`#1<48 % 0 - \@ne + \ltx@one \else \ifnum`#1>55 % 7 - \@ne + \ltx@one \else - \z@ + \ltx@zero \fi \fi } @@ -412,7 +440,7 @@ \PE@next } \def\PE@OctAll#1{% - \uccode\z@='#1\relax + \uccode\ltx@zero='#1\relax \uppercase{% \edef\PE@result{\PE@result^^@}% }% @@ -420,7 +448,13 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input pdftexcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{pdftexcmds}[2007/11/11]% \else \RequirePackage{pdftexcmds}[2007/11/11]% \fi @@ -465,9 +499,8 @@ \long\def\EdefEscapeString#1#2{% \PE@edefbabel#1\pdf@escapestring{#2}% }% - \PE@AtEnd - \expandafter\endinput -\fi + \expandafter\PE@AtEnd +\fi% \edef\PE@hash{\string#} \begingroup \escapechar=-1 % @@ -475,7 +508,7 @@ \def\noexpand\PE@backslash{\string\\}% } \x -\newif\ifPE@etex +\ltx@newif\ifPE@etex \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \else @@ -588,8 +621,8 @@ }% \ifcase\expandafter\PE@TestUcHexDigit\PE@testA \ifcase\expandafter\PE@TestUcHexDigit\PE@testB - \uccode\z@="\PE@testA\PE@testB\relax - \ifnum\uccode\z@=32 % + \uccode\ltx@zero="\PE@testA\PE@testB\relax + \ifnum\uccode\ltx@zero=32 % \let\PE@temp\PE@space@space \else \uppercase{% @@ -710,7 +743,7 @@ }% }% \fi -\PE@AtEnd +\PE@AtEnd% \endinput %% %% End of file `pdfescape.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty index 5a08be1b342..7bd44064569 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfrender.sty @@ -35,14 +35,18 @@ %% pdfrender-test3.tex, pdfrender-test4.tex, %% pdfrender-test5.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@pdfrender.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -50,7 +54,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -62,21 +65,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -95,29 +101,38 @@ \fi \expandafter\x\csname ver@pdfrender.sty\endcsname \ProvidesPackage{pdfrender}% - [2010/01/28 v1.2 Access to some PDF graphics parameters (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/01/28 v1.2 Access to some PDF graphics parameters (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname PdfRender@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\PdfRender@AtEnd{% \PdfRender@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{36}{3}% $ @@ -133,7 +148,6 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ @@ -214,7 +228,7 @@ \newcommand{\textpdfrender}[2]{#2}% }% \expandafter\PdfRender@AtEnd -\fi +\fi% \ltx@ifpackageloaded{color}{}{% \def\color@setgroup{\begingroup\set@color}% \let\color@begingroup\begingroup @@ -294,7 +308,6 @@ }{% \AfterEndPreamble{\PdfRender@PatchColor}% }% - \PdfRender@RequirePackage{kvsetkeys}[2010/01/28] \def\PdfRender@texorpdfstring{% \ltx@IfUndefined{texorpdfstring}\ltx@firstoftwo\texorpdfstring @@ -739,7 +752,7 @@ } \ifPdfRender@Match \expandafter\PdfRender@AtEnd -\fi +\fi% \def\PdfRender@FindOp#1#2{% \def\PdfRender@temp##1 #1 ##2\@nil{% ##1% @@ -770,7 +783,7 @@ \expandafter\PdfRender@@FilterOp\expandafter#1\expandafter#2% \fi } -\PdfRender@AtEnd +\PdfRender@AtEnd% \endinput %% %% End of file `pdfrender.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 2f9f7a582dd..76c56299899 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2009, 2010 by +%% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -32,16 +32,21 @@ %% and the derived files %% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv, %% pdftexcmds-test1.tex, pdftexcmds-test2.tex, +%% pdftexcmds-test-shell.tex, pdftexcmds-test-escape.tex, %% oberdiek.pdftexcmds.lua, pdftexcmds.lua. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +54,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +65,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,33 +101,46 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2010/04/01 v0.9 Utility functions of pdfTeX for LuaTeX (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/04/10 v0.14 Utilities of pdfTeX for LuaTeX (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\pdftexcmds@AtEnd{% \pdftexcmds@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{0}{12}% +\TMP@EnsureCode{1}{12}% +\TMP@EnsureCode{2}{12}% \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{38}{4}% & \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -132,8 +152,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{95}{12}% _ (other) \TMP@EnsureCode{96}{12}% ` @@ -141,17 +162,26 @@ \edef\pdftexcmds@AtEnd{% \pdftexcmds@AtEnd \escapechar=\number\escapechar\relax + \noexpand\endinput } \escapechar=92 % \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input infwarerr.sty\relax - \input ifluatex.sty\relax - \input ltxcmds.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{infwarerr}[2007/09/09]% + \TMP@RequirePackage{ifluatex}[2010/03/01]% + \TMP@RequirePackage{ltxcmds}[2010/12/02]% + \TMP@RequirePackage{ifpdf}[2010/09/13]% \else \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{ifluatex}[2010/03/01]% - \RequirePackage{ltxcmds}[2009/12/12]% + \RequirePackage{ltxcmds}[2010/12/02]% + \RequirePackage{ifpdf}[2010/09/13]% \fi \ifluatex \else @@ -229,7 +259,10 @@ \endlinechar=\newlinechar \pdftexcmds@directlua{% if tex.enableprimitives then - tex.enableprimitives('pdf@', {'primitive', 'ifprimitive'}) + tex.enableprimitives( + 'pdf@', + {'primitive', 'ifprimitive', 'pdfdraftmode'} + ) tex.enableprimitives('', {'luaescapestring'}) end }% @@ -364,24 +397,146 @@ \ifluatex \else \pdf@isprimitive - \pdftexcmds@AtEnd - \expandafter\endinput \fi +\let\pdftexcmds@temp\ltx@zero % +\ltx@IfUndefined{pdfdraftmode}{% + \@PackageInfoNoLine{pdftexcmds}{\ltx@backslashchar pdfdraftmode not found}% +}{% + \ifpdf + \let\pdftexcmds@temp\ltx@one + \@PackageInfoNoLine{pdftexcmds}{\ltx@backslashchar pdfdraftmode found}% + \else + \@PackageInfoNoLine{pdftexcmds}{% + \ltx@backslashchar pdfdraftmode is ignored in DVI mode% + }% + \fi +} +\ifcase\pdftexcmds@temp + \let\pdf@draftmode\ltx@zero + \let\pdf@ifdraftmode\ltx@secondoftwo + \def\pdftexcmds@setdraftmode#1{}% +\else + \let\pdftexcmds@draftmode\pdfdraftmode + \def\pdf@ifdraftmode{% + \ifnum\pdftexcmds@draftmode=\ltx@one + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }% + \def\pdf@draftmode{% + \ifnum\pdftexcmds@draftmode=\ltx@one + \expandafter\ltx@one + \else + \expandafter\ltx@zero + \fi + }% + \def\pdftexcmds@setdraftmode#1{% + \pdftexcmds@draftmode=#1\relax + }% +\fi +\def\pdf@setdraftmode#1{% + \begingroup + \count\ltx@cclv=#1\relax + \edef\x{\endgroup + \noexpand\pdftexcmds@@setdraftmode{\the\count\ltx@cclv}% + }% + \x +} +\def\pdftexcmds@@setdraftmode#1{% + \ifcase#1 % + \pdftexcmds@setdraftmode{#1}% + \or + \pdftexcmds@setdraftmode{#1}% + \else + \@PackageWarning{pdftexcmds}{% + \string\pdf@setdraftmode: Ignoring\MessageBreak + invalid value `#1'% + }% + \fi +} +\ifluatex +\else + \expandafter\pdftexcmds@AtEnd +\fi% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input luatex-loader.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{luatex-loader}[2009/04/10]% \else \RequirePackage{luatex-loader}[2009/04/10]% \fi \pdftexcmds@directlua{% require("oberdiek.pdftexcmds")% } +\begingroup + \def\x{2011/04/10 v0.14}% + \ltx@onelevel@sanitize\x + \edef\y{% + \pdftexcmds@directlua{% + if oberdiek.pdftexcmds.getversion then % + oberdiek.pdftexcmds.getversion()% + end% + }% + }% + \ifx\x\y + \else + \@PackageError{pdftexcmds}{% + Wrong version of lua module.\MessageBreak + Package version: \x\MessageBreak + Lua module: \y + }\@ehc + \fi +\endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname newtoks\endcsname\relax \toksdef\pdftexcmds@toks=0 % \else \csname newtoks\endcsname\pdftexcmds@toks \fi +\def\pdftexcmds@Patch{0} + +\ifnum\luatexversion>40 % + \ifnum\luatexversion<66 % + \def\pdftexcmds@Patch{1}% + \fi +\fi +\ifcase\pdftexcmds@Patch + \catcode`\&=14 % +\else + \catcode`\&=9 % + \def\pdftexcmds@PatchDecode#1\@nil{% + \pdftexcmds@DecodeA#1^^A^^A\@nil{}% + }% + \def\pdftexcmds@DecodeA#1^^A^^A#2\@nil#3{% + \ifx\relax#2\relax + \ltx@ReturnAfterElseFi{% + \pdftexcmds@DecodeB#3#1^^A^^B\@nil{}% + }% + \else + \ltx@ReturnAfterFi{% + \pdftexcmds@DecodeA#2\@nil{#3#1^^@}% + }% + \fi + }% + \def\pdftexcmds@DecodeB#1^^A^^B#2\@nil#3{% + \ifx\relax#2\relax% + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3#1% + }% + \else + \ltx@ReturnAfterFi{% + \pdftexcmds@DecodeB#2\@nil{#3#1^^A}% + }% + \fi + }% +\fi \ifnum\luatexversion<36 % \else \catcode`\0=9 % @@ -404,18 +559,22 @@ }% }% \def\pdf@unescapehex#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode \the\expandafter\pdftexcmds@toks \directlua0{% oberdiek.pdftexcmds.toks="pdftexcmds@toks"% - oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}", "byte")% + oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}", "byte", \pdftexcmds@Patch)% }% +& \@nil }% \def\pdf@unescapehexnative#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode \the\expandafter\pdftexcmds@toks \directlua0{% oberdiek.pdftexcmds.toks="pdftexcmds@toks"% - oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}")% + oberdiek.pdftexcmds.unescapehex("\luaescapestring{#1}", \pdftexcmds@Patch)% }% +& \@nil }% \long\def\pdf@escapestring#1{% \directlua0{% @@ -493,14 +652,16 @@ }% =1 % \def\pdf@pipe#1{% +& \romannumeral\expandafter\pdftexcmds@PatchDecode \the\expandafter\pdftexcmds@toks \pdftexcmds@directlua{% oberdiek.pdftexcmds.toks="pdftexcmds@toks"% - oberdiek.pdftexcmds.pipe("\luaescapestring{#1}")% + oberdiek.pdftexcmds.pipe("\luaescapestring{#1}", \pdftexcmds@Patch)% }% +& \@nil }% \fi -\pdftexcmds@AtEnd +\pdftexcmds@AtEnd% \endinput %% %% End of file `pdftexcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty b/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty new file mode 100644 index 00000000000..45359d0754e --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/protecteddef.sty @@ -0,0 +1,267 @@ +%% +%% This is file `protecteddef.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% protecteddef.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file protecteddef.dtx +%% and the derived files +%% protecteddef.sty, protecteddef.pdf, protecteddef.ins, protecteddef.drv, +%% protecteddef-test1.tex, protecteddef-test2.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@protecteddef.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{protecteddef}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@protecteddef.sty\endcsname +\ProvidesPackage{protecteddef}% + [2011/01/31 v1.0 Definition of protected macros (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname ProDef@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ProDef@AtEnd{% + \ProDef@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\ProDef@AtEnd{\ProDef@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% +\else + \let\TMP@RequirePackage\RequirePackage +\fi +\TMP@RequirePackage{ltxcmds}[2010/12/12]% +\TMP@RequirePackage{infwarerr}[2010/04/08]% +\def\ProDef@temp#1{% + \expandafter\def\csname ProDef@param[#1]\endcsname % hash-ok +} +\expandafter\def\csname ProDef@param\endcsname{} +\ProDef@temp0{} +\ProDef@temp1{##1} +\ProDef@temp2{##1##2} +\ProDef@temp3{##1##2##3} +\ProDef@temp4{##1##2##3##4} +\ProDef@temp5{##1##2##3##4##5} +\ProDef@temp6{##1##2##3##4##5##6} +\ProDef@temp7{##1##2##3##4##5##7} +\ProDef@temp8{##1##2##3##4##5##7##8} +\ProDef@temp9{##1##2##3##4##5##7##8##9} +\ltx@IfUndefined{@ifdefinable}{% + \long\def\ProDef@IfDefinable#1{% + \begingroup + \escapechar=-1 % + \ltx@ifundefined{\string#1}{% + \endgroup + \ltx@firstofone + }{% + \expandafter\endgroup + \expandafter + \edef\expandafter\ProDef@temp\expandafter{\string#1 }% + \@PackageError{protecteddef}{% + Command \ltx@backslashchar\ProDef@temp already defined% + }\@ehc + \ltx@gobbletwo + }% + }% +}{% + \long\def\ProDef@IfDefinable#1{% + \let\ProDef@next\ltx@gobbletwo + \@ifdefinable{#1}{% + \let\ProDef@next\ltx@firstofone + }% + \ProDef@next + }% +} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname DeclareRobustCommand\endcsname\relax + \catcode`\&=14 % comment + \else + \newcommand*{\ProtectedDef}{% + \ltx@ifnextchar*{% + \ProDef@ProtectedDef + }{% + \ProDef@ProtectedDef{}% + }% + }% + \long\def\ProDef@ProtectedDef#1#2#3#{% + \ProDef@IfDefinable{#2}{% + \ltx@IfUndefined{ProDef@param#3}{% + \DeclareRobustCommand*{#2}{}% + \begingroup + \escapechar=-1 % + \def\ProDef@temp{#1}% + \edef\x{\endgroup + \ifx\ProDef@temp\ltx@empty + \noexpand\long + \fi + \noexpand\def + \expandafter\noexpand\csname\string#2 \endcsname + }% + \x#3% + }{% + \DeclareRobustCommand#1{#2}#3% + }% + }% + }% + \expandafter\expandafter\expandafter\ProDef@AtEnd + \fi +\else + \catcode`\&=9 % ignore +\fi% +\ProDef@IfDefinable\ProtectedDef{% +& \protected + \def\ProtectedDef% +}{% + \ltx@ifnextchar*{% + \let\ProDef@long\ltx@empty + \expandafter\ProDef@ProtectedDef\ltx@gobble + }{% + \let\ProDef@long\long + \ProDef@ProtectedDef + }% +} +\long\def\ProDef@ProtectedDef#1#2#{% + \ProDef@IfDefinable{#1}{% + \ltx@IfUndefined{ProDef@param#2}{% +& \protected + \ProDef@long + \def#1#2% + }{% +& \protected + \ProDef@long + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter#1% + \csname ProDef@param#2\endcsname + }% + }% +} +\ProDef@AtEnd% +\endinput +%% +%% End of file `protecteddef.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty b/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty new file mode 100644 index 00000000000..f8e2a409bcf --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/rotchiffre.sty @@ -0,0 +1,314 @@ +%% +%% This is file `rotchiffre.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% rotchiffre.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file rotchiffre.dtx +%% and the derived files +%% rotchiffre.sty, rotchiffre.pdf, rotchiffre.ins, rotchiffre.drv, +%% rotchiffre-test1.tex, rotchiffre-test2.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@rotchiffre.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{rotchiffre}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@rotchiffre.sty\endcsname +\ProvidesPackage{rotchiffre}% + [2010/11/12 v1.0 Provides ROT13, ROT5, ROT18, ROT47 (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname RotCh@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\RotCh@AtEnd{% + \RotCh@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\RotCh@AtEnd{\RotCh@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax + \input ltxcmds.sty\relax + \input pdfescape.sty\relax +\else + \RequirePackage{infwarerr}[2010/04/08]% + \RequirePackage{ltxcmds}[2010/03/01]% + \RequirePackage{pdfescape}[2010/03/01]% +\fi +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\RotCh@temp{\def\EdefRot##1}% + }{% + \def\RotCh@temp{\DeclareRobustCommand*\EdefRot[1]}% + }% +}{% + \def\RotCh@temp{\protected\def\EdefRot##1}% +} +\RotCh@temp{% + \RotCh@GetNumber{#1}% + \ltx@IfUndefined{RotCh@rot@\romannumeral\RotCh@number}{% + \@PackageError{rotchiffre}{% + Unknown chiffre ROT\RotCh@number + }\@ehc + \EdefSanitize + }{% + \RotCh@rot + }% +} +\ltx@IfUndefined{numexpr}{% + \def\RotCh@GetNumber#1{% + \edef\RotCh@number{\number#1}% + }% +}{% + \def\RotCh@GetNumber#1{% + \edef\RotCh@number{\the\numexpr#1\relax}% + }% +} +\countdef\RotCh@count=255 % +\countdef\RotCh@count@end=2 % +\def\RotCh@RangeIgnore{% + \RotCh@loop{% + \lccode\RotCh@count=\ltx@zero + }% +} +\ltx@IfUndefined{numexpr}{% + \countdef\RotCh@count@temp=4 % + \def\RotCh@RangeSet#1{% + \RotCh@loop{% + \RotCh@count@temp=\RotCh@count + \advance\RotCh@count@temp #1 % + \lccode\RotCh@count=\RotCh@count@temp + }% + }% +}{% + \def\RotCh@RangeSet#1{% + \RotCh@loop{% + \lccode\RotCh@count=\numexpr\RotCh@count#1\relax + }% + }% +} +\def\RotCh@loop#1#2#3{% + \RotCh@count=#2 % + \RotCh@count@end=#3 % + \def\RotCh@action{#1}% + \RotCh@@loop +}% +\def\RotCh@@loop{% + \RotCh@action + \ifnum\RotCh@count<\RotCh@count@end + \advance\RotCh@count\ltx@one + \expandafter\RotCh@@loop + \fi +} +\def\RotCh@rot@xiii{% + \RotCh@RangeIgnore{0}{64}% + \RotCh@RangeSet{+13}{65}{77}% + \RotCh@RangeSet{-13}{78}{90}% + \RotCh@RangeIgnore{91}{96}% + \RotCh@RangeSet{+13}{97}{109}% + \RotCh@RangeSet{-13}{110}{122}% + \RotCh@RangeIgnore{123}{255}% +} +\def\RotCh@rot@v{% + \RotCh@RangeIgnore{0}{47}% + \RotCh@RangeSet{+5}{48}{52}% + \RotCh@RangeSet{-5}{53}{57}% + \RotCh@RangeIgnore{58}{255}% +} +\def\RotCh@rot@xviii{% + \RotCh@RangeIgnore{0}{47}% + \RotCh@RangeSet{+25}{48}{57}% + \RotCh@RangeIgnore{58}{64}% + \RotCh@RangeSet{+18}{65}{72}% + \RotCh@RangeSet{-25}{73}{82}% + \RotCh@RangeSet{-18}{83}{90}% + \RotCh@RangeIgnore{91}{96}% + \RotCh@RangeSet{+13}{97}{109}% + \RotCh@RangeSet{-13}{110}{122}% + \RotCh@RangeIgnore{123}{255}% +} +\def\RotCh@rot@xlvii{% + \RotCh@RangeIgnore{0}{32}% + \RotCh@RangeSet{+47}{33}{79}% + \RotCh@RangeSet{-47}{80}{126}% + \RotCh@RangeIgnore{127}{255}% +} +\begingroup + \catcode0=9 % + \catcode`\^=7 % + \catcode`\^^^=12 % + \def\x{^^^^0000}% +\expandafter\endgroup +\ifx\x\ltx@empty + \toksdef\RotCh@toks=0 % + \long\def\RotCh@rot#1#2{% + \EdefSanitize#1{#2}% + \begingroup + \csname RotCh@rot@\romannumeral\RotCh@number\endcsname + \RotCh@toks={}% + \expandafter\RotCh@SplitSpace#1 \@nil + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{% + \the\RotCh@toks + }% + }% + \def\RotCh@temp#1{% + \def\RotCh@SplitSpace##1 ##2\@nil{% + \RotCh@Add##1\relax + \ifx\relax##2\relax + \expandafter\ltx@gobble + \else + \RotCh@toks\expandafter{\the\RotCh@toks#1}% + \expandafter\ltx@firstofone + \fi + {% + \RotCh@SplitSpace##2\@nil + }% + }% + }% + \RotCh@temp{ }% + \def\RotCh@Add#1{% + \ifx#1\relax + \else + \ifnum`#1>126 % + \RotCh@toks\expandafter{\the\RotCh@toks#1}% + \else + \lowercase{% + \RotCh@toks\expandafter{\the\RotCh@toks#1}% + }% + \fi + \expandafter\RotCh@Add + \fi + }% +\else + \long\def\RotCh@rot#1#2{% + \EdefSanitize#1{#2}% + \begingroup + \csname RotCh@rot@\romannumeral\RotCh@number\endcsname + \lowercase\expandafter{\expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + }% +\fi +\RotCh@AtEnd% +\endinput +%% +%% End of file `rotchiffre.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index d6d96429a2e..5dd72158920 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty @@ -34,14 +34,18 @@ %% setouterhbox-example.tex, setouterhbox-test1.tex, %% setouterhbox-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@setouterhbox.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@setouterhbox.sty\endcsname \ProvidesPackage{setouterhbox}% - [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname setouterhboxAtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\setouterhboxAtEnd{% \setouterhboxAtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -126,9 +141,11 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\setouterhboxAtEnd{\setouterhboxAtEnd\noexpand\endinput} \newbox\setouterhboxBox \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax @@ -280,16 +297,15 @@ E \egroup \expandafter\endgroup \ifx\x\fmtname \else - \setouterhboxAtEnd - \expandafter\endinput -\fi + \expandafter\setouterhboxAtEnd +\fi% \DeclareOption{hyperref}{% \long\def\Hy@setouterhbox#1#2{% \setouterhbox{#1}#2\endsetouterhbox }% } \ProcessOptions\relax -\setouterhboxAtEnd +\setouterhboxAtEnd% \endinput %% %% End of file `setouterhbox.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty index e2ff643737f..5decb21d015 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty @@ -34,14 +34,18 @@ %% soulutf8-test1.tex, soulutf8-test2.tex, soulutf8-test3.tex, %% soulutf8-test4.tex, soulutf8-test5.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@soulutf8.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -49,7 +53,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,21 +64,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -94,29 +100,38 @@ \fi \expandafter\x\csname ver@soulutf8.sty\endcsname \ProvidesPackage{soulutf8}% - [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\SOuL@AtEnd{% \SOuL@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -133,8 +148,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{126}\active % ~ @@ -144,6 +160,7 @@ \TMP@EnsureCode{160}{12}% ^^a0 \TMP@EnsureCode{194}{12}% ^^c2 \TMP@EnsureCode{226}{12}% ^^e2 +\edef\SOuL@AtEnd{\SOuL@AtEnd\noexpand\endinput} \ifx\documentclass\@undefined \expandafter\ifx\csname SOUL@\endcsname\relax \let\SOuL@orgDeclareRobustCommand\DeclareRobustCommand @@ -666,7 +683,7 @@ + \x + \SOUL@scan + }% -\SOuL@AtEnd +\SOuL@AtEnd% \endinput %% %% End of file `soulutf8.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index b7a3d0d1e8d..5c1283c4205 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -45,14 +45,18 @@ %% se-cp865.def, se-cp866.def, se-cp1250.def, se-cp1251.def, %% se-cp1257.def, stringenc-test1.tex, stringenc-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@stringenc.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -60,7 +64,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -72,21 +75,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -105,29 +111,38 @@ \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2010/03/01 v1.8 Converts strings between encodings (HO)] -\begingroup + [2010/03/01 v1.8 Converts strings between encodings (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % \catcode123 1 % { \catcode125 2 % } + \catcode64 11 % \def\x{\endgroup \expandafter\edef\csname SE@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2#3{% \edef\SE@AtEnd{% \SE@AtEnd - #1#2 \the#1#2\relax + #1#2=\the#1#2\relax }% - #1#2 #3\relax + #1#2=#3\relax } \TMP@EnsureCode\catcode{34}{12}% " \TMP@EnsureCode\catcode{36}{3}% $ @@ -143,7 +158,6 @@ \TMP@EnsureCode\catcode{47}{12}% / \TMP@EnsureCode\catcode{58}{12}% : \TMP@EnsureCode\catcode{60}{12}% < -\TMP@EnsureCode\catcode{61}{12}% = \TMP@EnsureCode\catcode{62}{12}% > \TMP@EnsureCode\catcode{91}{12}% [ \TMP@EnsureCode\catcode{93}{12}% ] @@ -152,6 +166,7 @@ \TMP@EnsureCode\uccode{34}{0}% " \TMP@EnsureCode\uccode{48}{0}% 0 \TMP@EnsureCode\uccode{61}{0}% = +\edef\SE@AtEnd{\SE@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax @@ -832,7 +847,7 @@ $ \fi \fi \SE@next } -\SE@AtEnd +\SE@AtEnd% \endinput %% %% End of file `stringenc.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index 347412af51c..b09ec621c9c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -33,14 +33,18 @@ %% telprint.sty, telprint.pdf, telprint.ins, telprint.drv, %% telprint-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@telprint.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +52,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +63,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +99,38 @@ \fi \expandafter\x\csname ver@telprint.sty\endcsname \ProvidesPackage{telprint}% - [2008/08/11 v1.10 Formatting of German phone numbers (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2008/08/11 v1.10 Formatting of German phone numbers (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname TELAtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\TELAtEnd{% \TELAtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{36}{3}% $ @@ -127,8 +142,10 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{126}{13}% ~ (active) +\edef\TELAtEnd{\TELAtEnd\noexpand\endinput} \ifx\DeclareRobustCommand\UnDeFiNeD \def\DeclareRobustCommand*#1[1]{\def#1##1}% \def\TELreset{\let\DeclareRobustCommand=\UnDeFiNeD}% @@ -224,7 +241,7 @@ \TELsplit#1{}\TELsplitEND } \TELreset\let\TELreset=\UnDeFiNeD -\TELAtEnd +\TELAtEnd% \endinput %% %% End of file `telprint.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty b/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty index f7dfab7050b..a2ce3a9079e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/uniquecounter.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2009 by +%% Copyright (C) 2009, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,14 +35,18 @@ %% uniquecounter-test1.tex, uniquecounter-test2.tex, %% uniquecounter-test3.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@uniquecounter.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -50,7 +54,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -62,21 +65,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -95,29 +101,38 @@ \fi \expandafter\x\csname ver@uniquecounter.sty\endcsname \ProvidesPackage{uniquecounter}% - [2009/12/18 v1.1 Provides unlimited unique counter (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2011/01/30 v1.2 Provides unlimited unique counter (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname uqc@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\uqc@AtEnd{% \uqc@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -125,12 +140,20 @@ \TMP@EnsureCode{43}{12}% + \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\uqc@AtEnd{\uqc@AtEnd\noexpand\endinput} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input bigintcalc.sty\relax - \input infwarerr.sty\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{bigintcalc}[2007/11/11]% + \TMP@RequirePackage{infwarerr}[2007/09/09]% \else \RequirePackage{bigintcalc}[2007/11/11]% \RequirePackage{infwarerr}[2007/09/09]% @@ -205,7 +228,7 @@ \fi } \long\def\uqc@Call#1#2{#2{#1}}% -\uqc@AtEnd +\uqc@AtEnd% \endinput %% %% End of file `uniquecounter.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty index 9e71c2bc074..75f8d14ce0b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty @@ -32,28 +32,37 @@ %% accsupp-example1.tex, accsupp-example2.tex, %% accsupp-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ACCSUPP@AtEnd{% \ACCSUPP@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -67,13 +76,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} +\edef\ACCSUPP@AtEnd{\ACCSUPP@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{accsupp}% [2010/01/16 v0.3 Accessibility support by marked content (HO)] @@ -150,21 +158,21 @@ \let\ACCSUPP@driver\ACCSUPP@temp \fi \fi -\fi +\fi% \ifx\ACCSUPP@driver\relax \PackageError{accsupp}{% Missing driver option.\MessageBreak Package loading is aborted% }\@ehc \expandafter\ACCSUPP@AtEnd -\fi +\fi% \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{% \PackageError{accsupp}{% Unsupported driver `\ACCSUPP@driver'.\MessageBreak Package loading is aborted% }\@ehc \ACCSUPP@AtEnd -} +}% \DeclareBoolOption{unicode} \DeclareStringOption[page]{pdfliteral} \DeclareStringOption{Lang} @@ -299,7 +307,7 @@ }% \edef#1{(\ACCSUPP@temp)}% } -\ACCSUPP@AtEnd +\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 b82dfee762f..0f93791fe43 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Copyright (C) 1991-1994 by Pablo A. Straub -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2008 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -44,28 +44,37 @@ %% askinclude-test23.tex, askinclude-test24.tex. %% \NeedsTeXFormat{LaTeX2e} -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AskInc@AtEnd{% \AskInc@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -78,12 +87,12 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` +\edef\AskInc@AtEnd{\AskInc@AtEnd\noexpand\endinput} \ProvidesPackage{askinclude}% [2008/08/11 v2.1 Interactive asking of included files]% \AtBeginDocument{% @@ -191,9 +200,8 @@ }{}% \fi }% - \AskInc@AtEnd - \expandafter\endinput -\fi + \expandafter\AskInc@AtEnd +\fi% \newcommand{\AskInc@OrgIncludeOnly}{}% \let\AskInc@OrgIncludeOnly\includeonly \renewcommand*{\includeonly}[1]{% @@ -674,7 +682,7 @@ \AskInc@Next } \AtBeginDocument{\AskInc@MainQuestion} -\AskInc@AtEnd +\AskInc@AtEnd% \endinput %% %% End of file `askinclude.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def new file mode 100644 index 00000000000..f06fe76d1b3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvipdfmx.def @@ -0,0 +1,212 @@ +%% +%% This is file `atfi-dvipdfmx.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% attachfile2.dtx (with options: `dvipdfmx') +%% +%% This is a generated file. +%% +%% Copyright (C) 2005-2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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 attachfile2.dtx +%% and the derived files +%% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{atfi-dvipdfmx.def}% + [2010/09/27 v2.6 attachfile2 driver for dvipdfmx/XeTeX (HO)]% +\def\atfi@special#1{% + \special{pdf:#1}% +} +\def\atfi@literal#1{% + \atfi@special{content #1}% +} +\def\atfi@GSAVE{q } +\def\atfi@GRESTORE{Q } +\def\atfi@SETLINEWIDTH{w } +\def\atfi@LINETO{l } +\def\atfi@MOVETO{m } +\def\atfi@STROKE{S } +\def\atfi@FILL{f } +\def\atfi@FILLSTROKE#1#2{#1#2B } +\def\atfi@SETRGBCOLORSTROKE{RG } +\def\atfi@SETRGBCOLORFILL{rg } +\def\atfi@SETGRAYSTROKE{G } +\def\atfi@SETGRAYFILL{g } +\def\atfi@SETCMYKCOLORSTROKE{K } +\def\atfi@SETCMYKCOLORFILL{k } +\def\atfi@RECTFILL{re f } +\def\atfi@RECTSTROKEFILL#1#2#3{#1#2#3re B } +\def\atfi@SETMITERLIMIT{M } +\def\atfi@SETFLAT{i } +\def\atfi@SETLINECAP{J } +\def\atfi@CURVETO{c } +\def\atfi@CURVETOV{v } +\def\atfi@CURVETOY{y } +\def\atfi@CLOSEPATH{h } +\def\atfi@SETLINEJOIN{j } +\newcounter{atfi@obj} +\renewcommand*{\theatfi@obj}{% + @atfi_obj_\number\c@atfi@obj +} +\define@key{AtFi@file}{Size}{% + \edef\atfi@params{\atfi@params/Size #1}% +} +\def\atfi@embedfile#1{% + \ltx@IfUndefined{atfi@fileobj@#1}{% + \stepcounter{atfi@obj}% + \begingroup + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% + \x + \fi + \ifx\atfi@params\ltx@empty + \else + \edef\atfi@params{/Params<<\atfi@params>>}% + \fi + \edef\atfi@FILE{#1}% + \filename@parse\atfi@FILE + \ifx\filename@area\ltx@empty + \edef\atfi@FILE{./\atfi@FILE}% + \fi + \EdefEscapeString\atfi@FILE{\atfi@FILE}% + \atfi@special{fstream % + \theatfi@obj + (\atfi@FILE)% + <<% + /Type/EmbeddedFile% + \atfi@mimetype + \atfi@params + >>% + }% + \atfi@special{close \theatfi@obj}% + \expandafter + \xdef\csname atfi@fileobj@#1\endcsname{\theatfi@obj}% + \endgroup + }{% + % file already embedded + }% +} +\def\atfi@xform{% + \stepcounter{atfi@obj}% + \smash{% + \rlap{% + \atfi@special{bxobj \theatfi@obj\space + width \the\wd\atfi@appearancebox\space + height \the\ht\atfi@appearancebox\space + depth \the\dp\atfi@appearancebox + }% + \usebox\atfi@appearancebox + \atfi@special{exobj}% + }% + }% + \edef\atfi@appearanceobj{\theatfi@obj}% +} +\let\atfi@xform@icon\atfi@xform +\def\atfi@refxform#1{% + \leavevmode + \atfi@special{uxobj #1}% +} +\def\atfi@insert@file@annot#1{% + \rule{0pt}{0pt}% + \ifatfi@appearance + \def\atfi@appearance@dict{% + /AP<<% + /N \atfi@appearanceobj + /R \atfi@appearanceobj + /D \atfi@appearanceobj + >>% + }% + \else + \let\atfi@appearance@dict\ltx@empty + \fi + \ltx@IfUndefined{atfi@fsobj@#1}{% + \begingroup + \ifxetex + \let\atfi@temp\Hy@Warning + \let\Hy@Warning\ltx@gobble + \fi + \hypersetup{unicode=false}% + \ifxetex + \let\Hy@Warning\atfi@temp + \fi + \atfi@pdfstringdef\atfi@file{#1}% + \stepcounter{atfi@obj}% + \atfi@special{obj \theatfi@obj <<% + /Type/Filespec% + /F(\atfi@file)% + \ifx\atfi@ucfilespec\ltx@empty + \else + /UF(\atfi@ucfilespec)% + \fi + /EF<<% + /F \@nameuse{atfi@fileobj@#1}% + >>% + >>% + }% + \expandafter\xdef\csname atfi@fsobj@#1\endcsname{% + \theatfi@obj + }% + \endgroup + }{% + }% + \begingroup + \dimen@=\atfi@scale\atfi@appearancewidth + \edef\atfi@rule{width \the\dimen@}% + \dimen@=\atfi@scale\atfi@appearanceheight + \edef\atfi@rule{\atfi@rule\space height \the\dimen@}% + \dimen@=\atfi@scale\atfi@appearancedepth + \edef\atfi@rule{\atfi@rule\space depth \the\dimen@}% + \atfi@special{ann \atfi@rule + <<% + /Subtype/FileAttachment% + \atfi@icon + \atfi@color@annot + \atfi@author + \atfi@date + \atfi@annotname + \atfi@description + \atfi@subject + \atfi@appearance@dict + /F \theatfi@flags + /FS \@nameuse{atfi@fsobj@#1}% + >>% + }% + \endgroup + \rule{0pt}{\atfi@appearanceheight}% + \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% + \rule{\atfi@appearancewidth}{0pt}% +} + +\endinput +%% +%% End of file `atfi-dvipdfmx.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def index b630fa8e854..4ba9e5eb0ff 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-dvips.def @@ -1,5 +1,5 @@ %% -%% This is file `atfidvips.def', +%% This is file `atfi-dvips.def', %% generated with the docstrip utility. %% %% The original source files were: @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,20 +28,18 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{atfipdftex.def}% - [2009/09/25 v2.5 attachfile2 driver for dvips (HO)]% +\ProvidesFile{atfi-dvips.def}% + [2010/09/27 v2.6 attachfile2 driver for dvips (HO)]% \def\atfi@literal#1{% \special{ps:atfi_dict begin{#1}atfi_?pdfmark end}% } - \def\atfi@header#1{% \special{! #1}% } - - \atfi@header{% userdict begin 20 dict dup /atfi_dict exch def end begin% /atfi_?pdfmark systemdict % @@ -232,7 +230,6 @@ } atfi_?pdfmark % end% } - \def\atfi@GSAVE{gsave } \def\atfi@GRESTORE{grestore } \def\atfi@SETLINEWIDTH{setlinewidth } @@ -265,52 +262,39 @@ \def\atfi@CURVETOY{atfi_curveto_y } \def\atfi@CLOSEPATH{closepath } \def\atfi@SETLINEJOIN{setlinejoin } - - \newcounter{atfi@obj} \renewcommand*{\theatfi@obj}{% {atfi_obj_\number\c@atfi@obj}% } - - \define@key{AtFi@file}{Size}{} - \def\atfi@embedfile#1{% - \@ifundefined{atfi@fileobj@#1}{% + \ltx@IfUndefined{atfi@fileobj@#1}{% \atfi@pdfstringdef\atfi@psfilename{#1}% \stepcounter{atfi@obj}% \expandafter\xdef\csname atfi@fileobj@#1\endcsname{\theatfi@obj}% \begingroup - \let\atfi@params\@empty - \@ifundefined{atfi@file@#1}{}{% - \edef\x{\noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}}% + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% \x - }% + \fi \atfi@literal{% /atfi_filename(\atfi@psfilename)def % atfi_filename status% {% - % ok: file found - % save parameters of status command /atfi_created exch def% /atfi_referenced exch def% /atfi_size exch def % - pop % drop parameter "pages" (storage space), never needed - % ghostscript: - % created: stat.st_ctime - % referenced: stat.st_mtime - % stat.st_ctime: interpretion depends on operating system: - % * unix: inode change time (not interesting) - % * win32: probably creation time - % --> /CreationDate - % stat.st_mtime: modification time --> /ModDate - % time values are seconds since 1970-01-01, GMT - % TODO: ghostscript offers "getenv" for getting the value - % of an environment variable. That could be used to - % to detect windows and settingthe /CreationDate entry. - % TODO: how are these values interpreted by other distiller - % programs? - % + pop % [% /_objdef \theatfi@obj /type/stream% @@ -329,12 +313,9 @@ /product where% {% pop % - % check for ghostscript product (Ghostscript) search% {% pop pop pop % - % ghostscript is running - % \ifatfi@creationdate \else false % TODO: test for windows @@ -347,8 +328,6 @@ /ModDate atfi_referenced atfi_convert_date% \fi } if% - % - % look for MD5Encode filter and calculate CheckSum } if % \ifatfi@checksum \else @@ -365,17 +344,12 @@ \theatfi@obj /CLOSE pdfmark% }{% - % error: file not found - % currently nothing is done } ifelse% }% \endgroup }{% - % file already embedded }% } - - \def\atfi@xform@icon{% \stepcounter{atfi@obj}% \edef\atfi@appearanceobj{\theatfi@obj}% @@ -399,7 +373,7 @@ \stepcounter{atfi@obj}% \edef\atfi@appearanceobj{\theatfi@obj}% \begingroup - \setbox0=\hbox{% + \setbox\ltx@zero=\hbox{% \atfi@literal{% [% /_objdef \atfi@appearanceobj @@ -425,13 +399,12 @@ }% }% % do not allocate any space for xobject definition - \dp0=\z@ - \ht0=\z@ - \wd0=\z@ - \mbox{\usebox0}% + \dp\ltx@zero=\z@ + \ht\ltx@zero=\z@ + \wd\ltx@zero=\z@ + \mbox{\usebox\ltx@zero}% \endgroup } - \def\atfi@refxform#1{% \raisebox{-\atfi@appearancedepth}{% \atfi@literal{% @@ -445,8 +418,6 @@ }% \rule{0pt}{\atfi@appearanceheight}% } - - \def\atfi@insert@file@annot#1{% \rule{0pt}{0pt}% \ifatfi@appearance @@ -458,11 +429,12 @@ >>% }% \else - \let\atfi@appearance@dict\@empty + \let\atfi@appearance@dict\ltx@empty \fi - \@ifundefined{atfi@fsobj@#1}{% + \ltx@IfUndefined{atfi@fsobj@#1}{% \stepcounter{atfi@obj}% - \expandafter\xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}% + \expandafter + \xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}% \begingroup \hypersetup{unicode=false}% \atfi@pdfstringdef\atfi@file{#1}% @@ -476,7 +448,7 @@ <<% /Type/Filespec% /F(\atfi@file)% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else /UF(\atfi@ucfilespec)% \fi @@ -507,9 +479,11 @@ \strip@pt\dimexpr\atfi@scale\atfi@appearancedepth\relax \space atfi_pdftodvipsy add % currentpoint % - exch \strip@pt\dimexpr\atfi@scale\atfi@appearancewidth\relax + exch % + \strip@pt\dimexpr\atfi@scale\atfi@appearancewidth\relax \space atfi_pdftodvipsx add % - exch \strip@pt\dimexpr\atfi@scale\atfi@appearanceheight\relax + exch % + \strip@pt\dimexpr\atfi@scale\atfi@appearanceheight\relax \space atfi_pdftodvipsy sub % ]% /ANN pdfmark% @@ -521,4 +495,4 @@ \endinput %% -%% End of file `atfidvips.def'. +%% End of file `atfi-dvips.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def index f0da8594c70..daba4d77f5e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfi-pdftex.def @@ -1,5 +1,5 @@ %% -%% This is file `atfipdftex.def', +%% This is file `atfi-pdftex.def', %% generated with the docstrip utility. %% %% The original source files were: @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,14 +28,45 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{atfipdftex.def}% - [2009/09/25 v2.5 attachfile2 driver for pdfTeX (HO)]% +\ProvidesFile{atfi-pdftex.def}% + [2010/09/27 v2.6 attachfile2 driver for pdfTeX (HO)]% +\ifluatex + \ifnum\luatexversion<39 % + \else + \begingroup + \escapechar=-1 % + \def\atfi@temp#1{% + \ltx@IfUndefined{\string#1}{% + \let#1\ltx@undefined + \directlua{% + if tex.enableprimitives then % + tex.enableprimitives('', {'\string#1'})% + end% + }% + \ltx@ifundefined{\string#1}{% + }{% + \global#1=#1% + \@PackageInfoNoLine{attachfile2}{% + \string#1 enabled% + }% + }% + }{}% + }% + \atfi@temp\pdfliteral + \atfi@temp\pdfobj + \atfi@temp\pdflastobj + \atfi@temp\pdfxform + \atfi@temp\pdflastxform + \atfi@temp\pdfrefxform + \atfi@temp\pdfannot + \endgroup + \fi +\fi \let\atfi@literal\pdfliteral - - \def\atfi@GSAVE{q } \def\atfi@GRESTORE{Q } \def\atfi@SETLINEWIDTH{w } @@ -60,21 +91,27 @@ \def\atfi@CURVETOY{y } \def\atfi@CLOSEPATH{h } \def\atfi@SETLINEJOIN{j } - - \define@key{AtFi@file}{Size}{% \edef\atfi@params{\atfi@params/Size #1}% } - \def\atfi@embedfile#1{% - \@ifundefined{atfi@fileobj@#1}{% + \ltx@IfUndefined{atfi@fileobj@#1}{% \begingroup - \let\atfi@params\@empty - \@ifundefined{atfi@file@#1}{}{% - \edef\x{\noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}}% + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% \x - }% - \ifx\atfi@params\@empty + \fi + \ifx\atfi@params\ltx@empty \else \edef\atfi@params{/Params<<\atfi@params>>}% \fi @@ -83,25 +120,21 @@ \atfi@mimetype \atfi@params } file {#1}% - \expandafter\xdef\csname atfi@fileobj@#1\endcsname{\the\pdflastobj}% + \expandafter + \xdef\csname atfi@fileobj@#1\endcsname{\the\pdflastobj}% \endgroup }{% % file already embedded }% } - - \def\atfi@xform{% \immediate\pdfxform\atfi@appearancebox \edef\atfi@appearanceobj{\the\pdflastxform}% } \let\atfi@xform@icon\atfi@xform - \def\atfi@refxform#1{% \pdfrefxform#1\relax } - - \def\atfi@insert@file@annot#1{% \rule{0pt}{0pt}% \ifatfi@appearance @@ -113,9 +146,9 @@ >>% }% \else - \let\atfi@appearance@dict\@empty + \let\atfi@appearance@dict\ltx@empty \fi - \@ifundefined{atfi@fsobj@#1}{% + \ltx@IfUndefined{atfi@fsobj@#1}{% \begingroup \hypersetup{unicode=false}% \atfi@pdfstringdef\atfi@file{#1}% @@ -123,7 +156,7 @@ <<% /Type/Filespec% /F(\atfi@file)% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else /UF(\atfi@ucfilespec)% \fi @@ -160,4 +193,4 @@ \endinput %% -%% End of file `atfipdftex.def'. +%% End of file `atfi-pdftex.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty index 20f5ef0e689..3098ffaefca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2009 by +%% Copyright (C) 2005-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,139 +28,142 @@ %% This work consists of the main source file attachfile2.dtx %% and the derived files %% attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -%% atfidvips.def, atfipdftex.def, pdfatfi.pl. +%% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +%% pdfatfi.pl. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2009/09/25 v2.5 attach files into PDF (HO)]% -\RequirePackage{ifpdf} + [2010/09/27 v2.6 attach files into PDF (HO)]% +\RequirePackage{ifpdf}[2009/04/10] +\RequirePackage{ifxetex} +\RequirePackage{ifluatex}[2009/04/10] \RequirePackage{keyval} \RequirePackage{color} -\RequirePackage{kvoptions}[2006/08/17] +\RequirePackage{infwarerr}[2010/04/08] +\RequirePackage{ltxcmds}[2010/04/26] +\RequirePackage{kvoptions}[2009/07/21] +\RequirePackage{pdftexcmds}[2010/04/01] \RequirePackage{pdfescape}[2007/11/11] - - \RequirePackage{hyperref} \RequirePackage{hycolor}[2008/07/29] - - -\def\atfi@hexdigit#1{% - \ifcase#1% - 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or - a\or b\or c\or d\or e\or f% - \fi -} -\def\atfi@hexchar#1{% - \atfi@hexdigit{\numexpr\dimexpr.0625\dimexpr`#1sp\relax\relax\relax}% - \atfi@hexdigit{% - \numexpr`#1-16*\dimexpr.0625\dimexpr`#1sp\relax\relax\relax +\ltx@IfUndefined{pdfmatch}{% + \def\atfi@Match#1#2#3#4#5{}% +}{% + \def\atfi@Match#1#2#3{% + \begingroup + \edef\^{\ltx@backslashchar\string^}% + \edef\.{\ltx@backslashchar.}% + \let\#\ltx@hashchar + \edef\[{\ltx@backslashchar[}% ]] + \edef\${\ltx@backslashchar$}% + \let\%\ltx@percentchar + \edef\&{\string&}% + \edef\({\ltx@backslashchar(}% + \edef\){\ltx@backslashchar)}% + \edef\|{\ltx@backslashchar|}% + \edef\*{\ltx@backslashchar*}% + \edef\+{\ltx@backslashchar+}% + \edef\?{\ltx@backslashchar?}% + \edef\{{\ltx@backslashchar\ltx@leftbracechar}% + \edef\}{\ltx@rightbracechar}% + \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \edef\~{\string~}% + \ifcase\pdfmatch#3{#2}{#1} % + \endgroup + \expandafter\ltx@secondoftwo + \or + \endgroup + \expandafter\ltx@firstoftwo + \else + \atfi@Warning{% + Internal error: Wrong pattern!\MessageBreak + --> #2 <--\MessageBreak + Pattern check ignored% + }% + \endgroup + \expandafter\ltx@firstoftwo + \fi + }% + \def\atfi@PatToken{% + [% + -% first character + !% + \#$\%\&'% + \*\+\.% + 0-9% + A-Z% + \^_`% + a-z% + \{\}\|\~% + ]+% + }% + \begingroup + \lccode64=13 % @ + \lowercase{\endgroup + \def\atfi@CR{@}% + }% + \def\atfi@PatQuotedString{% + "% + ([^"\\\atfi@CR]|\\.)*% + "% + }% + \ltx@ifpackagelater{ltxcmds}{2010/09/11}{}{% + \begingroup + \lccode`0=`\{\relax + \lowercase{\endgroup + \def\ltx@leftbracechar{0}% + }% + \begingroup + \lccode`0=`\}\relax + \lowercase{\endgroup + \def\ltx@rightbracechar{0}% + }% }% } -\def\atfi@tohex#1{% - \ifx\relax#1% - \else - \atfi@hexchar{#1}% - \expandafter\atfi@tohex - \fi -} - - -\def\atfi@converttoname#1#2{% - \edef#1{#2}% - \@onelevel@sanitize#1% - \edef#1{\expandafter\atfi@spacetoother#1 \relax}% - \edef#1{\expandafter\atfi@converttokens#1\relax}% +\def\atfi@Warning{\PackageWarning{attachfile2}} +\SetupKeyvalOptions{% + family=AtFi,% + prefix=atfi@% } - -\edef\atfi@hash{\string#}% -\catcode`\ =12\relax% -\def\atfi@space{ }% -\catcode`\ =10\relax% - -\def\atfi@spacetoother#1 #2\relax{% - #1% - \ifx\\#2\\% +\def\atfi@setup{\setkeys{AtFi}} +\DeclareBoolOption{draft} +\DeclareComplementaryOption{final}{draft} +\def\atfi@mimetype{} +\define@key{AtFi}{mimetype}{% + \edef\atfi@mimetype{#1}% + \ifx\atfi@mimetype\ltx@empty \else - \atfi@space - \@ReturnAfterFi{% - \atfi@spacetoother #2\relax + \atfi@Match\atfi@mimetype{% + ^(application|audio|image|model|text|video|x-\atfi@PatToken)% + /% + ([a-z\-\+_\.0-9]+)% + (; ?\atfi@PatToken=(\atfi@PatToken|\atfi@PatQuotedString))*$% + }{icase}{}{% + \atfi@Warning{% + Invalid value `\atfi@mimetype'\MessageBreak + of option `mimetype'.\MessageBreak + Value is discarded% + }% + \let\atfi@mimetype\ltx@empty }% \fi -} -\long\def\@ReturnAfterFi#1\fi{\fi#1} - -\def\atfi@converttokens#1{% - \ifx\relax#1% + \ifx\atfi@mimetype\ltx@empty \else - \ifnum`#1<33 % - \ifcase`#1% - % drop illegal zero - \else - \atfi@hash\atfi@hexchar#1% - \fi - \else - \ifnum`#1>126 % - \atfi@hash\atfi@hexchar#1% - \else - \ifnum`#1=40 % ( - \atfi@hash 28% - \else\ifnum`#1=41 % ) - \atfi@hash 29% - \else\ifnum`#1=60 % < - \atfi@hash 3c% - \else\ifnum`#1=62 % > - \atfi@hash 3e% - \else\ifnum`#1=91 % [ - \atfi@hash 5b% - \else\ifnum`#1=93 % ] - \atfi@hash 5d% - \else\ifnum`#1=123 % { - \atfi@hash 7b% - \else\ifnum`#1=125 % } - \atfi@hash 7d% - \else\ifnum`#1=47 % / - \atfi@hash 2f% - \else\ifnum`#1=37 % % - \atfi@hash 25% - \else - #1% - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi - \fi - \expandafter\atfi@converttokens + \EdefEscapeName\atfi@mimetype{\atfi@mimetype}% + \edef\atfi@mimetype{/Subtype/\atfi@mimetype}% \fi } - - -\newif\ifatfi@draft -\let\atfi@finaltrue\atfi@draftfalse -\let\atfi@finalfalse\atfi@drafttrue -\define@key{AtFi}{final}[true]{% - \csname atfi@final#1\endcsname -} -\define@key{AtFi}{draft}[true]{% - \csname atfi@draft#1\endcsname -} - -\def\atfi@mimetype{} -\define@key{AtFi}{mimetype}{% - \atfi@converttoname\atfi@mimetype{#1}% - \edef\atfi@mimetype{/Subtype/\atfi@mimetype}% -} - \define@key{AtFi}{icon}{% \def\atfi@icon{/Name/#1}% \def\atfi@icon@icon{#1}% } -\setkeys{AtFi}{icon=PushPin} - +\atfi@setup{icon=PushPin} \define@key{AtFi}{color}{% \HyColor@AttachfileColor{#1}% \atfi@color@tex\atfi@color@inline\atfi@color@annot {attachfile2}{color}% } -\setkeys{AtFi}{color=1 0.9255 0.7765} - +\atfi@setup{color=1 0.9255 0.7765} \def\atfi@pad@ii#1{% \ifnum#1>9 % \number#1% @@ -168,7 +171,7 @@ 0\number#1% \fi% } -\let\atfi@timezone\@empty +\let\atfi@timezone\ltx@empty \define@key{AtFi}{timezone}{\def\atfi@timezone{#1}} \edef\atfi@time{\the\time} \def\atfi@hours{% @@ -191,105 +194,138 @@ \EdefEscapeString\atfi@date{#1}% \edef\atfi@date{/M(\atfi@date)}% } - -\let\atfi@annotname\@empty -\define@key{AtFi}{annotname}{% - \atfi@pdfstringdef\atfi@annotname{#1}% - \edef\atfi@annotname{/NM(\atfi@annotname)}% -} - \DeclareRobustCommand{\atfi@pdfstringdef}[2]{% \pdfstringdef\atfi@temp@string{#2}% \edef#1{\atfi@temp@string}% } - +\def\atfi@NoValue{\NoValue} +\def\atfi@DefNoValueName#1#2#3{% + \def#1{#3}% + \ifx#1\atfi@NoValue + \let#1\ltx@empty + \else + \atfi@pdfstringdef#1{#1}% + \edef#1{/#2(#1)}% + \fi +} +\let\atfi@annotname\ltx@empty +\define@key{AtFi}{annotname}[\NoValue]{% + \atfi@DefNoValueName\atfi@annotname{NM}{#1}% +} \def\atfi@author{} -\define@key{AtFi}{author}{% - \atfi@pdfstringdef\atfi@author{#1}% - \edef\atfi@author{/T(\atfi@author)}% +\define@key{AtFi}{author}[\NoValue]{% + \atfi@DefNoValueName\atfi@author{T}{#1}% } - \def\atfi@description{} -\define@key{AtFi}{description}{% - \atfi@pdfstringdef\atfi@description{#1}% - \edef\atfi@description{/Contents(\atfi@description)}% +\define@key{AtFi}{description}[\NoValue]{% + \atfi@DefNoValueName\atfi@description{Contents}{#1}% } - \def\atfi@subject{} -\define@key{AtFi}{subject}{% - \atfi@pdfstringdef\atfi@subject{#1}% - \edef\atfi@subject{/Subj(\atfi@subject)}% -} - -\newif\ifatfi@print -\atfi@printtrue -\define@key{AtFi}{print}[true]{\csname atfi@print#1\endcsname} - -\newif\ifatfi@zoom -\atfi@zoomtrue -\define@key{AtFi}{zoom}[true]{\csname atfi@zoom#1\endcsname} - -\newif\ifatfi@appearance -\atfi@appearancetrue -\define@key{AtFi}{appearance}[true]{% - \csname atfi@appearance#1\endcsname +\define@key{AtFi}{subject}[\NoValue]{% + \atfi@DefNoValueName\atfi@subject{Subj}{#1}% } - -\def\atfi@scale{1} -\define@key{AtFi}{scale}[1]{% - \def\atfi@scale{#1}% -} - +\DeclareBoolOption[true]{print} +\DeclareBoolOption[true]{zoom} +\DeclareBoolOption[true]{appearance} +\DeclareStringOption[1]{scale} \def\atfi@ucfilespec{} \define@key{AtFi}{ucfilespec}[1]{% \def\atfi@ucfilespec{#1}% - \ifx\atfi@ucfilespec\@empty + \ifx\atfi@ucfilespec\ltx@empty \else \atfi@pdfstringdef\atfi@ucfilespec{#1}% \fi } - -\newif\ifatfi@nofiles -\atfi@nofilesfalse -\define@key{AtFi}{nofiles}[true]{% - \csname atfi@nofiles#1\endcsname -} - -\let\atfi@driver\@empty +\DeclareBoolOption{nofiles} +\let\atfi@driver\ltx@empty \def\atfi@driver@pdftex{pdftex} \def\atfi@driver@dvips{dvips} - -\define@key{AtFi}{pdftex}[true]{% +\def\atfi@driver@dvipdfmx{dvipdfmx} +\DeclareVoidOption{pdftex}{% \let\atfi@driver\atfi@driver@pdftex } -\define@key{AtFi}{dvips}[true]{% +\DeclareVoidOption{dvips}{% \let\atfi@driver\atfi@driver@dvips } - +\DeclareVoidOption{dvipdfmx}{% + \let\atfi@driver\atfi@driver@dvipdfmx +} +\DeclareVoidOption{xetex}{% + \let\atfi@driver\atfi@driver@dvipdfmx +} +\DeclareStringOption{driverfallback} \DeclareRobustCommand{\attachfilesetup}[1]{\setkeys{AtFi}{#1}} - +\DeclareLocalOptions{% + annotname,% + appearance,% + author,% + color,% + date,% + description,% + icon,% + mimetype,% + nofiles,% + print,% + scale,% + subject,% + timezone,% + ucfilespec,% + zoom,% +} \InputIfFileExists{attachfile.cfg}{}{} - -\ProcessKeyvalOptions{AtFi} - - +\ProcessKeyvalOptions* +\def\atfi@DisableOption{% + \DisableKeyvalOption[action=error,package=attachfile2]{AtFi}% +} \ifpdf % ignoring other driver options \let\atfi@driver\atfi@driver@pdftex \else - \ifx\atfi@driver\@empty - \PackageWarningNoLine{attachfile2}{% - Driver is not specified,\MessageBreak - enforce draft settings% - }% - \atfi@drafttrue + \ifx\atfi@driver\atfi@driver@pdftex + \let\atfi@driver\ltx@empty + \PackageError{attachfile2}{% + Wrong driver option `pdftex',\MessageBreak + because pdfTeX in PDF mode is not detected% + }\@ehc + \fi + \ifxetex + \let\atfi@driver\atfi@driver@dvipdfmx + \else + \ifx\atfi@driver\ltx@empty + \ifx\atfi@driverfallback\ltx@empty + \else + \expandafter\let\expandafter\atfi@driver + \csname atfi@driver@\atfi@driverfallback\endcsname + \ifx\atfi@driver\atfi@driver@dvips + \else + \ifx\atfi@driver\atfi@driver@dvipdfmx + \else + \let\atfi@driver\ltx@empty + \PackageWarningNoLine{attachfile2}{% + Option `driverfallback' with unsupported\MessageBreak + DVI driver (\atfi@driverfallback)% + }% + \fi + \fi + \fi + \ifx\atfi@driver\ltx@empty + \PackageWarningNoLine{attachfile2}{% + Driver is not specified,\MessageBreak + enforce draft settings% + }% + \atfi@drafttrue + \fi + \fi \fi \fi - - +\atfi@DisableOption{pdftex} +\atfi@DisableOption{dvips} +\atfi@DisableOption{dvipdfmx} +\atfi@DisableOption{xetex} +\atfi@DisableOption{driverfallback} \DeclareRobustCommand{\notextattachfile}[2][]{% \begingroup - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \ifatfi@print \leavevmode \begingroup @@ -297,12 +333,13 @@ #2\strut \endgroup \else - \setbox0=\hbox{#2\strut}% + \sbox\ltx@zero{#2\strut}% \makebox[\wd0]{}% \fi \endgroup } - +\atfi@DisableOption{draft}% +\atfi@DisableOption{final}% \ifatfi@draft \def\atfi@dummy@pushpin{% \raisebox{-1.25bp}{\parbox[b][14bp]{24bp}{}}% @@ -316,13 +353,9 @@ \DeclareRobustCommand{\attachfile}[2][]{% \noattachfile[{#1}]% }% - \expandafter\endinput + \expandafter\endinput \fi - - -\input{atfi\atfi@driver.def} - - +\input{atfi-\atfi@driver.def} \def\atfi@acroGraph@data{% \atfi@GSAVE 0.5 \atfi@SETGRAYFILL @@ -521,13 +554,11 @@ \atfi@STROKE \atfi@GRESTORE } -\DeclareRobustCommand{\atfi@acroTag}{% +\def\atfi@acroTag{% \raisebox{-1.6bp}{\parbox[b][17bp]{25bp}{% \rule{0pt}{0pt}\atfi@literal{\atfi@acroTag@data}}% }% } - - \def\attachfile@timezone#1{% \ifx\\#1\\% % no timezone information given @@ -536,58 +567,92 @@ \fi } \newcommand*{\attachfile@file}[2][]{% - \ifx\\#2\\% + \EdefUnescapeHex\atfi@filename{#2}% + \ifx\atfi@filename\ltx@empty \PackageError{attachfile2}{Empty file name}\@ehc \else - \edef\atfi@restore{\uccode0=\the\uccode0 \relax}% - \let\atfi@filename\@empty - \atfi@getfilename#2\relax\relax - \atfi@restore \@namedef{atfi@file@\atfi@filename}{#1}% \fi } -\begingroup - \catcode0=12 % - \gdef\atfi@getfilename#1#2{% - \ifx\relax#1% - \else - \uccode0=\numexpr 16*\atfi@hexnum{#1} + \atfi@hexnum{#2}\relax - \uppercase{% - \edef\atfi@filename{% - \atfi@filename^^@% - }% - }% - \expandafter\atfi@getfilename - \fi - }% -\endgroup -\def\atfi@hexnum#1{% - \ifnum`#1<58 % - \numexpr `#1-48\relax - \else - \numexpr `#1-87\relax - \fi -} - \InputIfFileExists{\jobname.atfi}{}{}% - \newif\ifatfi@checksum \define@key{AtFi@file}{CheckSum}{% \atfi@checksumtrue \edef\atfi@params{\atfi@params/CheckSum<#1>}% } \newif\ifatfi@creationdate +\define@key{AtFi@file}{CreationDateTZ}{% + \ifatfi@creationdate + \else + \atfi@creationdatetrue + \edef\atfi@params{% + \atfi@params + /CreationDate(#1)% + }% + \fi +} \define@key{AtFi@file}{CreationDate}{% - \atfi@creationdatetrue - \edef\atfi@params{\atfi@params/CreationDate(D:#1\atfi@timezone)}% + \ifatfi@creationdate + \else + \atfi@creationdatetrue + \edef\atfi@params{% + \atfi@params + /CreationDate(#1\atfi@timezone)% + }% + \fi } \newif\ifatfi@moddate +\define@key{AtFi@file}{ModDateTZ}{% + \ifatfi@moddate + \else + \atfi@moddatetrue + \edef\atfi@params{% + \atfi@params + /ModDate(#1)% + }% + \fi +} \define@key{AtFi@file}{ModDate}{% - \atfi@moddatetrue - \edef\atfi@params{\atfi@params/ModDate(D:#1\atfi@timezone)}% + \ifatfi@moddate + \else + \atfi@moddatetrue + \edef\atfi@params{% + \atfi@params + /ModDate(D:#1\atfi@timezone)% + }% + \fi } - - +\let\atfi@temp\ltx@one +\ltx@IfUndefined{pdf@filesize}{% + \let\atfi@temp\ltx@zero +}{} +\ltx@IfUndefined{pdf@filemoddate}{% + \let\atfi@temp\ltx@zero +}{} +\ltx@IfUndefined{pdf@filemdfivesum}{% + \let\atfi@temp\ltx@zero +}{} +\ifcase\atfi@temp + \let\atfi@pdftexdata\ltx@gobble +\or + \def\atfi@pdftexdata#1{% + \edef\atfi@temp{\pdf@filesize{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{Size=\atfi@temp}% + \edef\atfi@temp{\pdf@filemoddate{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{ModDateTZ=\atfi@temp}% + \fi + \edef\atfi@temp{\pdf@filemdfivesum{#1}}% + \ifx\atfi@temp\ltx@empty + \else + \setkeys{AtFi@file}{CheckSum=\atfi@temp}% + \fi + \fi + }% +\fi \if@filesw \else \atfi@nofilestrue @@ -597,7 +662,7 @@ File `\jobname.atfi' will not be written because of\MessageBreak \string\nofiles\space or option `nofiles'% }% - \let\atfi@writefile\@gobble + \let\atfi@writefile\ltx@gobble \else \newwrite\atfi@stream \immediate\openout\atfi@stream=\jobname.atfi\relax @@ -606,78 +671,66 @@ }% \def\atfi@writefile#1{% \begingroup - \def\file{#1}% - \@onelevel@sanitize\file - \edef\file{\@firstofone{\expandafter\atfi@replace\file} \@nil}% - \edef\file{\expandafter\atfi@tohex\file\relax}% + \EdefEscapeHex\atfi@temp{#1}% \immediate\write\atfi@stream{% \string\attachfile@file[% - \@ifundefined{atfi@file@#1}{}{\@nameuse{atfi@file@#1}}% - ]{\file}% + \ltx@ifundefined{atfi@file@#1}{}{\@nameuse{atfi@file@#1}}% + ]{\atfi@temp}% }% \endgroup }% \fi - +\atfi@DisableOption{nofiles} \def\atfi@attachfile#1#2{% - \@ifundefined{atfi@fileobj@#2}{% + \ltx@IfUndefined{atfi@fileobj@#2}{% \atfi@writefile{#2}% }{% % don't need duplicates }% - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \atfi@embedfile{#2}% \atfi@set@appearance@icon \atfi@flags@to@int \atfi@insert@file@annot{#2}% \endgroup } - - -\def\atfi@replace#1 #2\@nil{% - #1% - \ifx\\#2\\% - \else - \atfi@space - \@ReturnAfterFi{% - \atfi@replace#2\@nil - }% - \fi -}% - -\long\def\@ReturnAfterFi#1\fi{\fi#1} - - \newlength{\atfi@appearancewidth} \newlength{\atfi@appearanceheight} \newlength{\atfi@appearancedepth} \newsavebox{\atfi@appearancebox} - \def\atfi@set@appearance@icon{% - \@ifundefined{atfi@appobj@\atfi@icon@icon}{% - \savebox{\atfi@appearancebox}{\@nameuse{atfi@acro\atfi@icon@icon}}% - \expandafter\xdef\csname atfi@appwidth@\atfi@icon@icon\endcsname{% + \ltx@IfUndefined{atfi@appobj@\atfi@icon@icon}{% + \savebox{\atfi@appearancebox}{% + \@nameuse{atfi@acro\atfi@icon@icon}% + }% + \expandafter + \xdef\csname atfi@appwidth@\atfi@icon@icon\endcsname{% \the\wd\atfi@appearancebox }% - \expandafter\xdef\csname atfi@appheight@\atfi@icon@icon\endcsname{% + \expandafter + \xdef\csname atfi@appheight@\atfi@icon@icon\endcsname{% \the\ht\atfi@appearancebox }% - \expandafter\xdef\csname atfi@appdepth@\atfi@icon@icon\endcsname{% + \expandafter + \xdef\csname atfi@appdepth@\atfi@icon@icon\endcsname{% \the\dp\atfi@appearancebox }% \atfi@xform@icon - \global\expandafter\let\csname atfi@appobj@\atfi@icon@icon\endcsname + \global\expandafter\let + \csname atfi@appobj@\atfi@icon@icon\endcsname \atfi@appearanceobj }{% }% % optimization: \setlength dropped - \atfi@appearancewidth=\@nameuse{atfi@appwidth@\atfi@icon@icon}\relax - \atfi@appearanceheight=\@nameuse{atfi@appheight@\atfi@icon@icon}\relax - \atfi@appearancedepth=\@nameuse{atfi@appdepth@\atfi@icon@icon}\relax + \atfi@appearancewidth=% + \@nameuse{atfi@appwidth@\atfi@icon@icon}\relax + \atfi@appearanceheight=% + \@nameuse{atfi@appheight@\atfi@icon@icon}\relax + \atfi@appearancedepth=% + \@nameuse{atfi@appdepth@\atfi@icon@icon}\relax \expandafter\let\expandafter\atfi@appearanceobj \csname atfi@appobj@\atfi@icon@icon\endcsname } - \def\atfi@set@appearance#1{% \savebox{\atfi@appearancebox}{#1}% \atfi@appearancewidth=\wd\atfi@appearancebox @@ -685,7 +738,6 @@ \atfi@appearancedepth=\dp\atfi@appearancebox \atfi@xform } - \newcounter{atfi@flags} \DeclareRobustCommand{\atfi@flags@to@int}{% \setcounter{atfi@flags}{0}% @@ -697,13 +749,17 @@ \addtocounter{atfi@flags}{8}% \fi% } - \def\atfi@textattachfile#1#2{% \endgroup \atfi@textattachfile@i{#1}{#2}% } \def\atfi@textattachfile@i#1#2#3{% - \setkeys{AtFi}{#1}% + \ltx@IfUndefined{atfi@fileobj@#2}{% + \atfi@writefile{#2}% + }{% + % don't need duplicates + }% + \atfi@setup{#1}% \atfi@embedfile{#2}% \atfi@set@appearance{% \leavevmode @@ -716,7 +772,6 @@ \atfi@insert@file@annot{#2}% \endgroup } - \DeclareRobustCommand{\attachfile}[1][]{% \begingroup \let\do\@makeother @@ -736,10 +791,11 @@ } \DeclareRobustCommand{\noattachfile}[1][]{% \begingroup - \setkeys{AtFi}{#1}% + \atfi@setup{#1}% \atfi@set@appearance@icon \ifatfi@print - \expandafter\atfi@refxform\csname atfi@appobj@\atfi@icon@icon\endcsname + \expandafter + \atfi@refxform\csname atfi@appobj@\atfi@icon@icon\endcsname \else \makebox[\atfi@appearancewidth]{}% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty index d794769e345..8c43c51c5df 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty @@ -30,28 +30,37 @@ %% atveryend.sty, atveryend.pdf, atveryend.ins, atveryend.drv, %% atveryend-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname AtVeryEnd@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\AtVeryEnd@AtEnd{% \AtVeryEnd@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{9}{10}% (tab) \TMP@EnsureCode{39}{12}% ' @@ -61,10 +70,11 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` -\g@addto@macro{\AtVeryEnd@AtEnd}{\endinput}% +\edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{atveryend}% [2010/03/24 v1.5 Hooks at very end of document (HO)] @@ -433,7 +443,7 @@ \ifx\makelabels\AtVeryEnd@temp \else \expandafter\AtVeryEnd@AtEnd -\fi +\fi% \let\AtVeryEnd@PatchLetter=N% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname endletter\endcsname\relax @@ -514,7 +524,7 @@ \@backslashchar endletter is not in expected form% }% \fi -\AtVeryEnd@AtEnd +\AtVeryEnd@AtEnd% \endinput %% %% End of file `atveryend.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty index 315d0157dcf..1b98ebdb4a7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/auxhook.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007, 2009 by +%% Copyright (C) 2006, 2007, 2009, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,13 +31,31 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{auxhook}% - [2009/12/14 v1.2 Hooks for auxiliary files (HO)]% + [2011/03/04 v1.3 Hooks for auxiliary files (HO)]% \providecommand*{\@beginmainauxhook}{} \providecommand*{\@beginpartauxhook}{} -\newcommand{\AddLineBeginMainAux}[1]{% - \g@addto@macro\@beginmainauxhook{% - \immediate\write\@mainaux{#1}% +\ifx\AtBeginDocument\@firstofone + \global\let\@beginmainauxhook\relax +\else + \g@addto@macro{\@beginmainauxhook}{% + \global\let\@beginmainauxhook\relax }% +\fi +\newcommand{\AddLineBeginMainAux}[1]{% + \ifx\@beginmainauxhook\relax + \if@filesw + \PackageInfo{auxhook}{% + \@backslashchar AddLineBeginMainAux comes a little late,% + \MessageBreak + because the main .aux file is already opened% + }% + \immediate\write\@mainaux{#1}% + \fi + \else + \g@addto@macro\@beginmainauxhook{% + \immediate\write\@mainaux{#1}% + }% + \fi } \newcommand{\AddLineBeginPartAux}[1]{% \g@addto@macro\@beginpartauxhook{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index d6b4a13c749..8ccf737fe67 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2010/04/08 v1.12 bookmark driver for dvipdfm (HO)]% + [2011/03/20 v1.19 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} @@ -50,7 +50,7 @@ \@whilesw\ifBKM@sw\fi{% \def\BKM@abslevel{1}% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}\BKM@abslevel }% @@ -142,7 +142,9 @@ out \ifBKM@DvipdfmxOutlineOpen [% \ifBKM@open - \ifnum\BKM@level<\BKM@openlevel + \ifnum\BKM@level<% + \expandafter\ltx@firstofone\expandafter + {\number\BKM@openlevel} % \else -% \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index d4a7f73c69a..0e13b50b022 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2010/04/08 v1.12 bookmark driver for dvips (HO)]% + [2011/03/20 v1.19 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 51cfc201bd4..5acba29a243 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2010/04/08 v1.12 bookmark driver for dvipsone (HO)]% + [2011/03/20 v1.19 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index 697a2482a82..66f1aada205 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,10 +34,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2010/04/08 v1.12 bookmark driver for pdfTeX (HO)]% + [2011/03/20 v1.19 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -150,7 +150,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index 6897861aa2b..f1e25c09f7d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2010/04/08 v1.12 bookmark driver for textures (HO)]% + [2011/03/20 v1.19 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } @@ -65,7 +65,7 @@ } \def\BKM@DO@entry#1#2{% \begingroup - \setkeys{BKM@DO}{#1}% + \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -195,7 +195,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}0% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index bfb2ec8123a..11e6f524222 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2010/04/08 v1.12 bookmark driver for VTeX (HO)]% + [2011/03/20 v1.19 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% @@ -55,7 +55,7 @@ \BKM@swtrue \@whilesw\ifBKM@sw\fi{% \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ - \global\BKM@startatrootfalse + \BKM@startatrootfalse \def\BKM@parent{0}% \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% 0{\BKM@level}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index d7f2e1f616b..d1a108def90 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2010 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2010/04/08 v1.12 PDF bookmarks (HO)]% + [2011/03/20 v1.19 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -78,8 +78,10 @@ \RequirePackage{ifpdf}[2009/04/10] \RequirePackage{ifxetex} \RequirePackage{ifvtex}[2008/11/04] -\RequirePackage{hyperref} +\RequirePackage{pdftexcmds}[2010/11/04] +\RequirePackage{hyperref}[2010/06/18] \RequirePackage{auxhook}[2007/04/06] +\RequirePackage{kvsetkeys}[2010/03/01] \RequirePackage{kvoptions}[2009/08/13] \RequirePackage{hycolor}[2008/09/08] \RequirePackage{bitset} @@ -91,6 +93,8 @@ color,% depth,% dest,% + draft,% + final,% gotor,% italic,% keeplevel,% @@ -106,15 +110,36 @@ uri,% view,% } -\newcommand*{\bookmarksetup}{\setkeys{BKM}} +\newcommand*{\bookmarksetup}{\kvsetkeys{BKM}} \def\BKM@setup#1{% \bookmarksetup{#1}% + \ifx\BKM@HookNext\ltx@empty + \else + \expandafter\bookmarksetup\expandafter{\BKM@HookNext}% + \BKM@HookNextClear + \fi \BKM@hook \ifBKM@keeplevel \else \xdef\BKM@currentlevel{\BKM@level}% \fi } +\newcommand*{\bookmarksetupnext}[1]{% + \ltx@GlobalAppendToMacro\BKM@HookNext{,#1}% +} +\def\BKM@HookNextClear{% + \global\let\BKM@HookNext\ltx@empty +} +\BKM@HookNextClear +\DeclareBoolOption{draft} +\DeclareComplementaryOption{final}{draft} +\pdf@ifdraftmode\BKM@drafttrue{} +\def\BKM@DisableOptions{% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{draft}% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{final}% +} \DeclareBoolOption[\ifHy@bookmarksopen true\else false\fi]{open} \def\bookmark@open{% \ifBKM@open\ltx@one\else\ltx@zero\fi @@ -131,7 +156,7 @@ \ifx\BKM@param\@empty \def\BKM@depth{\c@tocdepth}% \else - \@ifundefined{toclevel@\BKM@param}{% + \ltx@IfUndefined{toclevel@\BKM@param}{% \@onelevel@sanitize\BKM@param \edef\BKM@temp{\expandafter\@car\BKM@param\@nil}% \ifcase 0\expandafter\ifx\BKM@temp-1\fi @@ -142,29 +167,68 @@ \fi \relax \PackageWarning{bookmark}{% - Unknown document division name (\BKM@param)% + Unknown document division name (\BKM@param)\MessageBreak + for option `depth'% }% \else - \BKM@SetDepth\BKM@param + \BKM@SetDepth\BKM@depth\BKM@param \fi }{% - \BKM@SetDepth{\csname toclevel@\BKM@param\endcsname}% + \BKM@SetDepth\BKM@depth{% + \csname toclevel@\BKM@param\endcsname + }% }% \fi } \def\bookmark@depth{\BKM@depth} -\def\BKM@SetDepth#1{% +\def\BKM@SetDepthOrLevel#1#2{% \begingroup \setbox\z@=\hbox{% - \count@=#1\relax + \count@=#2\relax \expandafter }% \expandafter\endgroup - \expandafter\def\expandafter\BKM@depth\expandafter{\the\count@}% + \expandafter\def\expandafter#1\expandafter{\the\count@}% } \DeclareStringOption[\BKM@currentlevel]{level}[\BKM@currentlevel] +\define@key{BKM}{level}{% + \edef\BKM@param{#1}% + \ifx\BKM@param\BKM@MacroCurrentLevel + \let\BKM@level\BKM@param + \else + \ltx@IfUndefined{toclevel@\BKM@param}{% + \@onelevel@sanitize\BKM@param + \edef\BKM@temp{\expandafter\@car\BKM@param\@nil}% + \ifcase 0\expandafter\ifx\BKM@temp-1\fi + \expandafter\ifnum\expandafter`\BKM@temp>47 % + \expandafter\ifnum\expandafter`\BKM@temp<58 % + 1% + \fi + \fi + \relax + \PackageWarning{bookmark}{% + Unknown document division name (\BKM@param)\MessageBreak + for option `level'% + }% + \else + \BKM@SetDepthOrLevel\BKM@level\BKM@param + \fi + }{% + \BKM@SetDepthOrLevel\BKM@level{% + \csname toclevel@\BKM@param\endcsname + }% + }% + \fi +} +\def\BKM@MacroCurrentLevel{\BKM@currentlevel} \DeclareBoolOption{keeplevel} \DeclareBoolOption{startatroot} +\def\BKM@startatrootfalse{% + \global\let\ifBKM@startatroot\iffalse +} +\def\BKM@startatroottrue{% + \global\let\ifBKM@startatroot\iftrue +} \define@key{BKM}{rellevel}{% \BKM@CalcExpr\BKM@level{#1}+\BKM@currentlevel } @@ -405,7 +469,11 @@ \def\BKM@@CalcParam#1#2#3\@nil{% \ifx\calc#1% \@ifundefined{calc@assign@dimen}{% - \setlength{\dimen@}{\dimexpr#2\relax}% + \@ifundefined{dimexpr}{% + \setlength{\dimen@}{#2}% + }{% + \setlength{\dimen@}{\dimexpr#2\relax}% + }% }{% \setlength{\dimen@}{#2}% }% @@ -418,8 +486,9 @@ \fi } \DeclareBoolOption{atend} -\def\BKM@DisableOptions{% - \DisableKeyvalOption{BKM}{atend}% +\g@addto@macro\BKM@DisableOptions{% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{atend}% } \newcommand*{\bookmarkdefinestyle}[2]{% \@ifundefined{BKM@style@#1}{% @@ -496,7 +565,8 @@ \def\BKM@driver{#1}% }% \g@addto@macro\BKM@DisableOptions{% - \DisableKeyvalOption{BKM}{#1}% + \DisableKeyvalOption[action=warning,package=bookmark]% + {BKM}{#1}% }% } \BKM@DefineDriverKey{pdftex} @@ -536,8 +606,31 @@ \fi \ProcessKeyvalOptions* \BKM@DisableOptions +\ifBKM@draft + \PackageWarningNoLine{bookmark}{Draft mode on}% + \let\bookmarksetup\ltx@gobble + \let\BookmarkAtEnd\ltx@gobble + \let\bookmarkdefinestyle\ltx@gobbletwo + \let\bookmarkget\ltx@gobble + \renewcommand*{\pdfbookmark}[3][]{}% + \let\currentpdfbookmark\ltx@gobbletwo + \let\subpdfbookmark\ltx@gobbletwo + \let\belowpdfbookmark\ltx@gobbletwo + \newcommand*{\bookmark}[2][]{}% + \renewcommand*{\Hy@writebookmark}[5]{}% + \let\ReadBookmarks\relax + \let\BKM@DefGotoNameAction\ltx@gobbletwo % package `hypdestopt' + \expandafter\endinput +\fi \newif\ifBKM@DvipdfmxOutlineOpen \ltx@IfUndefined{SpecialDvipdfmxOutlineOpen}{% + \ifxetex + \ifdim\number\XeTeXversion\XeTeXrevision in<0.9995in % + \else + \chardef\SpecialDvipdfmxOutlineOpen\ltx@one + \BKM@DvipdfmxOutlineOpentrue + \fi + \fi }{% \ifnum\SpecialDvipdfmxOutlineOpen>\z@ \BKM@DvipdfmxOutlineOpentrue @@ -627,10 +720,12 @@ \begingroup \ifBKM@numbered \let\numberline\Hy@numberline + \let\booknumberline\Hy@numberline \let\partnumberline\Hy@numberline \let\chapternumberline\Hy@numberline \else \let\numberline\@gobble + \let\booknumberline\@gobble \let\partnumberline\@gobble \let\chapternumberline\@gobble \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index eaccfb6bbf3..e5c6d78b7c9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -30,9 +30,8 @@ %% %% This work consists of the main source file embedfile.dtx %% and the derived files -%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, -%% \immediate \write 18 {mkdir -p texmf/tex/latex/oberdiek}\edef {texmf/tex/latex/oberdiek}, dtx-attach.sty, -%% embedfile-example-plain.tex, +%% embedfile.sty, embedfile.pdf, embedfile.ins, embedfile.drv, \immediate \write 18 {mkdir -p texmf/,}\edef {texmf/,} +%% dtx-attach.sty, embedfile-example-plain.tex, %% embedfile-example-collection.tex, embedfile-test1.tex, %% embedfile-test2.tex, embedfile-test3.tex, %% embedfile-test4.tex. diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty index 27721ad5b31..8d8e8dac917 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty @@ -30,14 +30,18 @@ %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, %% epstopdf-base.sty, epstopdf-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@epstopdf-base.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,29 +96,38 @@ \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2010/02/09 v2.5 Base part for package epstopdf] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/02/09 v2.5 Base part for package epstopdf]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{39}{12}% ' @@ -123,9 +138,9 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{96}{12}% ` +\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput} \RequirePackage{infwarerr}[2007/09/09] \RequirePackage{grfext}\relax \RequirePackage{kvoptions}[2007/10/02] @@ -136,9 +151,8 @@ No graphics package \string`graphic{s,x}\string' loaded% }% \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput -\fi + \expandafter\ETE@AtEnd +\fi% \begingroup \def\x{pdftex.def}% \ifx\Gin@driver\x @@ -148,9 +162,8 @@ }% \endgroup \newcommand*{\epstopdfsetup}[1]{}% - \ETE@AtEnd - \expandafter\endinput - \fi + \expandafter\ETE@AtEnd + \fi% \endgroup \begingroup \expandafter\ifx\csname pdf@shellescape\endcsname\relax @@ -444,7 +457,7 @@ } \InputIfFileExists{epstopdf-sys.cfg}{}{} \InputIfFileExists{epstopdf.cfg}{}{} -\ETE@AtEnd +\ETE@AtEnd% \endinput %% %% End of file `epstopdf-base.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 40fdf757eef..dd6ab9a6412 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -30,14 +30,18 @@ %% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, %% epstopdf-base.sty, epstopdf-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@epstopdf.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,33 +96,48 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\ETE@AtEnd{\ETE@AtEnd\noexpand\endinput} \let\ETE@SavedAtEnd\ETE@AtEnd \RequirePackage{epstopdf-base}[2010/02/09] \let\ETE@AtEnd\ETE@SavedAtEnd @@ -124,7 +145,7 @@ \expandafter\epstopdfsetup\expandafter{\CurrentOption}% } \ProcessOptions*\relax -\ETE@AtEnd +\ETE@AtEnd% \endinput %% %% End of file `epstopdf.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty index 40f08e69b0e..4ad72de078c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007 by +%% Copyright (C) 2007, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -30,14 +30,18 @@ %% grfext.sty, grfext.pdf, grfext.ins, grfext.drv, grfext-test1.tex, %% grfext-test2.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@grfext.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,39 +96,48 @@ \fi \expandafter\x\csname ver@grfext.sty\endcsname \ProvidesPackage{grfext}% - [2007/09/30 v1.0 Managing graphics extensions (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/08/19 v1.1 Managing graphics extensions (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\grfext@AtEnd{% \grfext@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{44}{12}% , \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] +\edef\grfext@AtEnd{\grfext@AtEnd\noexpand\endinput} \@ifundefined{@expandtwoargs}{% \def\@expandtwoargs#1#2#3{% \edef\reserved@a{\noexpand#1{#2}{#3}}% @@ -231,7 +246,26 @@ }% } \let\grfext@@Print\grfext@Print -\grfext@AtEnd +\RequirePackage{kvdefinekeys}[2010/03/01] +\kv@define@key{Gin}{AppendGraphicsExtensions}{% + \AppendGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{AppendGraphicsExtensions*}{% + \AppendGraphicsExtensions*{#1}% +} +\kv@define@key{Gin}{PrependGraphicsExtensions}{% + \PrependGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{PrependGraphicsExtensions*}{% + \PrependGraphicsExtensions*{#1}% +} +\kv@define@key{Gin}{RemoveGraphicsExtensions}{% + \RemoveGraphicsExtensions{#1}% +} +\kv@define@key{Gin}{PrintGraphicsExtensions}[]{% + \PrintGraphicsExtensions +} +\grfext@AtEnd% \endinput %% %% End of file `grfext.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index 5bb1954a3e2..343ad25527e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2010/01/28 v1.11 Extended file name support for graphics (HO)]% + [2010/12/09 v1.13 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -53,12 +53,14 @@ \@makeother\* \catcode`\^=7 % \catcode`\~=\active -\RequirePackage{ifpdf} +\RequirePackage{ifpdf}[2010/01/28] +\RequirePackage{ifxetex}[2010/09/12] \RequirePackage{kvoptions}[2006/08/17] \SetupKeyvalOptions{% family=Gin,% prefix=grffile@% } +\DeclareDefaultOption{\@unknownoptionerror} \DeclareBoolOption[true]{multidot} \DeclareBoolOption[true]{babel} \DeclareBoolOption[false]{extendedchars} @@ -72,21 +74,25 @@ \PassOptionsToPackage\CurrentOption{graphics}% } \RequirePackage{pdftexcmds}[2007/11/11] -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdf@filesize\endcsname\relax - \grffile@spacefalse - \let\grffile@space@disabled\@empty - \def\grffile@spacetrue{% - \PackageWarning{grffile}{% - Option `space' is not available,\MessageBreak - because it needs pdfTeX >= 1.30% - }% - }% +\ifxetex + \grffile@spacetrue \else - \ifpdf - \grffile@spacetrue - \else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf@filesize\endcsname\relax \grffile@spacefalse + \let\grffile@space@disabled\@empty + \def\grffile@spacetrue{% + \PackageWarning{grffile}{% + Option `space' is not available,\MessageBreak + because it needs pdfTeX >= 1.30 or XeTeX% + }% + }% + \else + \ifpdf + \grffile@spacetrue + \else + \grffile@spacefalse + \fi \fi \fi \ProcessKeyvalOptions* @@ -135,7 +141,8 @@ \fi } \def\grffile@extchar@Ginclude@graphics#1{% - \def\grffile@filename{#1}% + \toks@{#1}% + \edef\grffile@filename{\the\toks@}% \ifx\grffile@inputencoding\@empty \else \ifx\grfile@filenameencoding\@empty @@ -161,8 +168,9 @@ \fi \fi \fi + \toks@\expandafter{\grffile@filename}% \edef\x{\endgroup - \noexpand\grffile@Ginclude@graphics{\grffile@filename}% + \noexpand\grffile@Ginclude@graphics{\the\toks@}% }% \x } @@ -194,24 +202,92 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@filesize\endcsname\relax - \begingroup - \let\on@line\@empty - \PackageInfo{grffile}{% - \string\grffile@IfFileExists\space without space support,% - \MessageBreak - because pdfTeX's \string\pdffilesize\space is not available% + \ifxetex + \long\def\grffile@XeTeX@IfFileExists#1{% + \openin\@inputcheck"#1" % + \ifeof\@inputcheck + \closein\@inputcheck + \expandafter\@secondoftwo + \else + \closein\@inputcheck + \expandafter\@firstoftwo + \fi }% - \endgroup - \def\grffile@IfFileExists#1{% - \IfFileExists{#1}{% - \let\grffile@IFE@next\@firstoftwo - }{% - \let\grffile@IFE@next\@secondoftwo + \long\def\grffile@IfFileExists#1{% + \grffile@XeTeX@IfFileExists{#1}{% + \edef\grffile@file@found{#1}% + \@firstoftwo + }{% + \let\reserved@a\@secondoftwo + \ifx\input@path\@undefined + \else + \expandafter\@tfor\expandafter\reserved@b\expandafter + :\expandafter=\input@path\do{% + \grffile@XeTeX@IfFileExists{\reserved@b#1}{% + \edef\grffile@file@found{\reserved@b#1}% + \let\reserved@a\@firstoftwo + \@break@tfor + }{}% + }% + \fi + \reserved@a + }% }% - \grffile@IFE@next - }% + \def\grffile@org@Gread@QTm#1{% + \IfFileExists{\Gin@base.bb}{% + \Gread@eps{\Gin@base.bb}% + }{% + \G@measure@QTm{\Gin@base}{\Gin@ext}% + }% + }% + \ifx\Gread@QTm\grffile@org@Gread@QTm + \def\Gread@QTm#1{% + \grffile@IfFileExists{\Gin@base.bb}{% + \Gread@eps{\Gin@base.bb}% + }{% + \G@measure@QTm{\Gin@base}{\Gin@ext}% + }% + }% + \PackageInfo{grffile}{\string\Gread@QTm\space patched}% + \else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname Gread@QTm\endcsname\relax + \PackageWarning{grffile}{% + \string\Gread@QTm\space of xetex.def not found% + }% + \else + \let\grffile@org@Gread@QTm\Gread@QTm + \def\Gread@QTm#1{% + \let\grffile@saved@IfFileExists\IfFileExists + \let\IfFileExists\grffile@IfFileExists + \grffile@org@GreadQTm{#1}% + \let\IfFileExists\grffile@saved@IfFileExists + }% + \fi + \fi + \else + \begingroup + \let\on@line\@empty + \PackageInfo{grffile}{% + \string\grffile@IfFileExists\space without space support,% + \MessageBreak + because pdfTeX's \string\pdffilesize\space is not available% + \MessageBreak + or XeTeX is not running% + }% + \endgroup + \long\def\grffile@IfFileExists#1{% + \IfFileExists{#1}{% + \let\grffile@IFE@next\@firstoftwo + }{% + \let\grffile@file@found\@filef@und + \let\grffile@IFE@next\@secondoftwo + }% + \grffile@IFE@next + }% + \fi \else - \def\grffile@IfFileExists#1{% + \long\def\grffile@IfFileExists#1{% \expandafter\expandafter\expandafter \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\% \let\reserved@a\@secondoftwo @@ -248,7 +324,6 @@ \grffile@org@Ginclude@graphics{#1}% \endgroup }% - \def\grffile@filename@simple#1.#2\\{% \ifx\\#2\\% \def\filename@base{#1}% @@ -258,7 +333,6 @@ \grffile@analyze@ext{#1}.{#2}\\% \fi } - \def\grffile@analyze@ext#1.#2\\{% \let\grffile@next\relax \ifx\\#2\\% @@ -283,7 +357,6 @@ \fi \grffile@next } - \def\grffile@try@extlist{% \@for\grffile@temp:=\Gin@extensions\do{% \grffile@IfFileExists{\filename@area\filename@base\grffile@temp}{% @@ -297,7 +370,6 @@ \expandafter\grffile@use@last@ext\filename@base.\\% \fi } - \def\grffile@use@last@ext#1.#2\\{% \ifx\\#2\\% \edef\filename@base{\expandafter\filename@dot\filename@base\\}% @@ -332,6 +404,53 @@ \grffile@option@status{multidot} \grffile@option@status{extendedchars} \grffile@option@status{space} +\def\grffile@Gin@ii@graphicx[#1]#2{% + \def\@tempa{[}% + \def\@tempb{#2}% + \ifx\@tempa\@tempb + \def\@tempa{\Gin@iii[#1][}% hash-ok + \expandafter\@tempa + \else + \begingroup + \@tempswafalse + \toks@{\Ginclude@graphics{#2}}% + \setkeys{Gin}{#1}% + \Gin@esetsize + \the\toks@ + \endgroup + \fi +} +\def\grffile@Gin@ii@fixed[#1]#2{% + \def\@tempa{[}% + \begingroup + \toks@={#2}% + \edef\@tempb{\the\toks@}% + \expandafter\endgroup + \ifx\@tempa\@tempb + \def\@tempa{\Gin@iii[#1][}% hash-ok + \expandafter\@tempa + \else + \begingroup + \@tempswafalse + \toks@{\Ginclude@graphics{#2}}% + \setkeys{Gin}{#1}% + \Gin@esetsize + \the\toks@ + \endgroup + \fi +} +\def\grffile@Fix@Gin@ii{% + \let\Gin@ii\grffile@Gin@ii@fixed + \begingroup + \escapechar=92 % + \PackageInfo{grffile}{\string\Gin@ii\space of package `graphicx' fixed}% + \endgroup +} +\ifx\Gin@ii\grffile@Gin@ii@graphicx + \grffile@Fix@Gin@ii +\else + \AtBeginDocument{\grffile@Fix@Gin@ii}% +\fi \grffile@RestoreCatcodes \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty index fe9d8817314..b4acd18a630 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1999-2010 by +%% Copyright (C) 1999-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2010/04/24 v0.19 Private additional ltxdoc support (HO)] + [2011/02/04 v0.21 Private additional ltxdoc support (HO)] \PassOptionsToPackage{pdfencoding=auto}{hyperref} \RequirePackage[numbered]{hypdoc}[2010/03/26] \RequirePackage{hyperref}[2010/03/30] @@ -88,7 +88,7 @@ \addcontentsline{toc}{subsection}{[#1]}% hash-ok \def\HistLabel##1{% \begingroup - \edef\@currentlabel{[#1]}% hash-ok + \protected@edef\@currentlabel{[#1]}% hash-ok \label{##1}% \endgroup }% @@ -102,7 +102,7 @@ }% \def\HistLabel##1{% \begingroup - \edef\@currentlabel{[#1]}% hash-ok + \protected@edef\@currentlabel{[#1]}% hash-ok \label{##1}% \endgroup }% @@ -115,6 +115,7 @@ \itemize }% \let\endVersion\enditemize + \raggedright }{} \newcommand{\URL}[2]{% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty new file mode 100644 index 00000000000..c69c85a7b81 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/hopatch.sty @@ -0,0 +1,169 @@ +%% +%% This is file `hopatch.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hopatch.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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 hopatch.dtx +%% and the derived files +%% hopatch.sty, hopatch.pdf, hopatch.ins, hopatch.drv, +%% hopatch-test1.tex, hopatch-test2.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname HOpatch@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\HOpatch@AtEnd{% + \HOpatch@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\edef\HOpatch@AtEnd{\HOpatch@AtEnd\noexpand\endinput} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{hopatch}% + [2011/01/30 v1.0 Wrapper for package hooks (HO)] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{ltxcmds}[2010/12/12]% +\else + \RequirePackage{ltxcmds}[2010/12/12]% +\fi +\def\HOpatch@counter{0}% +\ltx@ifundefined{numexpr}{% + \def\HOpatch@StepCounter{% + \begingroup + \count@\HOpatch@counter\relax + \advance\count@\ltx@one\relax + \edef\x{\endgroup + \noexpand\def\noexpand\HOpatch@counter{\the\count@}% + }% + }% +}{% + \def\HOpatch@StepCounter{% + \edef\HOpatch@counter{% + \the\numexpr\HOpatch@counter+\ltx@one\relax + }% + }% +} +\def\HOpatch@list{} +\def\HOpatch@Add{% + \ltx@LocalAppendToMacro\HOpatch@list +} +\def\hopatch@AfterPackage#1{% + \ltx@ifpackageloaded{#1}{% + \ltx@firstofone + }{% + \HOpatch@AfterPackage{#1}% + }% +} +\def\HOpatch@AfterPackage#1{% + \edef\HOpatch@temp{#1}% + \HOpatch@StepCounter + \expandafter\HOpatch@@AfterPackage + \csname HOpatch@\HOpatch@counter\expandafter\endcsname{% + \HOpatch@temp + }% +} +\def\HOpatch@@AfterPackage#1#2#3{% + \begingroup + \toks@{#3}% + \xdef\HOpatch@gtemp{% + \noexpand\ltx@ifpackageloaded{#2}{% + \noexpand\let\noexpand#1\noexpand\relax + \the\toks@ + }{}% + }% + \endgroup + \let#1\HOpatch@gtemp + \HOpatch@Add#1% + \HOpatch@Try{AfterPackage}{#2}#1% + \HOpatch@Try{AtEndPackage}{#2}#1% + \HOpatch@Try{AtEndOfPackageFile}{#2}#1% +} +\def\HOpatch@Try#1#2#3{% + \ltx@ifundefined{#1}{}{% + \csname #1\endcsname{#2}{#3}% + }% +} +\AtBeginDocument{\HOpatch@list} +\ltx@ifundefined{AtEndPreamble}{}{% + \AtEndPreamble{\HOpatch@list}% +} +\ltx@ifundefined{AfterEndPreamble}{}{% + \AfterEndPreamble{% + \let\HOpatch@OrgIfPackageLoaded\@ifpackageloaded + \let\HOpatch@OrgIfPackageLater\@ifpackagelater + \let\HOpatch@OrgIfClassLoaded\@ifclassloaded + \let\HOpatch@OrgIfClassLater\@ifclasslater + \let\@ifpackageloaded\ltx@ifpackageloaded + \let\@ifpackagelater\ltx@ifpackagelater + \let\@ifclassloaded\ltx@ifclassloaded + \let\@ifclasslater\ltx@ifclasslater + \HOpatch@list + \let\@ifpackageloaded\HOpatch@OrgIfPackageLoaded + \let\@ifpackagelater\HOpatch@OrgIfPackageLater + \let\@ifclassloaded\HOpatch@OrgIfClassLoaded + \let\@ifclasslater\HOpatch@OrgIfClassLater + }% +} +\HOpatch@AtEnd% +\endinput +%% +%% End of file `hopatch.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty index 21429ff6084..4bbab81e8be 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hycolor.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -35,8 +35,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hycolor}% - [2009/12/12 v1.6 Color options of hyperref/bookmark (HO)]% -\RequirePackage{xcolor-patch}[2009/12/12] + [2011/01/30 v1.7 Color options of hyperref/bookmark (HO)]% +\RequirePackage{xcolor-patch}[2011/01/30] \begingroup \catcode`\!=13 % \catcode`\:=13 % diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty index 2c8f27cc56e..194d0f67bc5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1999-2001, 2006-2008 by +%% Copyright (C) 1999-2001, 2006-2008, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,11 +31,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypcap}% - [2008/09/08 v1.10 Adjusting anchors of captions (HO)] + [2011/02/16 v1.11 Adjusting anchors of captions (HO)] \@ifundefined{hyper@@anchor}{% \PackageError{hypcap}{You have to load 'hyperref' first}\@ehc \endinput }{} +\RequirePackage{letltxmacro}[2008/06/24] \newcommand*\hc@org@caption{} \let\hc@org@caption\caption \newif\if@capstart @@ -97,8 +98,8 @@ } \def\hc@redef#1#2#3{% \newcommand#1{}% - \expandafter\let\expandafter#1\csname#3\endcsname - \expandafter\let\expandafter#2\csname end#3\endcsname + \expandafter\LetLtxMacro\expandafter#1\csname#3\endcsname + \expandafter\LetLtxMacro\expandafter#2\csname end#3\endcsname \renewenvironment*{#3}[1][]{% \ifx\\##1\\% #1\relax diff --git a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty index 8bb492be242..5e7e9bfc583 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/inputenx.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -43,9 +43,34 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{inputenx}% - [2010/01/11 v1.6 Enhanced input encoding handling (HO)]% + [2011/04/10 v1.8 Enhanced input encoding handling (HO)]% \providecommand*{\CurrentInputEncodingName}{} \providecommand*{\CurrentInputEncodingOption}{} +\def\IEX@SetFileCatcodes{% + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\^=7 % + \catcode`\@=11 % + \catcode`\~=\active + \catcode`\%=14 % + \catcode`\`=12 % +} +\def\IEX@SaveFileCatcodes{% + \edef\IEX@RestoreFileCatcodes{% + \catcode`\noexpand\\=\the\catcode`\\\relax + \catcode`\noexpand\{=\the\catcode`\{\relax + \catcode`\noexpand\}=\the\catcode`\}\relax + \catcode`\noexpand\#=\the\catcode`\#\relax + \catcode`\noexpand\^=\the\catcode`\^\relax + \catcode`\noexpand\@=\the\catcode`\@\relax + \catcode`\noexpand\~=\the\catcode`\~\relax + \catcode`\noexpand\%=\the\catcode`\%\relax + \catcode`\noexpand\`=\the\catcode`\`\relax + \catcode`\noexpand\<=\the\catcode`\<\relax + }% +} \def\IEX@LookupEncoding#1{% \edef\CurrentInputEncodingName{#1}% \@onelevel@sanitize\CurrentInputEncodingName @@ -86,6 +111,7 @@ } \def\IEX@DoLookup{% \begingroup + \IEX@SetFileCatcodes \advance\endlinechar\@M \IfFileExists{ix-alias.cfg}{% \input{ix-alias.cfg}% @@ -160,7 +186,10 @@ \IEX@LookupEncoding\InputEncodingNew \ifx\CurrentInputEncodingOption\@empty \else + \IEX@SaveFileCatcodes + \IEX@SetFileCatcodes \inputencoding{\CurrentInputEncodingOption}% + \IEX@RestoreFileCatcodes \fi \IEX@AfterHook } diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def index a268146d4ba..8b652127c0c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-alias.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -41,7 +41,7 @@ %% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, %% inputenx-utf8enc.txt. %% -\ProvidesFile{ix-alias.def}[2010/01/11 v1.6 Alias list (inputenx)] +\ProvidesFile{ix-alias.def}[2011/04/10 v1.8 Alias list (inputenx)] \InputenxAlias{ascii}{x-ascii} \InputenxAlias{atarist}{x-atarist} \InputenxAlias{iso-8859-1}{x-iso-8859-1} @@ -99,6 +99,7 @@ \InputenxAlias{macukr}{x-mac-cyrillic} \InputenxAlias{next}{x-nextstep} \InputenxAlias{us-ascii}{x-ascii} +\InputenxAlias{verbatim}{x-verbatim} \endinput %% %% End of file `ix-alias.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def index 20a5dd69fbf..cfcf28a8834 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-math.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-math.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-math.def}% - [2010/01/11 v1.6 Math list (inputenx)]% + [2011/04/10 v1.8 Math list (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareMathMeaning{\ss}{\beta} diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def index 09c22b29b08..006910a1fea 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-name.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-name.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-name.def}% - [2010/01/11 v1.6 Name list (inputenx)]% + [2011/04/10 v1.8 Name list (inputenx)]% \InputenxName{AE}{00C6}% LATIN CAPITAL LETTER AE \InputenxName{Aacute}{00C1}% LATIN CAPITAL LETTER A WITH ACUTE \InputenxName{Abreve}{0102}% LATIN CAPITAL LETTER A WITH BREVE diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def index 3bd21bb9357..7c7da332805 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-slot.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-slot.def}% - [2010/01/11 v1.6 SLOT and UC to Encodings (inputenx)]% + [2011/04/10 v1.8 SLOT and UC to Encodings (inputenx)]% \InputenxSlot{128}{00A0}{\do{nextstep}} \InputenxSlot{128}{00C4}{\do{mac-centeuro}\do{mac-roman}} \InputenxSlot{128}{00C7}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def index 99c974ca99a..4dc31a11ad8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-uc.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-uc.def}% - [2010/01/11 v1.6 UC to LICR (inputenx)]% + [2011/04/10 v1.8 UC to LICR (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \InputenxUC{00A0}{\nobreakspace}{} @@ -250,7 +250,7 @@ \InputenxUC{0120}{\.G}{} \InputenxUC{0121}{\.g}{} \InputenxUC{0122}{\c G}{} -\InputenxUC{0123}{\v g}{} +\InputenxUC{0123}{\c g}{} \InputenxUC{0124}{\^H}{} \InputenxUC{0125}{\^h}{} \InputenxUC{0126}{\textmalteseH}{% @@ -360,6 +360,27 @@ \textit{f}% }% } +\InputenxUC{01CD}{\v A}{} +\InputenxUC{01CE}{\v a}{} +\InputenxUC{01CF}{\v I}{} +\InputenxUC{01D0}{\v\i}{} +\InputenxUC{01D1}{\v O}{} +\InputenxUC{01D2}{\v o}{} +\InputenxUC{01D3}{\v U}{} +\InputenxUC{01D4}{\v u}{} +\InputenxUC{01E2}{\@tabacckludge=\AE}{} +\InputenxUC{01E3}{\@tabacckludge=\ae}{} +\InputenxUC{01E6}{\v G}{} +\InputenxUC{01E7}{\v g}{} +\InputenxUC{01E8}{\v K}{} +\InputenxUC{01E9}{\v k}{} +\InputenxUC{01F0}{\v\j}{} +\InputenxUC{01F4}{\@tabacckludge'G}{} +\InputenxUC{01F5}{\@tabacckludge'g}{} +\InputenxUC{01F8}{\@tabacckludge`N}{} +\InputenxUC{01F9}{\@tabacckludge`n}{} +\InputenxUC{01FC}{\@tabacckludge'\AE}{} +\InputenxUC{01FD}{\@tabacckludge'\ae}{} \InputenxUC{0218}{\textcommabelow S}{% \ProvideTextCommandDefault{\textcommabelow}[1]{% \hmode@bgroup @@ -424,6 +445,14 @@ \egroup }% } +\InputenxUC{0226}{\.A}{} +\InputenxUC{0227}{\.a}{} +\InputenxUC{0228}{\c E}{} +\InputenxUC{0229}{\c e}{} +\InputenxUC{022E}{\.O}{} +\InputenxUC{022F}{\.o}{} +\InputenxUC{0232}{\@tabacckludge=y}{} +\InputenxUC{0237}{\j}{} \InputenxUC{02C6}{\textasciicircum}{} \InputenxUC{02C7}{\textasciicaron}{% \ProvideTextCommandDefault{\textasciicaron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu index ac76104ad4c..7ca8d43441b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu +++ b/Master/texmf-dist/tex/latex/oberdiek/ix-utf8enc.dfu @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{ix-utf8enc.dfu}% - [2010/01/11 v1.6 Additions of inputenx for utf8enc.dfu]% + [2011/04/10 v1.8 Additions of inputenx for utf8enc.dfu]% \DeclareUnicodeCharacter{00A0}{\nobreakspace} \DeclareUnicodeCharacter{00AD}{\-} \DeclareUnicodeCharacter{0100}{\@tabacckludge=A} @@ -60,7 +60,7 @@ \DeclareUnicodeCharacter{0120}{\.G} \DeclareUnicodeCharacter{0121}{\.g} \DeclareUnicodeCharacter{0122}{\c G} -\DeclareUnicodeCharacter{0123}{\v g} +\DeclareUnicodeCharacter{0123}{\c g} \DeclareUnicodeCharacter{0124}{\^H} \DeclareUnicodeCharacter{0125}{\^h} \DeclareUnicodeCharacter{0126}{\textmalteseH} @@ -100,6 +100,37 @@ \DeclareUnicodeCharacter{0175}{\^w} \DeclareUnicodeCharacter{0176}{\^Y} \DeclareUnicodeCharacter{0177}{\^y} +\DeclareUnicodeCharacter{01CD}{\v A} +\DeclareUnicodeCharacter{01CE}{\v a} +\DeclareUnicodeCharacter{01CF}{\v I} +\DeclareUnicodeCharacter{01D0}{\v\i} +\DeclareUnicodeCharacter{01D1}{\v O} +\DeclareUnicodeCharacter{01D2}{\v o} +\DeclareUnicodeCharacter{01D3}{\v U} +\DeclareUnicodeCharacter{01D4}{\v u} +\DeclareUnicodeCharacter{01E2}{\@tabacckludge=\AE} +\DeclareUnicodeCharacter{01E3}{\@tabacckludge=\ae} +\DeclareUnicodeCharacter{01E6}{\v G} +\DeclareUnicodeCharacter{01E7}{\v g} +\DeclareUnicodeCharacter{01E8}{\v K} +\DeclareUnicodeCharacter{01E9}{\v k} +\DeclareUnicodeCharacter{01F0}{\v\j} +\DeclareUnicodeCharacter{01F4}{\@tabacckludge'G} +\DeclareUnicodeCharacter{01F5}{\@tabacckludge'g} +\DeclareUnicodeCharacter{01F8}{\@tabacckludge`N} +\DeclareUnicodeCharacter{01F9}{\@tabacckludge`n} +\DeclareUnicodeCharacter{01FC}{\@tabacckludge'\AE} +\DeclareUnicodeCharacter{01FD}{\@tabacckludge'\ae} +\DeclareUnicodeCharacter{0226}{\.A} +\DeclareUnicodeCharacter{0227}{\.a} +\DeclareUnicodeCharacter{0228}{\c E} +\DeclareUnicodeCharacter{0229}{\c e} +\DeclareUnicodeCharacter{022E}{\.O} +\DeclareUnicodeCharacter{022F}{\.o} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=Y} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=y} +\DeclareUnicodeCharacter{0232}{\@tabacckludge=y} +\DeclareUnicodeCharacter{0237}{\j} \DeclareUnicodeCharacter{1E02}{\.B} \DeclareUnicodeCharacter{1E03}{\.b} \DeclareUnicodeCharacter{1E0A}{\.D} diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index 944bfd58692..ea8df787840 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -30,34 +30,44 @@ %% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv, %% kvoptions-patch.sty, example-mycolorsetup.sty, %% kvoptions-test1.tex, kvoptions-test2.tex, -%% kvoptions-test3.tex. +%% kvoptions-test3.tex, kvoptions-test4.tex, +%% kvoptions-test4.sty. %% %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. \NeedsTeXFormat{LaTeX2e} -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -69,25 +79,21 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | -\edef\KVO@AtEnd{% - \KVO@AtEnd - \noexpand\endinput -} +\edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \ProvidesPackage{kvoptions-patch}% - [2010/02/22 v3.7 LaTeX patch for keyval options (HO)]% + [2010/12/23 v3.10 LaTeX patch for keyval options (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax \PackageWarningNoLine{kvoptions-patch}{% Package loading is aborted, because e-TeX is missing% }% \expandafter\KVO@AtEnd -\fi +\fi% \RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \else @@ -97,7 +103,7 @@ before \string\documentclass% }\@ehd \expandafter\KVO@AtEnd -\fi +\fi% \@ifpackageloaded{xkvltxp}{% \PackageWarningNoLine{kvoptions}{% Option `patch' cannot be used together with\MessageBreak @@ -105,7 +111,7 @@ Therefore package loading is aborted% }% \KVO@AtEnd -}{} +}{}% \def\@if@ptions#1#2#3{% \begingroup \KVO@normalize\KVO@temp{#3}% @@ -498,7 +504,7 @@ \let\@fileswith@pti@ns\KVO@fileswith@pti@ns \fi \let\KVO@Patch=Y -\KVO@AtEnd +\KVO@AtEnd% \endinput %% %% End of file `kvoptions-patch.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 5ba1a34682a..bf0eecf4b0a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -30,19 +30,24 @@ %% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv, %% kvoptions-patch.sty, example-mycolorsetup.sty, %% kvoptions-test1.tex, kvoptions-test2.tex, -%% kvoptions-test3.tex. +%% kvoptions-test3.tex, kvoptions-test4.tex, +%% kvoptions-test4.sty. %% %% No we don't need the option 'color'. %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@kvoptions.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -50,7 +55,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -62,21 +66,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -95,29 +102,38 @@ \fi \expandafter\x\csname ver@kvoptions.sty\endcsname \ProvidesPackage{kvoptions}% - [2010/02/22 v3.7 Keyval support for LaTeX options (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/12/23 v3.10 Keyval support for LaTeX options (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{1}{14}% ^^A (comment) \TMP@EnsureCode{2}{14}% ^^A (comment) @@ -131,22 +147,17 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` +\edef\KVO@AtEnd{\KVO@AtEnd\noexpand\endinput} \@ifundefined{define@key}{% \RequirePackage{keyval}\relax }{} +\RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{kvsetkeys}[2007/09/29] -\@ifundefined{@onelevel@sanitize}{% - \def\@onelevel@sanitize#1{% - \edef#1{\expandafter\strip@prefix\meaning#1}% - }% -}{} -\@ifundefined{strip@prefix}{% - \def\strip@prefix#1>{}% -}{} \@ifundefined{@x@protect}{% \def\@x@protect#1\fi#2#3{% \fi\protect#1% @@ -162,7 +173,7 @@ \DeclareOption{debugshow}{\catcode\@ne=9 } \DeclareOption{patch}{% \AtEndOfPackage{% - \RequirePackage{kvoptions-patch}[2010/02/22]% + \RequirePackage{kvoptions-patch}[2010/12/23]% }% } \ProcessOptions\relax @@ -182,14 +193,25 @@ \@currname.\@currext\endcsname{#1}% } \def\KVO@prefix{% - \@ifundefined{KVO@prefix@\@currname.\@currext}{% + \ltx@ifundefined{KVO@prefix@\@currname.\@currext}{% \@currname @% }{% \csname KVO@prefix@\@currname.\@currext\endcsname }% } +\define@key{KVO}{setkeys}{% + \expandafter\def\csname KVO@setkeys@% + \@currname.\@currext\endcsname{#1}% +} +\def\KVO@setkeys{% + \ltx@IfUndefined{KVO@setkeys@\@currname.\@currext}{% + \setkeys + }{% + \csname KVO@setkeys@\@currname.\@currext\endcsname + }% +} \newcommand*{\SetupKeyvalOptions}{% - \setkeys{KVO}% + \kvsetkeys{KVO}% } \newcommand*{\DeclareBoolOption}[2][false]{% \KVO@ifdefinable{if\KVO@prefix#2}{% @@ -268,7 +290,7 @@ } \def\KVO@boolkey#1#2#3#4#5{% \edef\KVO@param{#5}% - \@onelevel@sanitize\KVO@param + \ltx@onelevel@sanitize\KVO@param \ifx\KVO@param\KVO@true \expandafter\@firstofone \else @@ -299,8 +321,8 @@ } \def\KVO@true{true} \def\KVO@false{false} -\@onelevel@sanitize\KVO@true -\@onelevel@sanitize\KVO@false +\ltx@onelevel@sanitize\KVO@true +\ltx@onelevel@sanitize\KVO@false \newcommand*{\DeclareStringOption}[2][]{% \@ifnextchar[{% \KVO@DeclareStringOption{#1}{#2}@% @@ -337,7 +359,7 @@ \x }% } -\newcommand*{\DeclareVoidOption}[1]{% +\newcommand*{\DeclareVoidOption}[2]{% \begingroup \let\next\@gobbletwo \KVO@ifdefinable{\KVO@prefix#1}{% @@ -360,7 +382,12 @@ }% }% \x - \@namedef{\KVO@prefix#1}% + \begingroup + \toks@{#2}% + \expandafter\endgroup + \expandafter\def + \csname\KVO@prefix#1\expandafter\endcsname + \expandafter{\the\toks@}% }% } \def\KVO@VOID@{@VOID@} @@ -416,7 +443,7 @@ } \newcommand*{\DisableKeyvalOption}[3][]{% \begingroup - \setkeys{KVOdyn}{#1}% + \kvsetkeys{KVOdyn}{#1}% \def\x{\endgroup}% \@ifundefined{KVO@action@\KVOdyn@action}{% \PackageError{kvoptions}{% @@ -590,7 +617,7 @@ }% ,% }% - \@onelevel@sanitize\KVO@CurrentOption + \ltx@onelevel@sanitize\KVO@CurrentOption \else \edef\KVO@temp{% \KVO@temp @@ -623,7 +650,7 @@ }{% \@ifundefined{KVO@default@\@currname.\@currext}{% \ifx\KVO@Patch Y% - \@onelevel@sanitize\CurrentOption + \ltx@onelevel@sanitize\CurrentOption \fi \ifx\@unusedoptionlist\@empty \global\let\@unusedoptionlist\CurrentOption @@ -672,7 +699,7 @@ }% \edef\KVO@temp{\endgroup \noexpand\KVO@calldefault{\the\toks\tw@}% - \noexpand\setkeys{#1}{\the\toks@}% + \noexpand\KVO@setkeys{#1}{\the\toks@}% }% \KVO@temp \let\CurrentOption\@empty @@ -729,7 +756,7 @@ }% \edef\KVO@temp{\endgroup \noexpand\KVO@calldefault{\the\toks\tw@}% - \noexpand\setkeys{#1}{\the\toks@}% + \noexpand\KVO@setkeys{#1}{\the\toks@}% }% \KVO@temp \let\CurrentOption\@empty @@ -770,7 +797,7 @@ \@ifstar{}\@gobble }% \fi -\KVO@AtEnd +\KVO@AtEnd% \endinput %% %% End of file `kvoptions.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty index 744be21d84e..3a5ddaddbce 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2008 by +%% Copyright (C) 2008, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -31,28 +31,37 @@ %% letltxmacro-showcases.tex, letltxmacro-test1.tex, %% letltxmacro-test2.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname llm@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\llm@AtEnd{% \llm@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{40}{12}% ( \TMP@EnsureCode{41}{12}% ) @@ -61,39 +70,51 @@ \TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \edef\llm@AtEnd{% \llm@AtEnd \escapechar\the\escapechar\relax + \noexpand\endinput } \escapechar=92 % `\\ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{letltxmacro}% - [2008/06/24 v1.3 Let assignment for LaTeX macros (HO)] -\newcommand*{\LetLtxMacro}[2]{% + [2010/09/02 v1.4 Let assignment for LaTeX macros (HO)] +\newcommand*{\LetLtxMacro}{% + \llm@ModeLetLtxMacro{}% +} +\newcommand*{\GlobalLetLtxMacro}{% + \llm@ModeLetLtxMacro\global +} +\newcommand*{\llm@ModeLetLtxMacro}[3]{% + \edef\llm@escapechar{\the\escapechar}% + \escapechar=-1 % \edef\reserved@a{% \noexpand\protect \expandafter\noexpand - \csname\expandafter\@gobble\string#2 \endcsname + \csname\string#3 \endcsname }% - \ifx\reserved@a#2\relax - \edef#1{% + \ifx\reserved@a#3\relax + #1\edef#2{% \noexpand\protect \expandafter\noexpand - \csname\expandafter\@gobble\string#1 \endcsname + \csname\string#2 \endcsname }% - \expandafter\let - \csname\expandafter\@gobble\string#1 \expandafter\endcsname - \csname\expandafter\@gobble\string#2 \endcsname + #1\expandafter\let + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname \expandafter\llm@LetLtxMacro - \csname\expandafter\@gobble\string#1 \expandafter\endcsname - \csname\expandafter\@gobble\string#2 \endcsname + \csname\string#2 \expandafter\endcsname + \csname\string#3 \endcsname{#1}% \else - \llm@LetLtxMacro{#1}{#2}% + \llm@LetLtxMacro{#2}{#3}{#1}% \fi + \escapechar=\llm@escapechar\relax } -\def\llm@LetLtxMacro#1#2{% +\def\llm@LetLtxMacro#1#2#3{% + \escapechar=92 % \expandafter\llm@CheckParams\meaning#2:->\@nil{% \begingroup \def\@protected@testopt{% @@ -122,7 +143,8 @@ \else \edef\x{% \noexpand\@testopt - \expandafter\noexpand\csname\string#2\endcsname + \expandafter\noexpand + \csname\string#2\endcsname }% \expandafter\expandafter\expandafter\def \expandafter\expandafter\expandafter\y @@ -140,19 +162,21 @@ \else \llm@protected\xdef\llm@GlobalTemp{% \llm@testopt - \expandafter\noexpand\csname\string#1\endcsname + \expandafter\noexpand + \csname\string#1\endcsname {\the\toks@}% }% \fi \expandafter\endgroup\ifx\llm@testopt\@empty - \let#1=#2\relax + #3\let#1=#2\relax \else - \let#1=\llm@GlobalTemp - \expandafter\let\csname\string#1\expandafter\endcsname - \csname\string#2\endcsname + #3\let#1=\llm@GlobalTemp + #3\expandafter\let + \csname\string#1\expandafter\endcsname + \csname\string#2\endcsname \fi }{% - \let#1=#2\relax + #3\let#1=#2\relax }% } \def\llm@CheckParams#1:->#2\@nil{% @@ -179,7 +203,7 @@ \@onelevel@sanitize\llm@protectedmacro \def\llm@CarThree#1#2#3#4\llm@nil{#1#2#3}% \def\llm@CarTwo#1#2#3\llm@nil{#1#2}% -\llm@AtEnd +\llm@AtEnd% \endinput %% %% End of file `letltxmacro.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty index 894346ee89d..f7f733264a7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty @@ -32,28 +32,37 @@ %% listingsutf8-test3.tex, listingsutf8-test4.tex, %% listingsutf8-test5.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \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 + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\lstU@AtEnd{% \lstU@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -70,14 +79,15 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{95}{8}% _ (subscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | \TMP@EnsureCode{126}{13}% ~ (active) -\g@addto@macro\lstU@AtEnd{\endinput} +\edef\lstU@AtEnd{\lstU@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] @@ -103,10 +113,10 @@ \expandafter\lstU@AtEnd \fi } -\lstU@temp{scantokens}{It is provided by e-TeX} -\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} +\lstU@temp{scantokens}{It is provided by e-TeX}% +\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{% @@ -150,7 +160,7 @@ }% } \expandafter\lstU@temp\lst@InputListing{#1}\@nil -\lstU@AtEnd +\lstU@AtEnd% \endinput %% %% End of file `listingsutf8.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index 7492c2ee620..ef1b85c3829 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007, 2009, 2010 by +%% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,30 +29,40 @@ %% and the derived files %% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv, %% luacolor-test1.tex, luacolor-test2.tex, luacolor-test3.tex, -%% oberdiek.luacolor.lua, luacolor.lua. +%% oberdiek.luacolor.lua, luacolor.lua, +%% oberdiek.luacolor-pre065.lua, luacolor-pre065.lua. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname LuaCol@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\LuaCol@AtEnd{% \LuaCol@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{34}{12}% " \TMP@EnsureCode{39}{12}% ' @@ -66,28 +76,31 @@ \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{95}{12}% _ (other!) \TMP@EnsureCode{96}{12}% ` -\edef\LuaCol@AtEnd{% - \LuaCol@AtEnd - \noexpand\endinput -} +\edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2010/03/09 v1.2 Coloring based on LuaTeX's node attributes (HO)] + [2011/03/29 v1.4 Coloring based on LuaTeX's node attributes (HO)] \RequirePackage{infwarerr}[2007/09/09]% \RequirePackage{ifluatex}[2009/04/10]% +\RequirePackage{ifpdf}[2010/01/28]% +\RequirePackage{ltxcmds}[2010/04/26]% \RequirePackage{color} \ifluatex - \RequirePackage{luatex}[2010/03/09]% + \ltx@ifpackageloaded{luatexbase-attr}{% + }{% + \RequirePackage{luatex}[2010/03/09]% + }% \else \@PackageError{luacolor}{% This package may only be run using LuaTeX% }\@ehc \expandafter\LuaCol@AtEnd -\fi +\fi% \ifnum\luatexversion<36 % \def\LuaCol@directlua{\directlua0 }% \else @@ -98,10 +111,14 @@ \@PackageWarningNoLine{luacolor}{% Colors are disabled by option `monochrome'% }% + \def\set@color{}% + \def\reset@color{}% + \def\set@page@color{}% + \def\define@color#1#2{}% \expandafter\LuaCol@AtEnd -\fi +\fi% \LuaCol@directlua{% - require("oberdiek.luacolor")% + require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% } \RequirePackage{ifpdf}[2007/09/09] \ifpdf @@ -130,15 +147,24 @@ \@PackageInfoNoLine{luacolor}{% Type of color \string\special: \reserved@a }% - \fi + \fi% \endgroup \fi -\newattribute\LuaCol@Attribute +\ltx@IfUndefined{newluatexattribute}{% + \newattribute\LuaCol@Attribute +}{% + \newluatexattribute\LuaCol@Attribute +} +\ltx@IfUndefined{setluatexattribute}{% + \let\LuaCol@setattribute\setattribute +}{% + \let\LuaCol@setattribute\setluatexattribute +} \LuaCol@directlua{% oberdiek.luacolor.setattribute(\number\allocationnumber)% } \protected\def\set@color{% - \setattribute\LuaCol@Attribute{% + \LuaCol@setattribute\LuaCol@Attribute{% \LuaCol@directlua{% oberdiek.luacolor.get("\luatexluaescapestring{\current@color}")% }% @@ -155,7 +181,44 @@ \luacolorProcessBox\AtBeginShipoutBox } \set@color -\LuaCol@AtEnd +\ifpdf + \ltx@IfUndefined{pdfxform}{% + \ifnum\luatexversion>36 % + \directlua{% + tex.enableprimitives('',{% + 'pdfxform','pdflastxform','pdfrefxform'% + })% + }% + \fi + }{}% + \ltx@IfUndefined{protected}{% + \ifnum\luatexversion>36 % + \directlua{tex.enableprimitives('',{'protected'})}% + \fi + }{}% + \ltx@IfUndefined{pdfxform}{% + \@PackageWarning{luacolor}{\string\pdfxform\space not found}% + }{% + \let\LuaCol@org@pdfxform\pdfxform + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname protected\endcsname\relax + \@PackageWarning{luacolor}{\string\protected\space not found}% + \else + \expandafter\protected + \fi + \def\pdfxform{% + \begingroup + \afterassignment\LuaCol@pdfxform + \count@=% + }% + \def\LuaCol@pdfxform{% + \luacolorProcessBox\count@ + \LuaCol@org@pdfxform\count@ + \endgroup + }% + }% +\fi +\LuaCol@AtEnd% \endinput %% %% End of file `luacolor.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pagegrid.sty b/Master/texmf-dist/tex/latex/oberdiek/pagegrid.sty index f8bcc81406b..60f2670d004 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pagegrid.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pagegrid.sty @@ -25,22 +25,23 @@ %% %% This Current Maintainer of this work is Heiko Oberdiek. %% -%% The Base Interpreter refers to any `TeX-Format', -%% because some files are installed in TDS:tex/generic//. -%% %% This work consists of the main source file pagegrid.dtx %% and the derived files %% pagegrid.sty, pagegrid.pdf, pagegrid.ins, pagegrid.drv, %% pagegrid-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@pagegrid.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -48,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -60,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -93,29 +96,38 @@ \fi \expandafter\x\csname ver@pagegrid.sty\endcsname \ProvidesPackage{pagegrid}% - [2009/12/04 v1.4 Print page grid in background (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2009/12/04 v1.4 Print page grid in background (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname pagegrid@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\pagegrid@AtEnd{% \pagegrid@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{9}{10}% (tab) \TMP@EnsureCode{10}{12}% ^^J @@ -135,14 +147,15 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{95}{8}% _ (subscript) \TMP@EnsureCode{96}{12}% ` \TMP@EnsureCode{124}{12}% | +\edef\pagegrid@AtEnd{\pagegrid@AtEnd\noexpand\endinput} \RequirePackage{tikz} \RequirePackage{atbegshi}[2009/12/02] \RequirePackage{kvoptions}[2009/07/17] @@ -394,7 +407,7 @@ \fi \fi } -\pagegrid@AtEnd +\pagegrid@AtEnd% \endinput %% %% End of file `pagegrid.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty b/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty index 71892655052..319f56341e4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/pmboxdraw.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by +%% Copyright (C) 2006, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,31 +28,360 @@ %% This work consists of the main source file pmboxdraw.dtx %% and the derived files %% pmboxdraw.sty, pmboxdraw.pdf, pmboxdraw.ins, pmboxdraw.drv, -%% pmboxdrawenc.dfu. +%% pmboxdrawenc.dfu, pmboxdraw-test1.tex. %% -\NeedsTeXFormat{LaTeX2e} +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@pmboxdraw.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{pmboxdraw}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pmboxdraw.sty\endcsname \ProvidesPackage{pmboxdraw}% - [2006/05/03 v1.0 Poor man's box drawing characters (HO)]% -\DeclareFontEncoding{pmboxdraw}{}{} -\DeclareFontFamily{pmboxdraw}{pmboxdraw}{} -\DeclareFontShape{pmboxdraw}{pmboxdraw}{m}{n}{ <-> cmr10 }{} -\DeclareFontSubstitution{pmboxdraw}{pmboxdraw}{m}{n} -\newcommand*{\pmboxdrawbox}[1]{% + [2011/03/24 v1.1 Poor man's box drawing characters (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname pmbd@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\pmbd@AtEnd{% + \pmbd@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{38}{4}% & +\TMP@EnsureCode{39}{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{60}{12}% < +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\pmbd@AtEnd{\pmbd@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% +\else + \let\TMP@RequirePackage\RequirePackage +\fi +\TMP@RequirePackage{ltxcmds}[2010/12/12]% +\TMP@RequirePackage{kvsetkeys}[2011/01/30]% +\TMP@RequirePackage{kvdefinekeys}[2011/01/30]% +\TMP@RequirePackage{infwarerr}[2010/04/08]% +\ltx@newif\ifpmbd@latex +\ltx@IfUndefined{fmtname}{}{% + \def\pmbd@tmp{LaTeX2e}% + \ifx\pmbd@tmp\fmtname + \pmbd@latextrue + \fi +} +\ifpmbd@latex + \DeclareFontEncoding{pmboxdraw}{}{}% + \DeclareFontFamily{pmboxdraw}{pmboxdraw}{}% + \DeclareFontShape{pmboxdraw}{pmboxdraw}{m}{n}{ <-> cmr10 }{}% + \DeclareFontSubstitution{pmboxdraw}{pmboxdraw}{m}{n}% + \RequirePackage{kvoptions}[2010/02/22]% + \SetupKeyvalOptions{% + family=PMBD,% + prefix=pmbd@% + }% +\fi +\ltx@IfUndefined{dimexpr}{% + \catcode36=9 % + \catcode38=14 % +}{% + \catcode36=14 % + \catcode38=9 % +} +\ltx@IfUndefined{protected}{% + \def\pmbd@ProtectedDef#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\DeclareRobustCommand*#1}% + }% + \pmbd@temp + }% + \def\pmbd@ProtectedDefOne#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\DeclareRobustCommand*#1[1]}% + }% + \pmbd@temp + }% +}{% + \def\pmbd@ProtectedDef#1{% + \let\pmbd@temp\ltx@gobble + \@ifdefinable#1{% + \def\pmbd@temp{\protected\def#1}% + }% + \pmbd@temp + }% + \def\pmbd@ProtectedDefOne#1{% + \let\pmbd@temp\ltx@gobblethree + \@ifdefinable#1{% + \def\pmbd@temp{\protected\def#1}% + }% + \pmbd@temp##1% + }% +} +\pmbd@ProtectedDef\pmboxdrawsetup{% + \kvsetkeys{PMBD}% +} +\catcode47=11 % +\def\pmbd@temp#1#2{% + \DeclareStringOption[\width]{#1/width}% + \DeclareStringOption[\height]{#1/height}% + \DeclareStringOption[\depth]{#1/depth}% + \DeclareStringOption[{#2}]{#1/box/default}% + \expandafter\DeclareStringOption\expandafter[% + \csname pmbd@#1/box/default\endcsname + ]{#1/box}% +} +\pmbd@temp{BoxDrawing}{\strut0}% +\pmbd@temp{Block}{% + \begingroup + \sbox\z@{\strut}% + \dimen@=\ht\z@ + \advance\dimen@\dp\z@ + \wd\z@=\dimen@ + \box\z@ + \endgroup +}% +\pmbd@temp{Shade}{% + \begingroup + \sbox\z@{\strut}% + \dimen@=\ht\z@ + \advance\dimen@\dp\z@ + \wd\z@=\dimen@ + \box\z@ + \endgroup +}% +\pmbd@temp{TerminalGraphic}{% + \begingroup + \sbox\z@{\"A}% + \wd\z@=\ht\z@ + \dp\z@=\z@ + \box\z@ + \endgroup +}% +\DeclareStringOption[.1\width]{BoxDrawing/thinlinewidth} +\DeclareStringOption[.25\width]{BoxDrawing/thicklinewidth} +\DeclareStringOption[.25\width]{BoxDrawing/doublelinesep} +\DeclareStringOption[\strut0]{box} %% +\DeclareStringOption[.1\width]{rulewidth} +\DeclareStringOption[.25\width]{doublerulesep} +\pmbd@ProtectedDefOne\pmboxdrawUniRobust{% + \comma@parse{#1}{% + \ltx@IfUndefined{pmbd@U+\comma@entry}{% + \begingroup\expandafter\endgroup + \expandafter + \TextSymbolUnavailable\csname U+\comma@entry\endcsname + }{% + \csname pmbd@U+\comma@entry\endcsname + }% + \@gobble + }% +} +\newcommand*{\pmboxdrawuni}[1]{% + \ifx\texorpdfstring\ltx@undefined + \expandafter\ltx@firstoftwo + \else + \ifx\texorpdfstring\relax + \expandafter\expandafter\expandafter\ltx@firstoftwo + \else + \expandafter\expandafter\expandafter\texorpdfstring + \fi + \fi + {% + \pmboxdrawUniRobust{#1}% + }{% + \expandafter\ifx\csname ifHy@unicode\expandafter\endcsname + \csname iftrue\endcsname + \expandafter\unichar\expandafter{\number"#1}% + \fi + }% +} +\pmbd@ProtectedDefOne\pmboxdrawbox{% \def\pmbd@box{#1}% } -\pmboxdrawbox{\strut0} -\newcommand*{\pmboxdrawrulewidth}[1]{% +\pmbd@ProtectedDefOne\pmboxdrawrulewidth{% \def\pmbd@rulewidth{#1}% } -\pmboxdrawrulewidth{.1\width} -\newcommand*{\pmboxdrawdoublerulesep}[1]{% +\pmbd@ProtectedDefOne\pmboxdrawdoublerulesep{% \def\pmbd@doublerulesep{#1}% } -\pmboxdrawdoublerulesep{.25\width} +\def\pmbd@UniDef#1#2{% + \expandafter\pmbd@ProtectedDef\expandafter#1\expandafter{% + \csname pmbd@U+#2\endcsname + }% +} +\ltx@ifpackageloaded{calc}{% + \def\pmbd@SetLength{% + \setlength + }% +}{% + \ltx@IfUndefined{dimexpr}{% + \def\pmbd@SetDim#1#2{% + #1=#2\relax + }% + }{% + \def\pmbd@SetDim#1#2{% + #1=\dimexpr#2\relax + }% + }% + \def\pmbd@SetLength{% + \ltx@ifpackageloaded{calc}{% + \setlength + }{% + \pmbd@SetDim + }% + }% + \AtBeginDocument{% + \ltx@ifpackageloaded{calc}{% + \def\pmbd@SetLength{\setlength}% + }{% + \let\pmbd@SetLength\pmbd@SetDim + }% + }% +} +\newdimen\pmbd@W +\newdimen\pmbd@H +\newdimen\pmbd@L +\newdimen\pmbd@Thin +\newdimen\pmbd@Thick +\newdimen\pmbd@Sep +\dimendef\pmbd@A=2 % +\dimendef\pmbd@B=4 % +\dimendef\pmbd@C=6 % +\dimendef\pmbd@D=8 % +\def\pmbd@BeginBox#1{% + \ltx@leavevmode + \@begin@tempboxa\hbox{% + \csname pmbd@#1/box\endcsname + }% + \pmbd@SetLength\pmbd@W{% + \csname pmbd@#1/width\endcsname + }% + \pmbd@SetLength\pmbd@H{% + \csname pmbd@#1/height\endcsname + }% + \pmbd@SetLength\pmbd@L{% + \csname pmbd@#1/depth\endcsname + }% + \advance\pmbd@H\pmbd@L + \setbox\ltx@zero\hbox to \pmbd@W\bgroup +} +\def\pmbd@EndBox{% + \hss + \egroup + \ht\ltx@zero=\pmbd@H + \dp\ltx@zero=\z@ + \ifdim\pmbd@L=\z@ + \else + \lower\pmbd@L + \fi + \box\ltx@zero + \@end@tempboxa +} +\def\pmbd@Rule#1#2#3{% + \vrule\@width#1\@height#2\@depth#3\relax +} \def\pmbd@begin{% \begingroup - \setbox\z@\hbox{\pmbd@box}% - \leavevmode + \sbox\z@{\pmbd@box}% + \ltx@leavevmode \setbox\tw@\hb@xt@\wd\z@\bgroup } \def\pmbd@end{% @@ -62,253 +391,2039 @@ \box\tw@ \endgroup } -\DeclareTextCommandDefault{\textupblock}{% - \pmbd@begin - \dimen@-\ht\z@ - \advance\dimen@\dp\z@ - \vrule\@width\wd\z@\@depth.5\dimen@ - \pmbd@end +\def\pmbd@LowerBlock#1{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W{#1\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textdnblock}{% - \pmbd@begin - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \vrule\@width\wd\z@\@height.5\dimen@ - \pmbd@end +\def\pmbd@LeftBlock#1{% + \pmbd@BeginBox{Block}% + \pmbd@Rule{#1\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textblock}{% - \pmbd@begin - \vrule\@width\wd\z@ - \pmbd@end +\pmbd@UniDef\textupblock{2580} +\@namedef{pmbd@U+2580}{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textlfblock}{% - \pmbd@begin - \vrule\@width.5\wd\z@ - \hfill - \pmbd@end +\@namedef{pmbd@U+2581}{% + \pmbd@LowerBlock{.125}% } -\DeclareTextCommandDefault{\textrtblock}{% - \pmbd@begin - \hfill - \vrule\@width.5\wd\z@ - \pmbd@end +\@namedef{pmbd@U+2582}{% + \pmbd@LowerBlock{.25}% } -\DeclareTextCommandDefault{\textltshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textltshade - }{% - \textcolor[gray]{.75}% - }{% - \vrule\@width\wd\z@ - }% - \pmbd@end +\@namedef{pmbd@U+2583}{% + \pmbd@LowerBlock{.375}% } -\DeclareTextCommandDefault{\textshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textshade - }{% - \textcolor[gray]{.5}% - }{% - \vrule\@width\wd\z@ - }% - \pmbd@end +\pmbd@UniDef\textdnblock{2584} +\@namedef{pmbd@U+2584}{% + \pmbd@LowerBlock{.5}% } -\DeclareTextCommandDefault{\textdkshade}{% - \pmbd@begin - \@ifundefined{textcolor}{% - \pmbd@colorwarning\textdkshade +\@namedef{pmbd@U+2585}{% + \pmbd@LowerBlock{.625}% +} +\@namedef{pmbd@U+2586}{% + \pmbd@LowerBlock{.75}% +} +\@namedef{pmbd@U+2587}{% + \pmbd@LowerBlock{.875}% +} +\pmbd@UniDef\textblock{2588} +\@namedef{pmbd@U+2588}{% + \pmbd@LowerBlock{}% +} +\@namedef{pmbd@U+2589}{% + \pmbd@LeftBlock{.875}% +} +\@namedef{pmbd@U+258A}{% + \pmbd@LeftBlock{.75}% +} +\@namedef{pmbd@U+258B}{% + \pmbd@LeftBlock{.625}% +} +\pmbd@UniDef\textlfblock{258C} +\@namedef{pmbd@U+258C}{% + \pmbd@LeftBlock{.5}% +} +\@namedef{pmbd@U+258D}{% + \pmbd@LeftBlock{.375}% +} +\@namedef{pmbd@U+258E}{% + \pmbd@LeftBlock{.25}% +} +\@namedef{pmbd@U+258F}{% + \pmbd@LeftBlock{.125}% +} +\pmbd@UniDef\textrtblock{2590} +\@namedef{pmbd@U+2590}{% + \pmbd@BeginBox{Block}% + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2594}{% + \pmbd@BeginBox{Block}% + \pmbd@Rule\pmbd@W\pmbd@H{-.875\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2595}{% + \pmbd@BeginBox{Block}% + \kern.875\pmbd@W + \pmbd@Rule{.125\pmbd@W}\pmbd@H\z@ + \pmbd@EndBox +} +\def\pmbd@Shade#1#2{% + \pmbd@BeginBox{Shade}% + \ltx@ifundefined{textcolor}{% + \pmbd@colorwarning{#1}% }{% - \textcolor[gray]{.25}% + \textcolor[gray]{\csname pmbd@Shade/#2\endcsname}% }{% - \vrule\@width\wd\z@ + \pmbd@Rule\pmbd@W\pmbd@H\z@ }% - \pmbd@end + \pmbd@EndBox +} +\DeclareStringOption[.75]{Shade/light} +\pmbd@UniDef\textltshade{2591} +\@namedef{pmbd@U+2591}{% + \pmbd@Shade{2591}{light}% +} +\DeclareStringOption[.5]{Shade/medium} +\pmbd@UniDef\textshade{2592} +\@namedef{pmbd@U+2592}{% + \pmbd@Shade{2592}{medium}% +} +\DeclareStringOption[.25]{Shade/dark} +\pmbd@UniDef\textdkshade{2593} +\@namedef{pmbd@U+2593}{% + \pmbd@Shade{2593}{dark}% } \def\pmbd@colorwarning#1{% \PackageWarning{pmboxdraw}{% - \string#1\space requires package \string`color\string'\MessageBreak + U+#1 requires package \string`color\string'\MessageBreak }% \@firstofone } -\def\pmbd@beginA{% - \pmbd@begin - \def\width{\wd\z@}% - \def\height{\ht\z@}% - \def\depth{\dp\z@}% - \setlength{\dimen@}{\pmbd@rulewidth}% - \edef\pmbd@rulewidth{\number\dimen@ sp}% +\def\pmbd@BeginTerminal{% + \pmbd@BeginBox{TerminalGraphic}% } -\DeclareTextCommandDefault{\textSFx}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+2596}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxi}{% - \pmbd@beginA - \hss - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\@namedef{pmbd@U+2597}{% + \pmbd@BeginTerminal + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFi}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+2598}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFiii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+2599}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth-.5\dimen\tw@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+259A}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFiv}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth-.5\dimen\tw@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+259B}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFviii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth\dp\z@ - \hss - }% - }% - \hfill - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\@namedef{pmbd@U+259C}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFix}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height\ht\z@\@depth\dp\z@ - \hss - }% - }% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \hfill - \pmbd@end +\@namedef{pmbd@U+259D}{% + \pmbd@BeginTerminal + \kern.5\pmbd@W + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFvi}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\@namedef{pmbd@U+259E}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}{-.5\pmbd@H}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFvii}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@depth-.5\dimen\tw@ - \hss - \pmbd@end +\@namedef{pmbd@U+259F}{% + \pmbd@BeginTerminal + \pmbd@Rule{.5\pmbd@W}{.5\pmbd@H}\z@ + \pmbd@Rule{.5\pmbd@W}{\pmbd@H}\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFv}{% - \pmbd@beginA - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\def\pmbd@BeginDraw#1#2{% + \pmbd@BeginBox{BoxDrawing}% + \ifx#1X% + \pmbd@SetLength\pmbd@Thin\pmbd@BoxDrawing/thinlinewidth% + \fi + \ifx#2X% + \pmbd@SetLength\pmbd@Thick\pmbd@BoxDrawing/thicklinewidth% + \fi +} +\pmbd@UniDef\textSFx{2500} +\@namedef{pmbd@U+2500}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + \pmbd@EndBox +} +\@namedef{pmbd@U+2501}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFxi{2502} +\@namedef{pmbd@U+2502}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2503}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFi{250C} +\@namedef{pmbd@U+250C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+250F}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFiii{2510} +\@namedef{pmbd@U+2510}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2511}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2512}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2513}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFii{2514} +\@namedef{pmbd@U+2514}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2515}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2516}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2517}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFiv{2518} +\@namedef{pmbd@U+2518}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2519}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFviii{251C} +\@namedef{pmbd@U+251C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+251D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+251E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+251F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2520}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2521}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2522}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +$ }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \rlap{% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2523}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFix{2524} +\@namedef{pmbd@U+2524}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2525}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2526}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \kern.5\pmbd@D +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2527}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \kern.5\pmbd@D +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2528}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2529}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+252A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+252B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\pmbd@UniDef\textSFvi{252C} +\@namedef{pmbd@U+252C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252D}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \kern\pmbd@C +$ \advance\pmbd@C-\pmbd@W +$ \pmbd@Rule{-\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+252F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2530}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2531}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2532}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2533}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\pmbd@UniDef\textSFvii{2534} +\@namedef{pmbd@U+2534}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2535}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2536}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \kern\pmbd@C +$ \advance\pmbd@C-\pmbd@W +$ \pmbd@Rule{-\pmbd@C}\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2537}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2538}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2539}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+253A}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \rlap{% +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& }% +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+253B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\pmbd@UniDef\textSFv{253C} +\@namedef{pmbd@U+253C}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+253D}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+253E}{% + \pmbd@BeginDraw XX% + \rlap{% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+253F}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thick\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2540}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2541}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2542}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2543}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2544}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thin\relax}% +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2545}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thin\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A\pmbd@B + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2546}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thin +$ \pmbd@C=.5\pmbd@C +$ \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B +$ \kern-\pmbd@Thin +$ \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thin\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thin\relax}% +& \pmbd@A\pmbd@B +& \kern-\pmbd@Thin +& \pmbd@Rule\pmbd@Thin\pmbd@H\pmbd@B + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}% +& \pmbd@A{-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2547}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +$ }% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@B=\dimexpr-\pmbd@A+\pmbd@Thick\relax +& \rlap{% +& \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& }% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@H\pmbd@B + \pmbd@EndBox +} +\@namedef{pmbd@U+2548}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \rlap{% +$ \kern.5\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +$ }% +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \rlap{% +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \pmbd@Rule\pmbd@Thick\pmbd@A\z@ +& }% +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2549}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@C}\pmbd@A\pmbd@B +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\dimexpr\pmbd@W+\pmbd@Thick\relax}% +& \pmbd@A{\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +& \kern-\pmbd@Thick +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+254A}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thin\relax} + }% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \pmbd@C=.5\pmbd@C +$ \pmbd@D=\pmbd@W +$ \advance\pmbd@D-\pmbd@C +$ \kern\pmbd@C +$ \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +$ \kern-\pmbd@Thick +$ \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@C=.5\dimexpr\pmbd@W-\pmbd@Thick\relax +& \kern\pmbd@C +& \pmbd@Rule\pmbd@Thick\pmbd@H\z@ +& \kern-\pmbd@Thick +& \pmbd@Rule{\dimexpr\pmbd@W-\pmbd@C\relax}\pmbd@A +& {-\dimexpr\pmbd@A-\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+254B}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \dimen@=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule\pmbd@W\dimen@{-\dimexpr\dimen@-\pmbd@Thick\relax}% + \kern-\pmbd@W +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \kern\pmbd@A +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H\z@ + \pmbd@EndBox +} +\def\pmbd@BeginDouble{% + \pmbd@BeginDraw X-% + \pmbd@SetLength\pmbd@Sep\pmbd@BoxDrawing/doublelinesep% } \def\pmbd@beginB{% \pmbd@beginA @@ -320,145 +2435,146 @@ \advance\dimen@\pmbd@rulewidth \edef\pmbd@doublesepV{\number\dimen@ sp}% } -\DeclareTextCommandDefault{\textSFxliii}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - \pmbd@end +\pmbd@UniDef\textSFxliii{2550} +\@namedef{pmbd@U+2550}{% + \pmbd@BeginDouble +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A-\pmbd@Sep +$ \pmbd@A=.5\pmbd@A +& \pmbd@A=.5\dimexpr\pmbd@H-\pmbd@Sep\relax +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \kern-\pmbd@W +$ \advance\pmbd@A\pmbd@Sep +$ \advance\pmbd@A\pmbd@Thin +$ \advance\pmbd@B-\pmbd@Sep +$ \advance\pmbd@B-\pmbd@Thin +& \pmbd@A=\dimexpr\pmbd@A+\pmbd@Sep+\pmbd@Thin\relax +$ \pmbd@Rule\pmbd@W\pmbd@A\pmbd@B +& \pmbd@Rule\pmbd@W\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxiv}{% - \pmbd@beginB - \hss - \vrule\@width\pmbd@rulewidth - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth - \hss - \pmbd@end +\pmbd@UniDef\textSFxxiv{2551} +\@namedef{pmbd@U+2551}{% + \pmbd@BeginDouble +$ \pmbd@A=\pmbd@W +$ \advance\pmbd@A-\pmbd@Sep +$ \pmbd@A=.5\pmbd@A +$ \advance\pmbd@A-.5\pmbd@Thin +$ \kern\pmbd@A +& \kern\dimexpr.5\dimexpr\pmbd@W-\pmbd@Sep\relax-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \kern\pmbd@Sep + \pmbd@Rule\pmbd@Thin\pmbd@H\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFli}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \kern.5\wd\z@ - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \rlap{% - \kern.5\wd\z@ - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFli{2552} +\@namedef{pmbd@U+2552}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Thin + \pmbd@C=.5\pmbd@C + \kern\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Sep + \pmbd@A=.5\pmbd@A + \advance\pmbd@A\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \kern-\pmbd@D + \advance\pmbd@A-\pmbd@Sep + \advance\pmbd@A-\pmbd@Thin + \advance\pmbd@B\pmbd@Sep + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFlii}{% - \pmbd@beginB - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \dimen4 \wd\z@ - \advance\dimen4 \pmbd@doublesepH - \hb@xt@\wd\z@{% - \hfill - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFlii{2553} +\@namedef{pmbd@U+2553}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Sep + \pmbd@C=.5\pmbd@C + \advance\pmbd@C-\pmbd@Thin + \kern\pmbd@C + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Thin + \pmbd@A=.5\pmbd@A + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \kern-\pmbd@D + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern\pmbd@Sep + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxxix}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \dimen4 \wd\z@ - \begingroup - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \advance\dimen4 \pmbd@doublesepH - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@\@depth\dp\z@ - \kern\pmbd@doublesepH - \kern\pmbd@rulewidth - \hss - }% - }% - \endgroup - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \advance\dimen4 -\pmbd@doublesepH - \rlap{% - \hb@xt@\wd\z@{% - \hss - \vrule\@width.5\dimen4 \@height.5\dimen@\@depth-.5\dimen\tw@ - }% - }% - \hss - \kern\pmbd@rulewidth - \kern\pmbd@doublesepH - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFxxxix{2554} +\@namedef{pmbd@U+2554}{% + \pmbd@BeginDouble + \pmbd@C=\pmbd@W + \advance\pmbd@C-\pmbd@Sep + \pmbd@C=.5\pmbd@C + \advance\pmbd@C-\pmbd@Thin + \kern\pmbd@C + \pmbd@A=\pmbd@H + \advance\pmbd@A\pmbd@Sep + \pmbd@A=.5\pmbd@A + \advance\pmbd@A\pmbd@Thin + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@D=\pmbd@W + \advance\pmbd@D-\pmbd@C + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \advance\pmbd@D-\pmbd@Sep + \advance\pmbd@D-\pmbd@Thin + \kern-\pmbd@D + \advance\pmbd@A-\pmbd@Sep + \advance\pmbd@A-\pmbd@Thin + \advance\pmbd@B\pmbd@Sep + \advance\pmbd@B\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@D\pmbd@A\pmbd@B + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxii}{% - \pmbd@beginC - \dimen@\ht\z@ - \advance\dimen@-\dp\z@ - \dimen\tw@\dimen@ - \advance\dimen@\pmbd@rulewidth - \advance\dimen\tw@-\pmbd@rulewidth - \rlap{% - \advance\dimen@-\pmbd@doublesepV - \advance\dimen\tw@-\pmbd@doublesepV - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \advance\dimen@\pmbd@doublesepV - \advance\dimen\tw@\pmbd@doublesepV - \rlap{% - \vrule\@width.5\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ - }% - \hss - \vrule\@width\pmbd@rulewidth\@height.5\dimen@ - \hss - \pmbd@end +\pmbd@UniDef\textSFxxii{2555} +\@namedef{pmbd@U+2555}{% + \pmbd@BeginDouble + \pmbd@A=\pmbd@H + \advance\pmbd@A-\pmbd@Sep + \pmbd@A=.5\pmbd@A + \pmbd@B=-\pmbd@A + \advance\pmbd@B\pmbd@Thin + \pmbd@C=\pmbd@W + \advance\pmbd@C\pmbd@Thin + \pmbd@C=.5\pmbd@C + \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B + \kern-\pmbd@C + \advance\pmbd@A\pmbd@Sep + \advance\pmbd@A\pmbd@Thin + \advance\pmbd@B-\pmbd@Sep + \advance\pmbd@B-\pmbd@Thin + \pmbd@Rule\pmbd@C\pmbd@A\pmbd@B + \kern-\pmbd@Thin + \pmbd@Rule\pmbd@Thin\pmbd@A\z@ + \pmbd@EndBox } -\DeclareTextCommandDefault{\textSFxxi}{% +\pmbd@UniDef\textSFxxi{2556} +\@namedef{pmbd@U+2556}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -477,7 +2593,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxv}{% +\pmbd@UniDef\textSFxxv{2557} +\@namedef{pmbd@U+2557}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -515,7 +2632,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFl}{% +\pmbd@UniDef\textSFl{2558} +\@namedef{pmbd@U+2558}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -539,7 +2657,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlix}{% +\pmbd@UniDef\textSFxlix{2559} +\@namedef{pmbd@U+2559}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -561,7 +2680,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxviii}{% +\pmbd@UniDef\textSFxxxviii{255A} +\@namedef{pmbd@U+255A}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -605,7 +2725,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxviii}{% +\pmbd@UniDef\textSFxxviii{255B} +\@namedef{pmbd@U+255B}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -627,7 +2748,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxvii}{% +\pmbd@UniDef\textSFxxvii{255C} +\@namedef{pmbd@U+255C}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -646,7 +2768,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxvi}{% +\pmbd@UniDef\textSFxxvi{255D} +\@namedef{pmbd@U+255D}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -684,7 +2807,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxvi}{% +\pmbd@UniDef\textSFxxxvi{255E} +\@namedef{pmbd@U+255E}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -708,7 +2832,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxxvii}{% +\pmbd@UniDef\textSFxxxvii{255F} +\@namedef{pmbd@U+255F}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -730,7 +2855,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlii}{% +\pmbd@UniDef\textSFxlii{2560} +\@namedef{pmbd@U+2560}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -773,7 +2899,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxix}{% +\pmbd@UniDef\textSFxix{2561} +\@namedef{pmbd@U+2561}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -795,7 +2922,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxx}{% +\pmbd@UniDef\textSFxx{2562} +\@namedef{pmbd@U+2562}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -814,7 +2942,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxxiii}{% +\pmbd@UniDef\textSFxxiii{2563} +\@namedef{pmbd@U+2563}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -851,7 +2980,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlvii}{% +\pmbd@UniDef\textSFxlvii{2564} +\@namedef{pmbd@U+2564}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -873,7 +3003,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlviii}{% +\pmbd@UniDef\textSFxlviii{2565} +\@namedef{pmbd@U+2565}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -890,7 +3021,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxli}{% +\pmbd@UniDef\textSFxli{2566} +\@namedef{pmbd@U+2566}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -920,7 +3052,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlv}{% +\pmbd@UniDef\textSFxlv{2567} +\@namedef{pmbd@U+2567}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -942,7 +3075,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxlvi}{% +\pmbd@UniDef\textSFxlvi{2568} +\@namedef{pmbd@U+2568}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -959,7 +3093,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxl}{% +\pmbd@UniDef\textSFxl{2569} +\@namedef{pmbd@U+2569}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -993,7 +3128,8 @@ \vrule\@width\wd\z@\@height.5\dimen@\@depth-.5\dimen\tw@ \pmbd@end } -\DeclareTextCommandDefault{\textSFliv}{% +\pmbd@UniDef\textSFliv{256A} +\@namedef{pmbd@U+256A}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1015,7 +3151,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFliii}{% +\pmbd@UniDef\textSFliii{256B} +\@namedef{pmbd@U+256B}{% \pmbd@beginB \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1032,7 +3169,8 @@ \hss \pmbd@end } -\DeclareTextCommandDefault{\textSFxliv}{% +\pmbd@UniDef\textSFxliv{256C} +\@namedef{pmbd@U+256C}{% \pmbd@beginC \dimen@\ht\z@ \advance\dimen@-\dp\z@ @@ -1077,6 +3215,181 @@ \hss \pmbd@end } +\@namedef{pmbd@U+2574}{% + \pmbd@BeginDraw X-% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2575}{% + \pmbd@BeginDraw X-% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2576}{% + \pmbd@BeginDraw X-% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2577}{% + \pmbd@BeginDraw X-% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+2578}{% + \pmbd@BeginDraw -X% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+2579}{% + \pmbd@BeginDraw -X% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257A}{% + \pmbd@BeginDraw -X% + \kern.5\pmbd@W +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257B}{% + \pmbd@BeginDraw -X% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+257C}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257D}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\@namedef{pmbd@U+257E}{% + \pmbd@BeginDraw XX% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thick +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thick +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thick\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thick\relax}% +$ \pmbd@A=\pmbd@H +$ \advance\pmbd@A\pmbd@Thin +$ \pmbd@A=.5\pmbd@A +$ \pmbd@B=-\pmbd@A +$ \advance\pmbd@B\pmbd@Thin +$ \pmbd@Rule{.5\pmbd@W}\pmbd@A\pmbd@B +& \pmbd@A=.5\dimexpr\pmbd@H+\pmbd@Thin\relax +& \pmbd@Rule{.5\pmbd@W}\pmbd@A +& {\dimexpr-\pmbd@A+\pmbd@Thin\relax}% + \pmbd@EndBox +} +\@namedef{pmbd@U+257F}{% + \pmbd@BeginDraw XX% + \rlap{% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thick +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thick\relax + \pmbd@Rule\pmbd@Thick\pmbd@H{-.5\pmbd@H}% + }% +$ \pmbd@C=\pmbd@W +$ \advance\pmbd@C-\pmbd@Thin +$ \kern.5\pmbd@C +& \kern.5\dimexpr\pmbd@W-\pmbd@Thin\relax + \pmbd@Rule\pmbd@Thin{.5\pmbd@H}\z@ + \pmbd@EndBox +} +\def\pmbd@beginA{% + \pmbd@begin + \def\width{\wd\z@}% + \def\height{\ht\z@}% + \def\depth{\dp\z@}% + \setlength{\dimen@}{\pmbd@rulewidth}% + \edef\pmbd@rulewidth{\number\dimen@ sp}% +} +\pmbd@AtEnd% \endinput %% %% End of file `pmboxdraw.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu b/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu index aca78dbf955..9d85e214f15 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu +++ b/Master/texmf-dist/tex/latex/oberdiek/pmboxdrawenc.dfu @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by +%% Copyright (C) 2006, 2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -28,21 +28,71 @@ %% This work consists of the main source file pmboxdraw.dtx %% and the derived files %% pmboxdraw.sty, pmboxdraw.pdf, pmboxdraw.ins, pmboxdraw.drv, -%% pmboxdrawenc.dfu. +%% pmboxdrawenc.dfu, pmboxdraw-test1.tex. %% \ProvidesFile{pmboxdrawenc.dfu}% - [2006/05/03 v1.0 UTF-8 support for box drawing characters]% + [2011/03/24 v1.1 UTF-8 support for box drawing characters]% \DeclareUnicodeCharacter{2500}{\textSFx} +\DeclareUnicodeCharacter{2501}{\pmboxdrawuni{2501}} \DeclareUnicodeCharacter{2502}{\textSFxi} +\DeclareUnicodeCharacter{2503}{\pmboxdrawuni{2503}} \DeclareUnicodeCharacter{250C}{\textSFi} +\DeclareUnicodeCharacter{250D}{\pmboxdrawuni{250D}} +\DeclareUnicodeCharacter{250E}{\pmboxdrawuni{250E}} +\DeclareUnicodeCharacter{250F}{\pmboxdrawuni{250F}} \DeclareUnicodeCharacter{2510}{\textSFiii} +\DeclareUnicodeCharacter{2511}{\pmboxdrawuni{2511}} +\DeclareUnicodeCharacter{2512}{\pmboxdrawuni{2512}} +\DeclareUnicodeCharacter{2513}{\pmboxdrawuni{2513}} \DeclareUnicodeCharacter{2514}{\textSFii} +\DeclareUnicodeCharacter{2515}{\pmboxdrawuni{2515}} +\DeclareUnicodeCharacter{2516}{\pmboxdrawuni{2516}} +\DeclareUnicodeCharacter{2517}{\pmboxdrawuni{2517}} \DeclareUnicodeCharacter{2518}{\textSFiv} +\DeclareUnicodeCharacter{2519}{\pmboxdrawuni{2519}} +\DeclareUnicodeCharacter{251A}{\pmboxdrawuni{251A}} +\DeclareUnicodeCharacter{251B}{\pmboxdrawuni{251B}} \DeclareUnicodeCharacter{251C}{\textSFviii} +\DeclareUnicodeCharacter{251D}{\pmboxdrawuni{251D}} +\DeclareUnicodeCharacter{251E}{\pmboxdrawuni{251E}} +\DeclareUnicodeCharacter{251F}{\pmboxdrawuni{251F}} +\DeclareUnicodeCharacter{2520}{\pmboxdrawuni{2520}} +\DeclareUnicodeCharacter{2521}{\pmboxdrawuni{2521}} +\DeclareUnicodeCharacter{2522}{\pmboxdrawuni{2522}} +\DeclareUnicodeCharacter{2523}{\pmboxdrawuni{2523}} \DeclareUnicodeCharacter{2524}{\textSFix} \DeclareUnicodeCharacter{252C}{\textSFvi} +\DeclareUnicodeCharacter{252D}{\pmboxdrawuni{252D}} +\DeclareUnicodeCharacter{252E}{\pmboxdrawuni{252E}} +\DeclareUnicodeCharacter{252F}{\pmboxdrawuni{252F}} +\DeclareUnicodeCharacter{2530}{\pmboxdrawuni{2530}} +\DeclareUnicodeCharacter{2531}{\pmboxdrawuni{2531}} +\DeclareUnicodeCharacter{2532}{\pmboxdrawuni{2532}} +\DeclareUnicodeCharacter{2533}{\pmboxdrawuni{2533}} \DeclareUnicodeCharacter{2534}{\textSFvii} +\DeclareUnicodeCharacter{2535}{\pmboxdrawuni{2535}} +\DeclareUnicodeCharacter{2536}{\pmboxdrawuni{2536}} +\DeclareUnicodeCharacter{2537}{\pmboxdrawuni{2537}} +\DeclareUnicodeCharacter{2538}{\pmboxdrawuni{2538}} +\DeclareUnicodeCharacter{2539}{\pmboxdrawuni{2539}} +\DeclareUnicodeCharacter{253A}{\pmboxdrawuni{253A}} +\DeclareUnicodeCharacter{253B}{\pmboxdrawuni{253B}} \DeclareUnicodeCharacter{253C}{\textSFv} +\DeclareUnicodeCharacter{253D}{\pmboxdrawuni{253D}} +\DeclareUnicodeCharacter{253E}{\pmboxdrawuni{253E}} +\DeclareUnicodeCharacter{253F}{\pmboxdrawuni{253F}} +\DeclareUnicodeCharacter{2540}{\pmboxdrawuni{2540}} +\DeclareUnicodeCharacter{2541}{\pmboxdrawuni{2541}} +\DeclareUnicodeCharacter{2542}{\pmboxdrawuni{2542}} +\DeclareUnicodeCharacter{2543}{\pmboxdrawuni{2543}} +\DeclareUnicodeCharacter{2544}{\pmboxdrawuni{2544}} +\DeclareUnicodeCharacter{2545}{\pmboxdrawuni{2545}} +\DeclareUnicodeCharacter{2546}{\pmboxdrawuni{2546}} +\DeclareUnicodeCharacter{2547}{\pmboxdrawuni{2547}} +\DeclareUnicodeCharacter{2548}{\pmboxdrawuni{2548}} +\DeclareUnicodeCharacter{2549}{\pmboxdrawuni{2549}} +\DeclareUnicodeCharacter{254A}{\pmboxdrawuni{254A}} +\DeclareUnicodeCharacter{254B}{\pmboxdrawuni{254B}} \DeclareUnicodeCharacter{2550}{\textSFxliii} \DeclareUnicodeCharacter{2551}{\textSFxxiv} \DeclareUnicodeCharacter{2552}{\textSFli} @@ -72,14 +122,50 @@ \DeclareUnicodeCharacter{256A}{\textSFliv} \DeclareUnicodeCharacter{256B}{\textSFliii} \DeclareUnicodeCharacter{256C}{\textSFxliv} +\DeclareUnicodeCharacter{2574}{\pmboxdrawuni{2574}} +\DeclareUnicodeCharacter{2575}{\pmboxdrawuni{2575}} +\DeclareUnicodeCharacter{2576}{\pmboxdrawuni{2576}} +\DeclareUnicodeCharacter{2577}{\pmboxdrawuni{2577}} +\DeclareUnicodeCharacter{2578}{\pmboxdrawuni{2578}} +\DeclareUnicodeCharacter{2579}{\pmboxdrawuni{2579}} +\DeclareUnicodeCharacter{257A}{\pmboxdrawuni{257A}} +\DeclareUnicodeCharacter{257B}{\pmboxdrawuni{257B}} +\DeclareUnicodeCharacter{257C}{\pmboxdrawuni{257C}} +\DeclareUnicodeCharacter{257D}{\pmboxdrawuni{257D}} +\DeclareUnicodeCharacter{257E}{\pmboxdrawuni{257E}} +\DeclareUnicodeCharacter{257F}{\pmboxdrawuni{257R}} \DeclareUnicodeCharacter{2580}{\textupblock} +\DeclareUnicodeCharacter{2581}{\pmboxdrawuni{2581}} +\DeclareUnicodeCharacter{2582}{\pmboxdrawuni{2582}} +\DeclareUnicodeCharacter{2583}{\pmboxdrawuni{2583}} \DeclareUnicodeCharacter{2584}{\textdnblock} +\DeclareUnicodeCharacter{2585}{\pmboxdrawuni{2585}} +\DeclareUnicodeCharacter{2586}{\pmboxdrawuni{2586}} +\DeclareUnicodeCharacter{2587}{\pmboxdrawuni{2587}} \DeclareUnicodeCharacter{2588}{\textblock} +\DeclareUnicodeCharacter{2589}{\pmboxdrawuni{2589}} +\DeclareUnicodeCharacter{258A}{\pmboxdrawuni{258A}} +\DeclareUnicodeCharacter{258B}{\pmboxdrawuni{258B}} \DeclareUnicodeCharacter{258C}{\textlfblock} +\DeclareUnicodeCharacter{258D}{\pmboxdrawuni{258D}} +\DeclareUnicodeCharacter{258E}{\pmboxdrawuni{258E}} +\DeclareUnicodeCharacter{258F}{\pmboxdrawuni{258F}} \DeclareUnicodeCharacter{2590}{\textrtblock} \DeclareUnicodeCharacter{2591}{\textltshade} \DeclareUnicodeCharacter{2592}{\textshade} \DeclareUnicodeCharacter{2593}{\textdkshade} +\DeclareUnicodeCharacter{2594}{\pmboxdrawuni{2594}} +\DeclareUnicodeCharacter{2595}{\pmboxdrawuni{2595}} +\DeclareUnicodeCharacter{2596}{\pmboxdrawuni{2596}} +\DeclareUnicodeCharacter{2597}{\pmboxdrawuni{2597}} +\DeclareUnicodeCharacter{2598}{\pmboxdrawuni{2598}} +\DeclareUnicodeCharacter{2599}{\pmboxdrawuni{2599}} +\DeclareUnicodeCharacter{259A}{\pmboxdrawuni{259A}} +\DeclareUnicodeCharacter{259B}{\pmboxdrawuni{259B}} +\DeclareUnicodeCharacter{259C}{\pmboxdrawuni{259C}} +\DeclareUnicodeCharacter{259D}{\pmboxdrawuni{259D}} +\DeclareUnicodeCharacter{259E}{\pmboxdrawuni{259E}} +\DeclareUnicodeCharacter{259F}{\pmboxdrawuni{259F}} \endinput %% %% End of file `pmboxdrawenc.dfu'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty index d9c147d3a72..4992b01821a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/refcount.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/refcount.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1998, 2000, 2006, 2008 by +%% Copyright (C) 1998, 2000, 2006, 2008, 2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -27,35 +27,226 @@ %% %% This work consists of the main source file refcount.dtx %% and the derived files -%% refcount.sty, refcount.pdf, refcount.ins, refcount.drv. +%% refcount.sty, refcount.pdf, refcount.ins, refcount.drv, +%% refcount-test1.tex, refcount-test2.tex, refcount-test3.tex, +%% refcount-test4.tex. %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{refcount} - [2008/08/11 v3.1 Data extraction from references (HO)]% - -\def\setrefcountdefault#1{% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@refcount.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \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{refcount}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@refcount.sty\endcsname +\ProvidesPackage{refcount}% + [2010/12/01 v3.2 Data extraction from references (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname rc@AtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\rc@AtEnd{% + \rc@AtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{96}{12}% ` +\edef\rc@AtEnd{\rc@AtEnd\noexpand\endinput} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input ltxcmds.sty\relax + \input infwarerr.sty\relax +\else + \RequirePackage{ltxcmds}[2010/04/08]% + \RequirePackage{infwarerr}[2010/04/08]% +\fi +\ltx@IfUndefined{@ifdefinable}{% + \def\rc@IfDefinable#1{% + \ifx#1\ltx@undefined + \expandafter\ltx@firstofone + \else + \ifx#1\relax + \expandafter\expandafter\expandafter\ltx@firstofone + \else + \@PackageError{refcount}{% + Command \string#1 is already defined.\MessageBreak + It will not redefined by this package% + }\@ehc + \expandafter\expandafter\expandafter\ltx@gobble + \fi + \fi + }% +}{% + \let\rc@IfDefinable\@ifdefinable +} +\ltx@IfUndefined{protected}{% + \ltx@IfUndefined{DeclareRobustCommand}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + #1\def#3##1{#4}% + }% + }% + }{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \DeclareRobustCommand#2#3[1]{#4}% + }% + }% + }% +}{% + \def\rc@RobustDefOne#1#2#3#4{% + \rc@IfDefinable#3{% + \protected#1\def#3##1{#4}% + }% + }% +} +\ltx@IfUndefined{newcommand}{% + \def\rc@newcommand*#1[#2]#3{% hash-ok + \rc@IfDefinable#1{% + \ifcase#2 % + \def#1{#3}% + \or + \def#1##1{#3}% + \or + \def#1##1##2{#3}% + \else + \rc@InternalError + \fi + }% + }% +}{% + \let\rc@newcommand\newcommand +} +\rc@RobustDefOne\long{}\setrefcountdefault{% \def\rc@default{#1}% } \setrefcountdefault{0} - -\def\rc@cartwo#1#2#3\@nil{#2} - -\long\def\rc@refused#1{% - \expandafter\ifx\csname r@#1\endcsname\relax - \protect\G@refundefinedtrue +\ltx@IfUndefined{G@refundefinedtrue}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \protect\G@refundefinedtrue + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +}{% + \rc@RobustDefOne{}{*}\refused{% + \begingroup + \csname @safe@activestrue\endcsname + \ltx@IfUndefined{r@#1}{% + \csname protect\expandafter\endcsname + \csname G@refundefinedtrue\endcsname + \rc@WarningUndefined{#1}% + }{}% + \endgroup + }% +} +\ltx@IfUndefined{@latex@warning}{% + \def\rc@WarningUndefined#1{% + \ltx@ifundefined{thepage}{% + \def\thepage{\number\count0 }% + }{}% + \@PackageWarning{refcount}{% + Reference `#1' on page \thepage\space undefined% + }% + }% +}{% + \def\rc@WarningUndefined#1{% \@latex@warning{% Reference `#1' on page \thepage\space undefined% }% - \fi -} - -\newcommand*{\refused}[1]{% - \begingroup - \csname @safe@activestrue\endcsname - \rc@refused{#1}{}% - \endgroup + }% } - \def\rc@set#1#2#3#4{% \begingroup \csname @safe@activestrue\endcsname @@ -72,70 +263,118 @@ }% \fi } - - -\newcommand*{\setcounterref}{\rc@set\setcounter\@car} -\newcommand*{\addtocounterref}{\rc@set\addtocounter\@car} -\newcommand*{\setcounterpageref}{\rc@set\setcounter\rc@cartwo} -\newcommand*{\addtocounterpageref}{\rc@set\addtocounter\rc@cartwo} - -\newcommand*{\getrefnumber}[1]{% - \expandafter\ifx\csname r@#1\endcsname\relax +\rc@newcommand*{\setcounterref}[0]{% + \rc@set\setcounter\ltx@car +} +\rc@newcommand*{\addtocounterref}[0]{% + \rc@set\addtocounter\ltx@car +} +\rc@newcommand*{\setcounterpageref}[0]{% + \rc@set\setcounter\ltx@cartwo +} +\rc@newcommand*{\addtocounterpageref}[0]{% + \rc@set\addtocounter\ltx@cartwo +} +\rc@newcommand*{\getrefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero \rc@default - \else - \expandafter\expandafter\expandafter\@car - \csname r@#1\endcsname\@nil - \fi + }{% + \expandafter\expandafter\expandafter\rc@extract@ + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\endcsname + \expandafter{\rc@default}\@nil + }% } -\newcommand*{\getpagerefnumber}[1]{% - \expandafter\ifx\csname r@#1\endcsname\relax +\rc@newcommand*{\getpagerefnumber}[1]{% + \romannumeral + \ltx@ifundefined{r@#1}{% + \expandafter\ltx@zero \rc@default - \else - \expandafter\expandafter\expandafter\rc@cartwo - \csname r@#1\endcsname\rc@default\rc@default\@nil - \fi + }{% + \expandafter\expandafter\expandafter\rc@extract@page + \expandafter\expandafter\expandafter!% + \csname r@#1\expandafter\expandafter\expandafter\endcsname + \expandafter\expandafter\expandafter{% + \expandafter\rc@default + \expandafter}\expandafter{\rc@default}\@nil + }% } -\newcommand*{\getrefbykeydefault}[2]{% +\rc@newcommand*{\getrefbykeydefault}[2]{% + \romannumeral \expandafter\rc@getrefbykeydefault \csname r@#1\expandafter\endcsname \csname rc@extract@#2\endcsname } -\def\rc@getrefbykeydefault#1#2#3{% +\long\def\rc@getrefbykeydefault#1#2#3{% \ifx#1\relax % reference is undefined - #3% - \else - \ifx#2\relax - % extract method is missing + \ltx@ReturnAfterElseFi{% + \ltx@zero #3% - \else - \expandafter\rc@generic#1{#3}{#3}{#3}{#3}{#3}\@nil#2{#3}% - \fi + }% + \else + \ltx@ReturnAfterFi{% + \ifx#2\relax + % extract method is missing + \ltx@ReturnAfterElseFi{% + \ltx@zero + #3% + }% + \else + \ltx@ReturnAfterFi{% + \expandafter + \rc@generic#1{#3}{#3}{#3}{#3}{#3}\@nil#2{#3}% + }% + \fi + }% \fi } -\def\rc@generic#1#2\@nil#3#4{% +\long\def\rc@generic#1#2\@nil#3#4{% #3{#1\TR@TitleReference\@empty{#4}\@nil}{#1}#2\@nil } -\def\rc@extract@{% - \expandafter\@car\@gobble +\long\def\rc@extract@#1#2#3\@nil{% + \ltx@zero + #2% } -\def\rc@extract@page{% - \expandafter\@car\@gobbletwo +\long\def\rc@extract@page#1#2#3#4\@nil{% + \ltx@zero + #3% } -\def\rc@extract@name{% - \expandafter\@car\@gobblefour\@empty +\long\def\rc@extract@name#1#2#3#4#5\@nil{% + \ltx@zero + #4% } -\def\rc@extract@anchor{% - \expandafter\@car\@gobblefour +\long\def\rc@extract@anchor#1#2#3#4#5#6\@nil{% + \ltx@zero + #5% } -\def\rc@extract@url{% - \expandafter\expandafter\expandafter\@car\expandafter - \@gobble\@gobblefour +\long\def\rc@extract@url#1#2#3#4#5#6#7\@nil{% + \ltx@zero + #6% } -\def\rc@extract@title#1#2\@nil{% +\long\def\rc@extract@title#1#2\@nil{% \rc@@extract@title#1% } -\def\rc@@extract@title#1\TR@TitleReference#2#3#4\@nil{#3} +\long\def\rc@@extract@title#1\TR@TitleReference#2#3#4\@nil{% + \ltx@zero + #3% +} +\rc@newcommand*{\IfRefUndefinedExpandable}[1]{% + \ltx@ifundefined{r@#1}\ltx@firstoftwo\ltx@secondoftwo +} +\rc@RobustDefOne{}*\IfRefUndefinedBabel{% + \begingroup + \csname safe@actives@true\endcsname + \expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname r@#1\endcsname\relax + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +\rc@AtEnd% \endinput %% %% End of file `refcount.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty b/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty index 93802df25f7..dd385a0ada7 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty @@ -31,28 +31,37 @@ %% rerunfilecheck.drv, rerunfilecheck-example.cfg, %% rerunfilecheck-test1.tex. %% -\begingroup - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ReFiCh@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ReFiCh@AtEnd{% \ReFiCh@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{39}{12}% ' \TMP@EnsureCode{40}{12}% ( @@ -64,12 +73,11 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{96}{12}% ` -\g@addto@macro\ReFiCh@AtEnd{\endinput} +\edef\ReFiCh@AtEnd{\ReFiCh@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{rerunfilecheck}% [2010/03/16 v1.6 Rerun checks for auxiliary files (HO)] @@ -116,7 +124,7 @@ \newcommand*{\RerunFileCheck}[3]{}% \renewcommand*{\RerunFileCheckSetup}[1]{}% \expandafter\ReFiCh@AtEnd -\fi +\fi% \ifReFiCh@partaux \let\ReFiCh@org@include\@include \def\@include#1 {% @@ -337,7 +345,7 @@ \@onelevel@sanitize\ReFiCh@AuxEmptyUnix \def\ReFiCh@AuxEmptyDos{A62A15ECE803E2EBE94952FCC9933BC0;9}% \@onelevel@sanitize\ReFiCh@AuxEmptyDos -\ReFiCh@AtEnd +\ReFiCh@AtEnd% \endinput %% %% End of file `rerunfilecheck.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty index 83d38945e4d..55c396f9292 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/resizegather.sty @@ -30,14 +30,18 @@ %% resizegather.sty, resizegather.pdf, resizegather.ins, resizegather.drv, %% resizegather-test1.tex. %% -\begingroup - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode58 12 % : - \catcode64 11 % @ - \catcode123 1 % { - \catcode125 2 % } +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } \expandafter\let\expandafter\x\csname ver@resizegather.sty\endcsname \ifx\x\relax % plain-TeX, first loading \else @@ -45,7 +49,6 @@ \ifx\x\empty % LaTeX, first loading, % variable is initialized, but \ProvidesPackage not yet seen \else - \catcode35 6 % # \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,21 +60,24 @@ \aftergroup\endinput \fi \fi -\endgroup -\begingroup - \catcode35 6 % # - \catcode40 12 % ( - \catcode41 12 % ) - \catcode44 12 % , - \catcode45 12 % - - \catcode46 12 % . - \catcode47 12 % / - \catcode58 12 % : - \catcode64 11 % @ - \catcode91 12 % [ - \catcode93 12 % ] - \catcode123 1 % { - \catcode125 2 % } +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -90,29 +96,38 @@ \fi \expandafter\x\csname ver@resizegather.sty\endcsname \ProvidesPackage{resizegather}% - [2010/03/01 v1.2 Automatically resizing of too large equations (HO)] -\begingroup - \catcode123 1 % { - \catcode125 2 % } + [2010/03/01 v1.2 Automatically resizing of too large equations (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ \def\x{\endgroup \expandafter\edef\csname ResizeGather@AtEnd\endcsname{% - \catcode35 \the\catcode35\relax - \catcode64 \the\catcode64\relax - \catcode123 \the\catcode123\relax - \catcode125 \the\catcode125\relax + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax }% }% -\x -\catcode35 6 % # -\catcode64 11 % @ -\catcode123 1 % { -\catcode125 2 % } +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } \def\TMP@EnsureCode#1#2{% \edef\ResizeGather@AtEnd{% \ResizeGather@AtEnd - \catcode#1 \the\catcode#1\relax + \catcode#1=\the\catcode#1\relax }% - \catcode#1 #2\relax + \catcode#1=#2\relax } \TMP@EnsureCode{10}{12}% ^^J \TMP@EnsureCode{33}{12}% ! @@ -130,13 +145,13 @@ \TMP@EnsureCode{58}{12}% : \TMP@EnsureCode{59}{12}% ; \TMP@EnsureCode{60}{12}% < -\TMP@EnsureCode{61}{12}% = \TMP@EnsureCode{62}{12}% > \TMP@EnsureCode{63}{12}% ? \TMP@EnsureCode{91}{12}% [ \TMP@EnsureCode{93}{12}% ] \TMP@EnsureCode{94}{7}% ^ (superscript) \TMP@EnsureCode{96}{12}% ` +\edef\ResizeGather@AtEnd{\ResizeGather@AtEnd\noexpand\endinput} \RequirePackage{kvoptions}[2009/12/04] \SetupKeyvalOptions{% family=resizegather,% @@ -299,7 +314,7 @@ \fi \fi } -\ResizeGather@AtEnd +\ResizeGather@AtEnd% \endinput %% %% End of file `resizegather.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def index 6d84d11e1e5..fe90ef93107 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-ascii.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-ascii.def}% - [2010/01/11 v1.6 Input encoding ascii (inputenx)]% + [2011/04/10 v1.8 Input encoding ascii (inputenx)]% \csname @inpenc@test\endcsname \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def index c7b57802237..54917ba89c3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-atarist.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-atarist.def}% - [2010/01/11 v1.6 Input encoding atarist (inputenx)]% + [2011/04/10 v1.8 Input encoding atarist (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def index a6b518ae750..c0044c9e87e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1250.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1250.def}% - [2010/01/11 v1.6 Input encoding cp1250 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1250 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def index 7f328036983..e81f011fd42 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1251.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1251.def}% - [2010/01/11 v1.6 Input encoding cp1251 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1251 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def index 31cc20e9115..c6bb74982f6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1252.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1252.def}% - [2010/01/11 v1.6 Input encoding cp1252 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1252 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def index bd681b4cdb2..38ff123ad40 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp1257.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp1257.def}% - [2010/01/11 v1.6 Input encoding cp1257 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp1257 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% @@ -201,7 +201,7 @@ \DeclareInputText{233}{\@tabacckludge'e} \DeclareInputText{234}{\@tabacckludge'z} \DeclareInputText{235}{\.e} -\DeclareInputText{236}{\v g} +\DeclareInputText{236}{\c g} \DeclareInputText{237}{\c k} \DeclareInputText{238}{\@tabacckludge=\i} \DeclareInputText{239}{\c l} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def index d30f23b33ad..3261bca9028 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp437.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp437.def}% - [2010/01/11 v1.6 Input encoding cp437 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp437 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def index d4b4eb87c09..f3243584afb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp850.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp850.def}% - [2010/01/11 v1.6 Input encoding cp850 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp850 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def index 0310cc5f2d6..ed78ca1d788 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp852.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp852.def}% - [2010/01/11 v1.6 Input encoding cp852 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp852 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def index ed0ce76241c..e786eb65f49 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp855.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp855.def}% - [2010/01/11 v1.6 Input encoding cp855 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp855 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def index 092ff25cafe..e0b8549a04f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp858.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp858.def}% - [2010/01/11 v1.6 Input encoding cp858 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp858 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def index db854e7b7d1..ac60031691e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp865.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp865.def}% - [2010/01/11 v1.6 Input encoding cp865 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp865 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textGamma}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def index 354ee49d194..f2bc8a2c05f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-cp866.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-cp866.def}% - [2010/01/11 v1.6 Input encoding cp866 (inputenx)]% + [2011/04/10 v1.8 Input encoding cp866 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textblacksquare}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def index dc8122fcc38..a464238c01a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-dec-mcs.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-dec-mcs.def}% - [2010/01/11 v1.6 Input encoding dec-mcs (inputenx)]% + [2011/04/10 v1.8 Input encoding dec-mcs (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcent}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def index f7e59418ac7..ffd0cc0d80a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-1.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-1.def}% - [2010/01/11 v1.6 Input encoding iso-8859-1 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-1 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def index 0c04bab5ce1..e19fb748249 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-10.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-10.def}% - [2010/01/11 v1.6 Input encoding iso-8859-10 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-10 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -79,7 +79,7 @@ \DeclareInputText{176}{\textdegree} \DeclareInputText{177}{\k a} \DeclareInputText{178}{\@tabacckludge=e} -\DeclareInputText{179}{\v g} +\DeclareInputText{179}{\c g} \DeclareInputText{180}{\@tabacckludge=\i} \DeclareInputText{181}{\~\i} \DeclareInputText{182}{\c k} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def index 977337b2682..e7096a0c97b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-13.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-13.def}% - [2010/01/11 v1.6 Input encoding iso-8859-13 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-13 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textbrokenbar}{% @@ -166,7 +166,7 @@ \DeclareInputText{233}{\@tabacckludge'e} \DeclareInputText{234}{\@tabacckludge'z} \DeclareInputText{235}{\.e} -\DeclareInputText{236}{\v g} +\DeclareInputText{236}{\c g} \DeclareInputText{237}{\c k} \DeclareInputText{238}{\@tabacckludge=\i} \DeclareInputText{239}{\c l} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def index a1a4941772b..c2ab0b334ad 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-14.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-14.def}% - [2010/01/11 v1.6 Input encoding iso-8859-14 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-14 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \DeclareInputText{160}{\nobreakspace} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def index 05a1cb37e2c..42c03f1de51 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-15.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-15.def}% - [2010/01/11 v1.6 Input encoding iso-8859-15 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-15 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciimacron}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def index 286599589a4..b6395715e54 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-16.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-16.def}% - [2010/01/11 v1.6 Input encoding iso-8859-16 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-16 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textcommabelow}[1]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def index caddcfecf60..74edd80d79c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-2.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-2.def}% - [2010/01/11 v1.6 Input encoding iso-8859-2 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-2 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def index f8485e8f44f..7944e027d20 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-3.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-3.def}% - [2010/01/11 v1.6 Input encoding iso-8859-3 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-3 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def index e3a3907e77a..c5a283b48f1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-4.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-4.def}% - [2010/01/11 v1.6 Input encoding iso-8859-4 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-4 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textTstroke}{% @@ -105,7 +105,7 @@ \DeclareInputText{184}{\c\ } \DeclareInputText{185}{\v s} \DeclareInputText{186}{\@tabacckludge=e} -\DeclareInputText{187}{\v g} +\DeclareInputText{187}{\c g} \DeclareInputText{188}{\texttstroke} \DeclareInputText{189}{\NG} \DeclareInputText{190}{\v z} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def index 1e6ac6a5476..8f9b4f6a839 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-5.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-5.def}% - [2010/01/11 v1.6 Input encoding iso-8859-5 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-5 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textnumero}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def index da12674ef95..d3b725896af 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-8.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-8.def}% - [2010/01/11 v1.6 Input encoding iso-8859-8 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-8 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def index 8fed6ddc564..5c25e4614ab 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-iso-8859-9.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-iso-8859-9.def}% - [2010/01/11 v1.6 Input encoding iso-8859-9 (inputenx)]% + [2011/04/10 v1.8 Input encoding iso-8859-9 (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciiacute}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def index 81542f86f27..125a4a581b8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-koi8-r.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-koi8-r.def}% - [2010/01/11 v1.6 Input encoding koi8-r (inputenx)]% + [2011/04/10 v1.8 Input encoding koi8-r (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def index 799472a5b99..559d9b83b90 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-centeuro.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-centeuro.def}% - [2010/01/11 v1.6 Input encoding mac-centeuro (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-centeuro (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textasciicaron}{% @@ -130,7 +130,7 @@ \DeclareInputText{171}{\k e} \DeclareInputText{172}{\textasciidieresis} \DeclareInputText{173}{\textnotequal} -\DeclareInputText{174}{\v g} +\DeclareInputText{174}{\c g} \DeclareInputText{175}{\k I} \DeclareInputText{176}{\k i} \DeclareInputText{177}{\@tabacckludge=I} diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def index 3ad7b2a4f8a..db2cb2789bc 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-cyrillic.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-cyrillic.def}% - [2010/01/11 v1.6 Input encoding mac-cyrillic (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-cyrillic (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textapproxequal}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def index 192e16e78c2..0d74096d145 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-mac-roman.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-mac-roman.def}% - [2010/01/11 v1.6 Input encoding mac-roman (inputenx)]% + [2011/04/10 v1.8 Input encoding mac-roman (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textOmega}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def index 43eaaf6b8ef..93b955da8e3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def +++ b/Master/texmf-dist/tex/latex/oberdiek/x-nextstep.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% and the derived files %% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, %% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, -%% ix-utf8enc.dfu, x-ascii.def, x-atarist.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, %% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, %% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, %% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, @@ -42,7 +42,7 @@ %% inputenx-utf8enc.txt. %% \ProvidesFile{x-nextstep.def}% - [2010/01/11 v1.6 Input encoding nextstep (inputenx)]% + [2011/04/10 v1.8 Input encoding nextstep (inputenx)]% \edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} \makeatletter \ProvideTextCommandDefault{\textacutedbl}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def new file mode 100644 index 00000000000..48099ba3989 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/x-verbatim.def @@ -0,0 +1,64 @@ +%% +%% This is file `x-verbatim.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% inputenx.dtx (with options: `verbatim') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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 inputenx.dtx +%% and the derived files +%% inputenx.sty, inputenx.pdf, inputenx.ins, inputenx.drv, ix-alias.def, +%% ix-math.def, ix-name.def, ix-slot.def, ix-uc.def, +%% ix-utf8enc.dfu, x-ascii.def, x-verbatim.def, x-atarist.def, +%% x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def, +%% x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-8.def, +%% x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def, +%% x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def, +%% x-cp437.def, x-cp850.def, x-cp852.def, x-cp855.def, +%% x-cp858.def, x-cp865.def, x-cp866.def, x-cp1250.def, +%% x-cp1251.def, x-cp1252.def, x-cp1257.def, x-dec-mcs.def, +%% x-koi8-r.def, x-mac-centeuro.def, x-mac-cyrillic.def, +%% x-mac-roman.def, x-nextstep.def, inputenx-licrcmds.txt, +%% inputenx-utf8enc.txt. +%% +\ProvidesFile{x-verbatim.def}% + [2011/04/10 v1.8 Input encoding verbatim (inputenx)]% +\csname @inpenc@test\endcsname +\edef\RestoreAtCatcode{\catcode64=\the\catcode64\relax} +\makeatletter +\def\IPX@VerbatimLoop#1#2{% + \@tempcnta#1\relax + \loop + \catcode\@tempcnta=12 % + \ifnum\@tempcnta<#2\relax + \advance\@tempcnta\@ne + \repeat +} +\IPX@VerbatimLoop{1}{8} +\IPX@VerbatimLoop{11}{11} +\IPX@VerbatimLoop{14}{31} +\IPX@VerbatimLoop{127}{255} +\RestoreAtCatcode +\endinput +%% +%% End of file `x-verbatim.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty index 20a0f7bab24..8696830d331 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/xcolor-patch.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -34,28 +34,9 @@ %% hycolor-test-xcol4.tex. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{xcolor-patch}[2009/12/12 xcolor patch] -\@ifpackageloaded{xcolor}{% - \@firstofone -}{% - \@ifpackageloaded{scrlfile}{% - \AfterPackage{xcolor}% - }{% - \def\reserved@a{% - \edef\x{% - \endgroup - \noexpand\AtBeginDocument{% - \noexpand\@ifpackageloaded{xcolor}{\the\toks@}{}% - }% - }% - \x - }% - \begingroup - \afterassignment\reserved@a - \toks@ - }% -}% -{% +\ProvidesPackage{xcolor-patch}[2011/01/30 xcolor patch] +\RequirePackage{hopatch}[2011/01/30] +\hopatch@AfterPackage{xcolor}{% \long\def\reserved@a#1#2#3{% \long\def\@@tmp##1##2{% \ifx#1##1% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index eb9c4536056..3562d99da32 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/05/01 v2.17 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty index 58e78fb7455..1fdb3ecd5e5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,30 +29,30 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2010/05/01 v2.17 Module abspos for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module abspos for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2010/05/01] +\RequirePackage{zref-savepos}[2011/03/18] \ifx\ZREF@savepos@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-pagelayout}[2010/05/01] +\RequirePackage{zref-pagelayout}[2011/03/18] \zref@addprop{savepos}{abspage} \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 4ddad0871e9..ddfe2afab5c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,22 +29,24 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/05/01 v2.17 Module base for zref (HO)]% + [2011/03/18 v2.21 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/03/01] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] +\RequirePackage{kvdefinekeys}[2010/03/01] +\RequirePackage{pdftexcmds}[2010/04/01] \def\ZREF@name{zref} \ltx@IfUndefined{protected}{% \RequirePackage{makerobust}[2006/03/18]% @@ -157,7 +159,7 @@ }% }% } -\ZREF@Robust\def\zref@addprop#1#2{% +\ZREF@Robust\def\zref@addprops#1#2{% \zref@listexists{#1}{% \comma@parse{#2}{% \zref@propexists\comma@entry{% @@ -176,7 +178,23 @@ }% }% } -\ZREF@Robust\def\zref@localaddprop#1#2{% +\ZREF@Robust\def\zref@addprop#1#2{% + \zref@listexists{#1}{% + \zref@propexists{#2}{% + \zref@iflistcontainsprop{#1}{#2}{% + \PackageWarning\ZREF@name{% + Property `#2' is already in list `#1'% + }% + }{% + \begingroup\expandafter\endgroup + \expandafter\g@addto@macro + \csname Z@L@#1\expandafter\endcsname + \expandafter{\csname#2\endcsname}% + }% + }% + }% +} +\ZREF@Robust\def\zref@localaddprops#1#2{% \zref@listexists{#1}{% \comma@parse{#2}{% \zref@propexists\comma@entry{% @@ -195,6 +213,96 @@ }% }% } +\ZREF@Robust\def\zref@localaddprop#1#2{% + \zref@listexists{#1}{% + \zref@propexists{#2}{% + \zref@iflistcontainsprop{#1}{#2}{% + \PackageWarning\ZREF@name{% + Property `#2' is already in list `#1'% + }% + }{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \csname Z@L@#1\expandafter\endcsname + \expandafter{\csname#2\endcsname}% + }% + }% + }% +} +\ltx@IfUndefined{pdf@strcmp}{% + \ZREF@Robust\def\zref@delprop{% + \ZREF@delprop\gdef + }% + \ZREF@Robust\def\zref@localdelprop{% + \ZREF@delprop\def + }% + \def\ZREF@delprop#1#2#3{% + \zref@listexists{#2}{% + \begingroup + \escapechar=-1 % + \def\ZREF@param{#3}% + \@onelevel@sanitize\ZREF@param + \toks@{}% + \expandafter\expandafter\expandafter\ZREF@@delprop + \csname Z@L@#2\endcsname!% + \expandafter\endgroup + \expandafter#1\csname Z@L@#2\expandafter\endcsname + \expandafter{% + \the\toks@ + }% + }% + }% + \def\ZREF@@delprop#1{% + \expandafter\ZREF@@@delprop\expandafter{\string#1}#1% + }% + \def\ZREF@@@delprop#1#2{% + \ifx#2!% + \else + \def\ZREF@temp{#1}% + \@onelevel@sanitize\ZREF@temp + \ifx\ZREF@param\ZREF@temp + \else + \toks@\expandafter{% + \the\expandafter\toks@\csname#1\endcsname + }% + \fi + \expandafter\ZREF@@delprop + \fi + }% +}{% + \ZREF@Robust\def\zref@delprop{% + \ZREF@delprop\xdef + }% + \ZREF@Robust\def\zref@localdelprop{% + \ZREF@delprop\edef + }% + \def\ZREF@delprop#1#2#3{% + \zref@listexists{#2}{% + \def\ZREF@param{#3}% + \edef\ZREF@SavedEscapechar{\the\escapechar}% + \escapechar=-1 % + \expandafter#1\csname Z@L@#2% + \expandafter\expandafter\expandafter\endcsname{% + \expandafter\expandafter\expandafter\ZREF@@delprop + \csname Z@L@#2\endcsname!% + }% + \escapechar=\ZREF@SavedEscapechar\relax + }% + }% + \def\ZREF@@delprop#1{% + \expandafter\ZREF@@@delprop\expandafter{\string#1}#1% + }% + \def\ZREF@@@delprop#1#2{% + \ifx#2!% + \else + \ifnum\pdf@strcmp{#1}{\ZREF@param}=\ltx@zero + \else + \expandafter\noexpand\csname#1\endcsname + \fi + \expandafter\ZREF@@delprop + \fi + }% +} \def\zref@ifpropundefined#1{% \ltx@ifundefined{Z@E@#1}% } @@ -310,6 +418,77 @@ \expandafter\ZREF@label\expandafter{\the\toks@}{#1}% \@esphack } +\ZREF@Robust\def\zref@labelbykv#1#2{% + \@bsphack + \begingroup + \let\Z@L@ZREF@temp\ltx@empty + \kvsetkeys{ZREF@LABEL}{#1}% + \ifZREF@immediate + \expandafter\zref@wrapper@immediate\expandafter{% + \expandafter\ZREF@label\expandafter{\Z@L@ZREF@temp}{#2}% + }% + \else + \expandafter\ZREF@label\expandafter{\Z@L@ZREF@temp}{#2}% + \fi + \endgroup + \@esphack +} +\kv@define@key{ZREF@LABEL}{prop}{% + \edef\ZREF@param{#1}% + \zref@propexists\ZREF@param{% + \zref@iflistcontainsprop{ZREF@temp}\ZREF@param{}{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \expandafter\Z@L@ZREF@temp + \expandafter{\csname\ZREF@param\endcsname}% + }% + }% +} +\kv@define@key{ZREF@LABEL}{list}{% + \zref@listforloop{#1}{% + \zref@iflistcontainsprop{ZREF@temp}\zref@prop{}{% + \begingroup\expandafter\endgroup + \expandafter\ltx@LocalAppendToMacro + \expandafter\Z@L@ZREF@temp + \expandafter{\csname\zref@prop\endcsname}% + }% + \ltx@gobble + }% +} +\kv@define@key{ZREF@LABEL}{delprop}{% + \zref@propexists{#1}{% + \zref@localdelprop{ZREF@temp}{#1}% + }% +} +\kv@define@key{ZREF@LABEL}{immediate}[true]{% + \edef\ZREF@param{#1}% + \ifx\ZREF@param\ZREF@true + \ZREF@immediatetrue + \else + \ifx\ZREF@param\ZREF@false + \ZREF@immediatefalse + \else + \PackageWarning\ZREF@name{% + Option `immediate' expects `true' or `false'.\MessageBreak + Ignoring invalid value `\ZREF@param'% + }% + \fi + \fi +} +\def\ZREF@false{false} +\def\ZREF@true{true} +\kv@define@key{ZREF@LABEL}{values}[]{% + \kv@parse{#1}{% + \ifx\kv@value\relax + \@PackageWarning\ZREF@name{% + Missing value for property `\kv@key'% + }% + \expandafter\ltx@gobbletwo + \else + \expandafter\zref@setcurrent + \fi + }% +} \newif\ifZREF@immediate \ZREF@Robust{\long\def}\zref@wrapper@immediate#1{% \begingroup @@ -525,7 +704,22 @@ \zref@newlist\ZREF@mainlist \zref@newprop{default}{\@currentlabel} \zref@newprop*{page}{\thepage} -\zref@addprop\ZREF@mainlist{default,page} +\zref@addprops\ZREF@mainlist{default,page} +\def\ZREF@NewPropAnchor{% + \zref@newprop{anchor}{% + \ltx@ifundefined{@currentHref}{}{\@currentHref}% + }% + \global\let\ZREF@NewPropAnchor\relax +} +\def\ZREF@NewPropTitle{% + \gdef\zref@titleref@current{}% + \zref@newprop{title}{\zref@titleref@current}% + \global\let\ZREF@NewPropTitle\relax +} +\def\ZREF@NewPropTheotype{% + \zref@newprop{theotype}{}% + \global\let\ZREF@NewPropTheotype\relax +} \let\ZREF@base@ok=Y \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 8cac67f2bc4..5a774fd4cdd 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/05/01 v2.17 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index be6d516bc9f..31f88f5a82d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/05/01 v2.17 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-savepos}[2010/05/01] +\RequirePackage{zref-savepos}[2011/03/18] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% @@ -62,7 +62,7 @@ \providecommand\ZREF@df@min{2} \providecommand\ZREF@df@unit{.44em} \providecommand\ZREF@df@dot{.} -\newcommand*{\zdotfillsetup}{\setkeys{ZREF@DF}} +\newcommand*{\zdotfillsetup}{\kvsetkeys{ZREF@DF}} \ZREF@IfDefinable\zdotfill\def{% {% \leavevmode diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty new file mode 100644 index 00000000000..e74e3b4ddfa --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-env.sty @@ -0,0 +1,62 @@ +%% +%% This is file `zref-env.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `env') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2011 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and 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 zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-env}% + [2011/03/18 v2.21 Module env for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] +\ifx\ZREF@base@ok Y% +\else + \expandafter\endinput +\fi +\zref@newprop{envname}[]{\@currenvir} +\zref@newprop{envline}[]{\zref@env@line} +\def\zref@env@line{% + \ifx\@currenvline\ltx@empty + \else + \expandafter + \ZREF@ENV@line\@currenvline\ltx@empty line \ltx@empty\@nil + \fi +} +\def\ZREF@ENV@line#1line #2\ltx@empty#3\@nil{#2}% +\endinput +%% +%% End of file `zref-env.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 38f106cea3a..0ca0fedd5c1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,29 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/05/01 v2.17 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\ltx@ifpackageloaded{zref-xr}{}{% - \zref@newprop{anchor}[]{% - \ltx@ifundefined{@currentHref}{}{\@currentHref}% - }% -} +\ZREF@NewPropAnchor \zref@addprop\ZREF@mainlist{anchor}% \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index c4820c2b996..f603dbfe945 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/05/01 v2.17 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] -\RequirePackage{zref-abspage}[2010/05/01] + [2011/03/18 v2.21 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] +\RequirePackage{zref-abspage}[2011/03/18] \RequirePackage{atveryend}[2009/12/07] \ifx\ZREF@base@ok Y% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index 913adbaffb9..78078f2a6fe 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,24 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/05/01 v2.17 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{kvsetkeys}[2009/07/30] \newcommand*{\zref@marks@register}[3][]{% \edef\ZREF@TempName{#1}% \edef\ZREF@TempNum{\ZREF@number#2}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index 8e8ef707587..c472c5d5c20 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,27 +29,27 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/05/01 v2.17 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] -\RequirePackage{zref-thepage}[2010/05/01] -\RequirePackage{zref-lastpage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{zref-thepage}[2011/03/18] +\RequirePackage{zref-lastpage}[2011/03/18] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty index 03c9352f3b5..e8609998fd5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2010/05/01 v2.17 Module pageattr for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module pageattr for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -83,7 +83,7 @@ \def\zref@pdfpageattr#1{}% \def\zref@pdfpageattr@used#1{}% }{% - \RequirePackage{zref-thepage}[2010/05/01]% + \RequirePackage{zref-thepage}[2011/03/18]% \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}% \zref@addprop{thepage}{pdfpageattr}% \let\ZREF@temp=Y% @@ -95,7 +95,7 @@ \def\zref@pdfpagesattr{}% \def\zref@pdfpagesattr@used{}% }{% - \RequirePackage{zref-lastpage}[2010/05/01]% + \RequirePackage{zref-lastpage}[2011/03/18]% \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}% \zref@addprop{LastPage}{pdfpagesattr}% \let\ZREF@temp=Y% @@ -103,7 +103,7 @@ \ifx\ZREF@temp N% \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \RequirePackage{atveryend}[2010/03/24] \RequirePackage{pdftexcmds}[2010/04/01] \let\ZREF@temp=Y% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty index e92c9cfa012..1c16d9b5c50 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2010/05/01 v2.17 Module pagelayout for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module pagelayout for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-thepage}[2010/05/01] +\RequirePackage{zref-thepage}[2011/03/18] \RequirePackage{ifluatex}[2010/03/01] \RequirePackage{atveryend}[2010/03/24] \ifluatex @@ -118,7 +118,7 @@ \ZREF@temp\columnsep \ltx@newif\ifZREF@pl@list \ZREF@IfDefinable\zlistpagelayout\def{% - {\ZREF@pl@listtrue}% + {\global\ZREF@pl@listtrue}% } \def\ZREF@pl@AfterLastShipout{% \ifZREF@pl@list @@ -129,7 +129,7 @@ \ZREF@org@testdef{##1}{##2}{##3}% \def\ZREF@temp{##1}% \ifx\ZREF@temp\ZREF@RefPrefix - \expandafter\xdef\csname##1@##2\endcsname{##3}% + \expandafter\gdef\csname##1@##2\endcsname{##3}% \fi }% }{}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index 4971af69c66..4c1abf6d2ca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,28 +29,28 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/05/01 v2.17 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} -\zref@addprop{perpage}{abspage,page,pagevalue} +\zref@addprops{perpage}{abspage,page,pagevalue} \newcounter{zpage} \zref@require@unique \let\ZREF@org@stepcounter\stepcounter diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index abfd3be94be..388e23a1f64 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/05/01 v2.17 Module runs for zref (HO)]% + [2011/03/18 v2.21 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index 1216f0e6cf9..86515034226 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/05/01 v2.17 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -72,12 +72,17 @@ \zref@newlist{savepos} \zref@newprop*{posx}[0]{\the\pdflastxpos} \zref@newprop*{posy}[0]{\the\pdflastypos} -\zref@addprop{savepos}{posx,posy} +\zref@addprops{savepos}{posx,posy} +\def\zref@savepos{% + \if@filesw + \pdfsavepos + \fi +} \ZREF@IfDefinable\zsavepos\def{% #1{% \@bsphack \if@filesw - \pdfsavepos + \zref@savepos \zref@labelbylist{#1}{savepos}% \fi \@esphack diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index f61c704f942..1d407e42b03 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,26 +29,26 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/05/01 v2.17 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 2b4aed81388..42bb1160412 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,28 +29,27 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/05/01 v2.17 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} -\let\zref@titleref@current\ltx@empty -\zref@newprop{title}{\zref@titleref@current}% +\ZREF@NewPropTitle \zref@addprop\ZREF@mainlist{title}% \newif\ifzref@titleref@expand \let\ZREF@titleref@hook\ltx@empty @@ -100,7 +99,7 @@ \def\zref@titleref@current{#1}% }% \ZREF@IfDefinable\ztitlerefsetup\def{% - {\setkeys{ZREF@TR}}% + {\kvsetkeys{ZREF@TR}}% }% \ZREF@IfDefinable\ztitleref\def{% {\zref@wrapper@babel\ZREF@titleref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 8759cc82790..640b5c6c9c2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,26 +29,26 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/05/01 v2.17 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput \fi -\RequirePackage{zref-abspage}[2010/05/01] -\RequirePackage{zref-lastpage}[2010/05/01] +\RequirePackage{zref-abspage}[2011/03/18] +\RequirePackage{zref-lastpage}[2011/03/18] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index 600dc10fbf0..a6b08557b0e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/05/01 v2.17 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module user for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -54,6 +54,12 @@ \expandafter\zref@wrapper@babel\expandafter\zref@label \fi }% +\newcommand*{\zkvlabel}[1]{% + \ifx\label\ltx@gobble + \expandafter\ltx@gobblethree + \fi + \zref@wrapper@babel{\zref@labelbykv{#1}}% +}% \newcommand*{\zref}[2][default]{% robust because of optional argument \zref@propexists{#1}{% \zref@wrapper@babel\ZREF@zref{#2}{#1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 468ae836c32..c14b713c02b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/05/01 v2.17 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2011/03/18] \ifx\ZREF@base@ok Y% \else \expandafter\endinput @@ -52,26 +52,6 @@ \zref@newprop{url}{}% \zref@newprop{urluse}{}% \zref@newprop{externaldocument}{}% -\def\ZREF@xr@NewPropAnchor{% - \ltx@ifpackageloaded{zref-hyper}{% - }{% - \zref@newprop{anchor}{% - \ltx@ifundefined{@currentHref}{}{\@currentHref}% - }% - }% - \global\let\ZREF@xr@NewPropAnchor\relax -} -\def\ZREF@xr@NewPropTitle{% - \ltx@ifpackageloaded{zref-title}{% - }{% - \zref@newprop{title}{}% - }% - \global\let\ZREF@xr@NewPropTitle\relax -} -\def\ZREF@xr@NewPropTheotype{% - \zref@newprop{theotype}{}% - \global\let\ZREF@xr@NewPropTheotype -} \providecommand*{\zref@xr@ext}{% \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% @@ -88,7 +68,7 @@ } \DeclareBoolOption[false]{urluse} \newcommand*{\zxrsetup}{% - \setkeys{ZREF@XR}% + \kvsetkeys{ZREF@XR}% }% \newcount\ZREF@xr@URL \ZREF@xr@URL=\ltx@zero @@ -120,8 +100,8 @@ } \ZREF@IfDefinable\zexternaldocument\def{% {% - \ZREF@xr@NewPropAnchor - \ZREF@xr@NewPropTitle + \ZREF@NewPropAnchor + \ZREF@NewPropTitle \begingroup \csname @safe@actives@true\endcsname \makeatletter @@ -291,7 +271,7 @@ \ifx\\#4\\% \else % ntheorem knows an optional argument at the end of \newlabel - \ZREF@xr@NewPropTheotype + \ZREF@NewPropTheotype \expandafter\ltx@LocalAppendToMacro \csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}% \fi @@ -365,8 +345,8 @@ Zref label `#1' is already in use\MessageBreak in file `\ZREF@xr@file'% }% - \edef\ZREF@xr@ignored@empty{% - \the\numexpr\ZREF@xr@ignored+1% + \edef\ZREF@xr@ignored@zref{% + \the\numexpr\ZREF@xr@ignored@zref+1% }% }% \def\ZREF@xr@ltx@ignorewarning#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index cdc2a903d59..5844e3a4060 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2010 by +%% Copyright (C) 2006-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,25 +29,25 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, -%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty, -%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty, -%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty, -%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, %% zref-test-base.tex, zref-test-runs.tex, %% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/05/01 v2.17 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/05/01] + [2011/03/18 v2.21 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2011/03/18] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/05/01]% + \RequirePackage{zref-#1}[2011/03/18]% }% }% } |