diff options
author | Karl Berry <karl@freefriends.org> | 2011-04-17 22:42:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-04-17 22:42:13 +0000 |
commit | ad1e4d8e6581af6cb4c9a35f02f09ffda2d97df7 (patch) | |
tree | 62d972bb50afece3227f1ab7a79a67cd254389ce /Master/texmf-dist/tex/generic | |
parent | 45824df4db55ca98caef21d38b00d54ccdb5be4c (diff) |
oberdiek (17apr11)
git-svn-id: svn://tug.org/texlive/trunk@22111 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
6 files changed, 237 insertions, 63 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty b/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty index 6d0da5fcedb..a4215a25c20 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/embedfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/embedfile.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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 717afa7030e..328c0d37bcd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -612,7 +612,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2011/03/16 v1.18 LaTeX kernel commands for general use (HO)]% + [2011/04/14 v1.19 LaTeX kernel commands for general use (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -668,6 +668,36 @@ \def\ltx@minusone{% -\ltx@one } +\toksdef\ltx@LocToksA=0 % +\toksdef\ltx@LocToksB=2 % +\toksdef\ltx@LocToksC=4 % +\toksdef\ltx@LocToksD=6 % +\toksdef\ltx@LocToksE=8 % +\toksdef\ltx@GlobToksA=1 % +\toksdef\ltx@GlobToksB=3 % +\toksdef\ltx@GlobToksC=5 % +\toksdef\ltx@GlobToksD=7 % +\toksdef\ltx@GlobToksE=9 % +\dimendef\ltx@LocDimenA=0 % +\dimendef\ltx@LocDimenB=2 % +\dimendef\ltx@LocDimenC=4 % +\dimendef\ltx@LocDimenD=6 % +\dimendef\ltx@LocDimenE=8 % +\dimendef\ltx@GlobDimenA=1 % +\dimendef\ltx@GlobDimenB=3 % +\dimendef\ltx@GlobDimenC=5 % +\dimendef\ltx@GlobDimenD=7 % +\dimendef\ltx@GlobDimenE=9 % +\skipdef\ltx@LocSkipA=0 % +\skipdef\ltx@LocSkipB=2 % +\skipdef\ltx@LocSkipC=4 % +\skipdef\ltx@LocSkipD=6 % +\skipdef\ltx@LocSkipE=8 % +\skipdef\ltx@GlobSkipA=1 % +\skipdef\ltx@GlobSkipB=3 % +\skipdef\ltx@GlobSkipC=5 % +\skipdef\ltx@GlobSkipD=7 % +\skipdef\ltx@GlobSkipE=9 % \long\def\ltx@gobble#1{} \long\def\ltx@gobbletwo#1#2{} \long\def\ltx@gobblethree#1#2#3{} @@ -936,8 +966,8 @@ \fi \fi \begingroup - \toks0\expandafter{#1#2}% - \xdef#1{\the\toks0}% + \ltx@LocToksA\expandafter{#1#2}% + \xdef#1{\the\ltx@LocToksA}% \endgroup } \long\def\ltx@LocalAppendToMacro#1#2{% @@ -950,42 +980,51 @@ \fi \fi \begingroup - \toks0\expandafter{\LTXcmds@gtemp#2}% - \xdef\LTXcmds@gtemp{\the\toks0}% + \ltx@LocToksA\expandafter{\LTXcmds@gtemp#2}% + \xdef\LTXcmds@gtemp{\the\ltx@LocToksA}% \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}% + \ltx@LocToksA{\endgroup#2}% + \ltx@LocToksB{\endgroup#3}% \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar } \def\LTXcmds@ifnextchar{% \ifx\LTXcmds@LetToken\LTXcmds@CharToken - \expandafter\endgroup\the\toks\expandafter\ltx@zero + \the\expandafter\ltx@LocToksA \else \ifx\LTXcmds@LetToken\LTXcmds@SpaceToken \expandafter\expandafter\expandafter\LTXcmds@@ifnextchar \else - \expandafter\endgroup\the\toks - \expandafter\expandafter\expandafter\ltx@two + \the\expandafter\expandafter\expandafter\ltx@LocToksB \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{ } +\def\LTXcmds@@ifnextchar{% + \expandafter\futurelet + \expandafter\LTXcmds@LetToken + \expandafter\LTXcmds@ifnextchar + \romannumeral-`\.% +} +\ltx@firstofone{\let\LTXcmds@SpaceToken= } % +\long\def\ltx@ifnextchar@nospace#1#2#3{% + \begingroup + \let\LTXcmds@CharToken= #1\relax + \ltx@LocToksA{\endgroup#2}% + \ltx@LocToksB{\endgroup#3}% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar@nospace +} +\def\LTXcmds@ifnextchar@nospace{% + \the + \ifx\LTXcmds@LetToken\LTXcmds@CharToken + \expandafter\ltx@LocToksA + \else + \expandafter\ltx@LocToksB + \fi +} \ltx@IfUndefined{quitvmode}{% \ltx@IfUndefined{leavevmode}{% \ltx@IfUndefined{voidb@x}{% @@ -1156,7 +1195,6 @@ $ \next \ltx@IfBoxEmpty{#1}% } \LTXcmds@AtEnd% - \endinput <hobsub> \hobsub@StopPackage @@ -4532,7 +4570,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/10 v0.14 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4906,7 +4944,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax require("oberdiek.pdftexcmds")% } \begingroup - \def\x{2011/04/10 v0.14}% + \def\x{2011/04/16 v0.15}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5054,11 +5092,14 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\def\pdf@shellescape{% - \directlua0{% - oberdiek.pdftexcmds.shellescape()% +\ifnum\luatexversion<70 % +\else + \def\pdf@shellescape{% + \directlua0{% + oberdiek.pdftexcmds.shellescape()% + }% }% -} +\fi \def\pdf@system#1{% \directlua0{% oberdiek.pdftexcmds.system("\luaescapestring{#1}")% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty index fb4cc12a8ee..40ffc832cee 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty @@ -765,10 +765,12 @@ \edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{atveryend}% - [2010/03/24 v1.5 Hooks at very end of document (HO)] + [2011/04/15 v1.6 Hooks at very end of document (HO)] \let\AtVeryEnd@BeforeClearDocumentHook\@empty \let\AtVeryEnd@AfterLastShipoutHook\@empty \let\AtVeryEnd@AtVeryEndDocumentHook\@empty +\let\AtVeryEnd@AtEndAfterFileListHook\@empty +\let\AtVeryEnd@AtVeryVeryEndHook\@empty \newcommand*{\BeforeClearDocument}{% \g@addto@macro\AtVeryEnd@BeforeClearDocumentHook } @@ -778,6 +780,12 @@ \newcommand*{\AtVeryEndDocument}{% \g@addto@macro\AtVeryEnd@AtVeryEndDocumentHook } +\newcommand*{\AtEndAfterFileList}{% + \g@addto@macro\AtVeryEnd@AtEndAfterFileListHook +} +\newcommand*{\AtVeryVeryEnd}{% + \g@addto@macro\AtVeryEnd@AtVeryVeryEndHook +} \newcommand*{\Call@BeforeClearDocument}{% \let\BeforeClearDocument\@firstofone \ifx\AtVeryEnd@BeforeClearDocumentHook\@empty @@ -811,6 +819,30 @@ \global\let\AtVeryEnd@AtVeryEndDocumentHook\@undefined \global\let\Call@AtVeryEndDocument\relax } +\newcommand*{\Call@AtEndAfterFileList}{% + \Call@AtVeryEndDocument + \let\AtEndAfterFileList\@firstofone + \ifx\AtVeryEnd@AtEndAfterFileListHook\@empty + \PackageInfo{atveryend}{Empty hook `AtEndAfterFileList'}% + \else + \PackageInfo{atveryend}{Executing hook `AtEndAfterFileList'}% + \AtVeryEnd@AtEndAfterFileListHook + \fi + \global\let\AtVeryEnd@AtEndAfterFileListHook\@undefined + \global\let\Call@AtEndAfterFileList\relax +} +\newcommand*{\Call@AtVeryVeryEnd}{% + \Call@AtEndAfterFileList + \let\AtVeryVeryEnd\@firstofone + \ifx\AtVeryEnd@AtVeryVeryEndHook\@empty + \PackageInfo{atveryend}{Empty hook `AtVeryVeryEnd'}% + \else + \PackageInfo{atveryend}{Executing hook `AtVeryVeryEnd'}% + \AtVeryEnd@AtVeryVeryEndHook + \fi + \global\let\AtVeryEnd@AtVeryVeryEndHook\@undefined + \global\let\Call@AtVeryVeryEnd\relax +} \def\AtVeryEnd@test@standard{% \let\AtEndDocument\@firstofone \@enddocumenthook @@ -864,6 +896,7 @@ \fi \Call@AtVeryEndDocument \@dofilelist + \Call@AtEndAfterFileList \ifdim \font@submax >\fontsubfuzz\relax \@font@warning{Size substitutions with differences\MessageBreak up to \font@submax\space have occurred.\@gobbletwo}% @@ -882,6 +915,7 @@ \fi \endgroup \deadcycles\z@ + \Call@AtVeryVeryEnd \@@end } \expandafter\def\expandafter\AtVeryEnd@test@booklet\expandafter{% @@ -925,8 +959,11 @@ \immediate\closeout\@mainaux \fi \Call@AtVeryEndDocument + \csname @dofilelist\endcsname + \Call@AtEndAfterFileList \endgroup \deadcycles\z@ + \Call@AtVeryVeryEnd \@@end } \def\AtVeryEnd@test@combine{% @@ -968,8 +1005,56 @@ \@refundefined \endgroup \deadcycles\z@ + \Call@AtVeryVeryEnd \@@end } +\long\def\AtVeryEnd@test@c@lenddoca{% + \@dofilelist + \ifdim\font@submax>\fontsubfuzz\relax + \@font@warning{% + Size substitutions with differences\MessageBreak + up to \font@submax\space have occured.\@gobbletwo + }% + \fi + \@defaultsubs + \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 +} +\ifx\AtVeryEnd@c@lenddoca\c@lenddoca + \def\c@lenddoca{% + \@dofilelist + \Call@AtEndAfterFileList + \ifdim\font@submax>\fontsubfuzz\relax + \@font@warning{% + Size substitutions with differences\MessageBreak + up to \font@submax\space have occured.\@gobbletwo + }% + \fi + \@defaultsubs + \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 + }% +\fi \def\AtVeryEnd@test@jpsj{% \if@lastpagebalancing \global\let\@outputdblcol=\balancing@outputdblcol @@ -1021,8 +1106,11 @@ \fi \fi \Call@AtVeryEndDocument + \csname @dofilelist\endcsname + \Call@AtEndAfterFileList \endgroup \deadcycles\z@ + \Call@AtVeryVeryEnd \@@end } \def\AtVeryEnd@Test#1#2{% @@ -1103,13 +1191,17 @@ } \AtEndDocument{% \@ifundefined{@dofilelist}{% - \gdef\@dofilelist{\Call@AtVeryEndDocument}% + \gdef\@dofilelist{% + \Call@AtVeryEndDocument + \Call@AtEndAfterFileList + }% }{% \begingroup \toks@\expandafter{\@dofilelist}% \xdef\@dofilelist{% \noexpand\Call@AtVeryEndDocument \the\toks@ + \noexpand\Call@AtEndAfterFileList }% \endgroup }% diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty index 262a9d0ad00..55009b1a512 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvdefinekeys.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 diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty index 156908c07c2..0644bd53c94 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty @@ -33,7 +33,7 @@ %% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv, %% ltxcmds-test1.tex, ltxcmds-test-gobble.tex, %% ltxcmds-test-ifempty.tex, ltxcmds-test-zapspace.tex, -%% ltxcmds-test-ifboxempty.tex. +%% ltxcmds-test-ifboxempty.tex, ltxcmds-test-nextchar.tex. %% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M @@ -101,7 +101,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2011/03/16 v1.18 LaTeX kernel commands for general use (HO)]% + [2011/04/14 v1.19 LaTeX kernel commands for general use (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -157,6 +157,36 @@ \def\ltx@minusone{% -\ltx@one } +\toksdef\ltx@LocToksA=0 % +\toksdef\ltx@LocToksB=2 % +\toksdef\ltx@LocToksC=4 % +\toksdef\ltx@LocToksD=6 % +\toksdef\ltx@LocToksE=8 % +\toksdef\ltx@GlobToksA=1 % +\toksdef\ltx@GlobToksB=3 % +\toksdef\ltx@GlobToksC=5 % +\toksdef\ltx@GlobToksD=7 % +\toksdef\ltx@GlobToksE=9 % +\dimendef\ltx@LocDimenA=0 % +\dimendef\ltx@LocDimenB=2 % +\dimendef\ltx@LocDimenC=4 % +\dimendef\ltx@LocDimenD=6 % +\dimendef\ltx@LocDimenE=8 % +\dimendef\ltx@GlobDimenA=1 % +\dimendef\ltx@GlobDimenB=3 % +\dimendef\ltx@GlobDimenC=5 % +\dimendef\ltx@GlobDimenD=7 % +\dimendef\ltx@GlobDimenE=9 % +\skipdef\ltx@LocSkipA=0 % +\skipdef\ltx@LocSkipB=2 % +\skipdef\ltx@LocSkipC=4 % +\skipdef\ltx@LocSkipD=6 % +\skipdef\ltx@LocSkipE=8 % +\skipdef\ltx@GlobSkipA=1 % +\skipdef\ltx@GlobSkipB=3 % +\skipdef\ltx@GlobSkipC=5 % +\skipdef\ltx@GlobSkipD=7 % +\skipdef\ltx@GlobSkipE=9 % \long\def\ltx@gobble#1{} \long\def\ltx@gobbletwo#1#2{} \long\def\ltx@gobblethree#1#2#3{} @@ -425,8 +455,8 @@ \fi \fi \begingroup - \toks0\expandafter{#1#2}% - \xdef#1{\the\toks0}% + \ltx@LocToksA\expandafter{#1#2}% + \xdef#1{\the\ltx@LocToksA}% \endgroup } \long\def\ltx@LocalAppendToMacro#1#2{% @@ -439,42 +469,51 @@ \fi \fi \begingroup - \toks0\expandafter{\LTXcmds@gtemp#2}% - \xdef\LTXcmds@gtemp{\the\toks0}% + \ltx@LocToksA\expandafter{\LTXcmds@gtemp#2}% + \xdef\LTXcmds@gtemp{\the\ltx@LocToksA}% \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}% + \ltx@LocToksA{\endgroup#2}% + \ltx@LocToksB{\endgroup#3}% \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar } \def\LTXcmds@ifnextchar{% \ifx\LTXcmds@LetToken\LTXcmds@CharToken - \expandafter\endgroup\the\toks\expandafter\ltx@zero + \the\expandafter\ltx@LocToksA \else \ifx\LTXcmds@LetToken\LTXcmds@SpaceToken \expandafter\expandafter\expandafter\LTXcmds@@ifnextchar \else - \expandafter\endgroup\the\toks - \expandafter\expandafter\expandafter\ltx@two + \the\expandafter\expandafter\expandafter\ltx@LocToksB \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{ } +\def\LTXcmds@@ifnextchar{% + \expandafter\futurelet + \expandafter\LTXcmds@LetToken + \expandafter\LTXcmds@ifnextchar + \romannumeral-`\.% +} +\ltx@firstofone{\let\LTXcmds@SpaceToken= } % +\long\def\ltx@ifnextchar@nospace#1#2#3{% + \begingroup + \let\LTXcmds@CharToken= #1\relax + \ltx@LocToksA{\endgroup#2}% + \ltx@LocToksB{\endgroup#3}% + \futurelet\LTXcmds@LetToken\LTXcmds@ifnextchar@nospace +} +\def\LTXcmds@ifnextchar@nospace{% + \the + \ifx\LTXcmds@LetToken\LTXcmds@CharToken + \expandafter\ltx@LocToksA + \else + \expandafter\ltx@LocToksB + \fi +} \ltx@IfUndefined{quitvmode}{% \ltx@IfUndefined{leavevmode}{% \ltx@IfUndefined{voidb@x}{% @@ -645,7 +684,6 @@ $ \next \ltx@IfBoxEmpty{#1}% } \LTXcmds@AtEnd% - \endinput %% %% End of file `ltxcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 76c56299899..75e37ea69e6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -101,7 +101,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/10 v0.14 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -475,7 +475,7 @@ require("oberdiek.pdftexcmds")% } \begingroup - \def\x{2011/04/10 v0.14}% + \def\x{2011/04/16 v0.15}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -623,11 +623,14 @@ oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\def\pdf@shellescape{% - \directlua0{% - oberdiek.pdftexcmds.shellescape()% +\ifnum\luatexversion<70 % +\else + \def\pdf@shellescape{% + \directlua0{% + oberdiek.pdftexcmds.shellescape()% + }% }% -} +\fi \def\pdf@system#1{% \directlua0{% oberdiek.pdftexcmds.system("\luaescapestring{#1}")% |