diff options
| author | Karl Berry <karl@freefriends.org> | 2008-06-14 18:55:27 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2008-06-14 18:55:27 +0000 |
| commit | 8842febffdfa43a08856423a4ae0c13ffa2506e4 (patch) | |
| tree | c58437a40b701d13a102d05fb91693d56a6e9d04 /Master | |
| parent | d7122615203188ff1f643c83d927322d109cf456 (diff) | |
oberdiek update (13jun08)
git-svn-id: svn://tug.org/texlive/trunk@8732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
82 files changed, 253 insertions, 94 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf Binary files differindex 574fdc8db6d..6ae6f47a03a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf Binary files differindex 19dea30e7b6..f085394b129 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf Binary files differindex da64ffec486..2ef8152532b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/alphalph.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf Binary files differindex 040a192e060..bffd60a72b9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/askinclude.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf Binary files differindex 91956fa18de..1c9781b1e1a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atbegshi.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf Binary files differindex 13d5112b1ca..2f03fe07c15 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/atenddvi.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf Binary files differindex 7048db1b41c..1978966a2eb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf Binary files differindex 832a429ac4d..2b05d0d198e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/auxhook.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf Binary files differindex 22aa1c8b0ab..8d47ba6fc1b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bigintcalc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf Binary files differindex 6e45ab603ac..e2d5835546d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bitset.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf Binary files differindex a45eb83838f..39057bd2a89 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf Binary files differindex cd5da1ed238..537211b8f04 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/bookmark.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf Binary files differindex 5f876a1edcb..c05fd57ad83 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/catchfile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf Binary files differindex 54900ef22f7..c1b877acf86 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf Binary files differindex 3f784664f26..c6bb2a4805d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/chemarr.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf Binary files differindex c622247eaf9..2565e1efdb5 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/classlist.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf Binary files differindex e04511e5706..9a6fd38d841 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/colonequals.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf Binary files differindex 3190511df52..1d7f463efcd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf Binary files differindex 29a1f565678..4bb62ac5860 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf Binary files differindex 5d77aa5aafb..7f0860670f2 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/engord.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/engord.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf Binary files differindex 949356e2a5f..d34db0f0818 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/epstopdf.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf Binary files differindex 6afd797c761..c70e904322a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/etexcmds.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf Binary files differindex 627d5d6917a..b94bfce9a83 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/flags.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf Binary files differindex 9a693fbf0a0..63ede07e5dc 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/grfext.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf Binary files differindex 811ceb60056..bf0cd9d8afc 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf Binary files differindex 734d5ca0d6a..0d7fa9e15aa 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/holtxdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf Binary files differindex 6915b043130..d17f322d424 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hycolor.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf Binary files differindex 31dd33e6a0a..eee43724334 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf Binary files differindex decd151132b..5209b07b780 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypcap.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf Binary files differindex 52aeaf37a81..5f29b2d3dca 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdestopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf Binary files differindex 06ccc648852..8483fe23c28 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypdoc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf Binary files differindex 203359ede69..6950f37f0f8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hypgotoe.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf Binary files differindex 8e03963e512..3f36fdc4c94 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/hyphsubst.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf Binary files differindex ed6edd0bb1a..957dc3dcfbf 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf Binary files differindex d5538717164..41b5cded2af 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/iflang.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf Binary files differindex 2e868cc219e..9c094d57b5a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifluatex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf Binary files differindex 07668a2f793..650f6cc6fab 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf Binary files differindex 35daa2b0d8a..0f870b8aa3d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/ifvtex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf Binary files differindex b696b32dfef..3680e953888 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/infwarerr.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf Binary files differindex e2038fab2f4..f7d8f67a626 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf Binary files differindex 4f8fb9921dc..b0c346e862d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/intcalc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf Binary files differindex 5d34d1d68fa..9073a2a1ed3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf Binary files differindex d27e5bc40ba..2d1da9ed86f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/kvsetkeys.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro-showcases.tex b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro-showcases.tex index 92af130dc89..df240175e6b 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro-showcases.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro-showcases.tex @@ -70,7 +70,7 @@ \DeclareRobustCommand{\cmd}[2][default]{}% } \typeout{} -\RequirePackage{etoolbox}\relax +\RequirePackage{etoolbox}[2008/06/12]% \Line{} \Line{* etoolbox's robust definitions:} \ShowDef{cmd}{% @@ -79,6 +79,20 @@ \ShowDef{cmd}{% \newrobustcmd{\cmd}[2][default]{}% } +\Line{} +\Line{* etoolbox's \string\robustify:} +\ShowDef{cmd}{% + \newcommand{\cmd}[2][default]{} % + \robustify{\cmd}% +} +\ShowDef{cmd}{% + \DeclareRobustCommand{\cmd}{} % + \robustify{\cmd}% +} +\ShowDef{cmd}{% + \DeclareRobustCommand{\cmd}[2][default]{} % + \robustify{\cmd}% +} \typeout{} \@@end \endinput diff --git a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf Binary files differindex f6dd97d2523..8c060165adc 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/letltxmacro.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf Binary files differindex e9fa651112a..c6d7302c8de 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf Binary files differindex 28c01478559..2eaa9f547d7 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/luacolor.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf Binary files differindex dc672ad3f56..3e279dd9510 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/luatex.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf Binary files differindex e79f651239f..630d44ee489 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/magicnum.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf Binary files differindex c173ea12e46..3e26f0608f3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf Binary files differindex 078219d29c7..4c83b795753 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/oberdiek.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf Binary files differindex 208c25e639f..7fe195cd8e8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pagesel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf Binary files differindex 926331ad8f2..5dc68b554af 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf Binary files differindex f94d84cab96..86ebf241fa6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf Binary files differindex 12f148f7fa9..a5b0a2d93b8 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf Binary files differindex c5b6a9573c7..dba5faa27b6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparallel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf Binary files differindex 006e094b483..1a3e037301c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcolparcolumns.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf Binary files differindex c3d745dba4a..0d41f2ff98e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf Binary files differindex 5dca0d34ce2..a564ec8493d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf Binary files differindex 43cb4659580..422c59fe66c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdflscape.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf Binary files differindex 4740f04c83b..95f2c4310fe 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf Binary files differindex 91d90957ff7..b890dc015bb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/picture.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf Binary files differindex e57b1f9dbaa..7158f236458 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf Binary files differindex ec9f61991e5..1406da34cae 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/refcount.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf Binary files differindex 86e8e7df47c..6922650dc06 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/selinput.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf Binary files differindex 72668a8d8d6..3d9891fa74e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf Binary files differindex 0aa39e7153f..e7d8eacc553 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf Binary files differindex 212ae3a6562..f247126760d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/soulutf8.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf Binary files differindex 9f6f2b1df88..7057f8484af 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf Binary files differindex 292fad8f3d6..c9f758e76ea 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/stringenc.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf Binary files differindex 899ba4d15cf..ce73b57fd30 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf Binary files differindex 7c262dc727e..991f682bf17 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/tabularkv.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf Binary files differindex 89a487747c4..983df99496e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/telprint.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test1.tex index 3f9e112d562..759c833232c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test1.tex @@ -65,7 +65,7 @@ \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \RequirePackage{letltxmacro}[2008/06/12]\relax + \RequirePackage{letltxmacro}[2008/06/13]\relax \RestoreCatcodes } \Test diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test2.tex index b7e3f07570d..e98085bde88 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/letltxmacro-test2.tex @@ -32,7 +32,7 @@ \nofiles \documentclass{minimal} -\usepackage{letltxmacro}[2008/06/12] +\usepackage{letltxmacro}[2008/06/13] \usepackage{qstest} \IncludeTests{*} @@ -124,11 +124,21 @@ \LetLtxMacro\NewEmpty\empty \Expect*{\meaning\empty}{macro:->}% \Expect*{\meaning\NewEmpty}{macro:->}% + \def\TestA{\iffalse}% + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\iffalse }% + \TestEquals{TestA}{TestB}% \end{qstest} -\usepackage{etoolbox} +\usepackage{etoolbox}[2008/06/12] -\begin{qstest}{newrobustcmd}{newrobustcmd} - \newrobustcmd{\TestA}[1][\default]{TestA}% +\begin{qstest}{newrobustcmd}{oldnewrobustcmd} + \protected\edef\TestA{% + \noexpand\@testopt + \expandafter\noexpand\csname\string\TestA\endcsname + {\noexpand\default}% + }% + \expandafter\protected\expandafter + \def\csname\string\TestA\endcsname{TestA}% \SaveA \LetLtxMacro\TestB\TestA \TestDef{TestB}{\@testopt \\TestB {\default }}% @@ -140,6 +150,57 @@ \TestEquals{TestB}{TestC}% \CheckA \end{qstest} + +\begin{qstest}{newrobustcmd}{newrobustcmd} + \newrobustcmd{\TestA}[1][\default]{TestA}% + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\@protected@testopt \TestB \\TestB {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestB + \expandafter\noexpand\csname\string\TestB\endcsname + {\noexpand\default}% + }% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} + +\begin{qstest}{robustifyopt}{robustifyopt} + \newcommand{\TestA}[2][\default]{}% + \TestDef{TestA}{\@protected@testopt \TestA \\TestA {\default }}% + \robustify\TestA + \TestDef{TestA}{\@protected@testopt \TestA \\TestA {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestA + \expandafter\noexpand\csname\string\TestA\endcsname + {\noexpand\default}% + }% + \TestEquals{TestA}{TestC}% + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\@protected@testopt \TestB \\TestB {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestB + \expandafter\noexpand\csname\string\TestB\endcsname + {\noexpand\default}% + }% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} + +\begin{qstest}{robustifydeclare}{robustifydeclare} + \DeclareRobustCommand\TestA{\iffalse}% + \robustify\TestA + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\iffalse }% + \protected\long\def\TestC{\iffalse}% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} \csname @@end\endcsname \endinput %% diff --git a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf Binary files differindex 6dc9dc70484..a417dd63c3e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf Binary files differindex ca6f74a8cb6..1d6ea9e2256 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/twoopt.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf Binary files differindex 1a602af3c72..a73539653e1 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/zref.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/zref.pdf diff --git a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx index 6a87fb4434a..9eb003fe93e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/letltxmacro.dtx @@ -71,7 +71,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: letltxmacro 2008/06/12 v1.1 Let assignment for LaTeX macros (HO)} +\Msg{* Package: letltxmacro 2008/06/13 v1.2 Let assignment for LaTeX macros (HO)} \Msg{************************************************************************} \keepsilent @@ -144,7 +144,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{letltxmacro.drv}% - [2008/06/12 v1.1 Let assignment for LaTeX macros (HO)]% + [2008/06/13 v1.2 Let assignment for LaTeX macros (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2007/11/11] \begin{document} @@ -153,7 +153,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{646} +% \CheckSum{813} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -174,7 +174,7 @@ and the derived files % \GetFileInfo{letltxmacro.drv} % % \title{The \xpackage{letltxmacro} package} -% \date{2008/06/12 v1.1} +% \date{2008/06/13 v1.2} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -234,6 +234,7 @@ and the derived files % \cs{newenvironment}, \cs{renewenvironment} & latex/base\\ % \cs{DeclareRobustCommand}& latex/base\\ % \cs{newrobustcmd}, \cs{renewrobustcmd} & etoolbox\\ +% \cs{robustify} & etoolbox 2008/06/12 v1.6a\\ % \end{tabular} % \end{quote} % @@ -305,7 +306,11 @@ and the derived files \DeclareRobustCommand{\cmd}[2][default]{}% } \typeout{} -\RequirePackage{etoolbox}\relax +% \end{macrocode} +% The minimal version of package \xpackage{etoolbox} is 2008/06/12 v1.6a +% because it fixes \cs{robustify}. +% \begin{macrocode} +\RequirePackage{etoolbox}[2008/06/12]% \Line{} \Line{* etoolbox's robust definitions:} \ShowDef{cmd}{% @@ -314,11 +319,6 @@ and the derived files \ShowDef{cmd}{% \newrobustcmd{\cmd}[2][default]{}% } -% \end{macrocode} -% \iffalse -% ^^A \robustify is still broken in etoolbox v1.5. -% \begin{macrocode} -%<*disabled> \Line{} \Line{* etoolbox's \string\robustify:} \ShowDef{cmd}{% @@ -333,13 +333,7 @@ and the derived files \DeclareRobustCommand{\cmd}[2][default]{} % \robustify{\cmd}% } -%</disabled> -% \end{macrocode} -% \fi -% \begin{macrocode} \typeout{} -% \end{macrocode} -% \begin{macrocode} \@@end %</showcases> % \end{macrocode} @@ -376,8 +370,21 @@ and the derived files % (\cmd) = (\protected\long macro:->) % %\newrobustcmd {\cmd }[2][default]{} -% (\cmd) = (\protected macro:->\@testopt \\cmd {default}) -% (\\cmd) = (\protected\long macro:[#1]#2->) +% (\cmd) = (\protected macro:->\@protected@testopt \cmd \\cmd {default}) +% (\\cmd) = (\long macro:[#1]#2->) +% +%* etoolbox's \robustify: +% +%\newcommand {\cmd }[2][default]{} \robustify {\cmd } +% (\cmd) = (\protected macro:->\@protected@testopt \cmd \\cmd {default}) +% (\\cmd) = (\long macro:[#1]#2->) +% +%\DeclareRobustCommand {\cmd }{} \robustify {\cmd } +% (\cmd) = (\protected\long macro:->) +% +%\DeclareRobustCommand {\cmd }[2][default]{} \robustify {\cmd } +% (\cmd) = (\protected macro:->\@protected@testopt \cmd \\cmd {default}) +% (\\cmd) = (\long macro:[#1]#2->) %\end{verbatim} % \endgroup % @@ -433,7 +440,7 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{letltxmacro}% - [2008/06/12 v1.1 Let assignment for LaTeX macros (HO)] + [2008/06/13 v1.2 Let assignment for LaTeX macros (HO)] % \end{macrocode} % % \subsubsection{Main macros} @@ -469,16 +476,28 @@ and the derived files \def\llm@LetLtxMacro#1#2{% \expandafter\llm@CheckParams\meaning#2:->\@nil{% \begingroup - \ifx\llm@protected\@empty - \edef\x{% + \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#2% - \expandafter\noexpand\csname\string#2\endcsname - }% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\y - \expandafter\expandafter\expandafter{% - \expandafter\llm@CarThree#2{}{}{}\llm@nil + \noexpand#1% }% \else \edef\x{% @@ -490,33 +509,27 @@ and the derived files \expandafter\expandafter\expandafter{% \expandafter\llm@CarTwo#2{}{}\llm@nil }% - \fi - \expandafter\endgroup\ifx\x\y - \begingroup - \def\@protected@testopt##1##2##3{% - \toks@={##3}% - \xdef\llm@GlobalTemp{% - \noexpand\@protected@testopt - \noexpand#1% - \expandafter\noexpand\csname\string#1\endcsname - {\the\toks@}% - }% - }% - \def\@testopt##1##2{% - \toks@={##2}% - \protected\xdef\llm@GlobalTemp{% + \ifx\x\y + #2% + \def\llm@testopt{% \noexpand\@testopt - \expandafter\noexpand\csname\string#1\endcsname - {\the\toks@}% }% + \fi + \fi + \ifx\llm@testopt\@empty + \else + \llm@protected\xdef\llm@GlobalTemp{% + \llm@testopt + \expandafter\noexpand\csname\string#1\endcsname + {\the\toks@}% }% - #2% - \endgroup + \fi + \expandafter\endgroup\ifx\llm@testopt\@empty + \let#1=#2\relax + \else \let#1=\llm@GlobalTemp \expandafter\let\csname\string#1\expandafter\endcsname \csname\string#2\endcsname - \else - \let#1=#2\relax \fi }{% \let#1=#2\relax @@ -619,7 +632,7 @@ and the derived files \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \RequirePackage{letltxmacro}[2008/06/12]\relax + \RequirePackage{letltxmacro}[2008/06/13]\relax \RestoreCatcodes } \Test @@ -640,7 +653,7 @@ and the derived files \nofiles \documentclass{minimal} -\usepackage{letltxmacro}[2008/06/12] +\usepackage{letltxmacro}[2008/06/13] \usepackage{qstest} \IncludeTests{*} @@ -732,14 +745,24 @@ and the derived files \LetLtxMacro\NewEmpty\empty \Expect*{\meaning\empty}{macro:->}% \Expect*{\meaning\NewEmpty}{macro:->}% + \def\TestA{\iffalse}% + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\iffalse }% + \TestEquals{TestA}{TestB}% \end{qstest} % \end{macrocode} % % \begin{macrocode} -\usepackage{etoolbox} +\usepackage{etoolbox}[2008/06/12] -\begin{qstest}{newrobustcmd}{newrobustcmd} - \newrobustcmd{\TestA}[1][\default]{TestA}% +\begin{qstest}{newrobustcmd}{oldnewrobustcmd} + \protected\edef\TestA{% + \noexpand\@testopt + \expandafter\noexpand\csname\string\TestA\endcsname + {\noexpand\default}% + }% + \expandafter\protected\expandafter + \def\csname\string\TestA\endcsname{TestA}% \SaveA \LetLtxMacro\TestB\TestA \TestDef{TestB}{\@testopt \\TestB {\default }}% @@ -751,6 +774,57 @@ and the derived files \TestEquals{TestB}{TestC}% \CheckA \end{qstest} + +\begin{qstest}{newrobustcmd}{newrobustcmd} + \newrobustcmd{\TestA}[1][\default]{TestA}% + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\@protected@testopt \TestB \\TestB {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestB + \expandafter\noexpand\csname\string\TestB\endcsname + {\noexpand\default}% + }% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} + +\begin{qstest}{robustifyopt}{robustifyopt} + \newcommand{\TestA}[2][\default]{}% + \TestDef{TestA}{\@protected@testopt \TestA \\TestA {\default }}% + \robustify\TestA + \TestDef{TestA}{\@protected@testopt \TestA \\TestA {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestA + \expandafter\noexpand\csname\string\TestA\endcsname + {\noexpand\default}% + }% + \TestEquals{TestA}{TestC}% + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\@protected@testopt \TestB \\TestB {\default }}% + \protected\edef\TestC{% + \noexpand\@protected@testopt + \noexpand\TestB + \expandafter\noexpand\csname\string\TestB\endcsname + {\noexpand\default}% + }% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} + +\begin{qstest}{robustifydeclare}{robustifydeclare} + \DeclareRobustCommand\TestA{\iffalse}% + \robustify\TestA + \SaveA + \LetLtxMacro\TestB\TestA + \TestDef{TestB}{\iffalse }% + \protected\long\def\TestC{\iffalse}% + \TestEquals{TestB}{TestC}% + \CheckA +\end{qstest} % \end{macrocode} % % \begin{macrocode} @@ -953,6 +1027,10 @@ and the derived files % \item % Support for \xpackage{etoolbox}'s \cs{newrobustcmd} added. % \end{Version} +% \begin{Version}{2008/06/13 v1.2} +% \item +% Support for \xpackage{etoolbox}'s \cs{robustify} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index 21ff6a74aff..2f4a8993053 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2008/06/12 +% 2008/06/13 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index ef2d5c42e25..cdf34243d50 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2008/06/12} +\newcommand*{\Date}{2008/06/13} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -245,7 +245,7 @@ [\entrysep] \entry{kvsetkeys}{2007/09/29}{1.3}{Key value parser with default handler support}% [\entrysep] -\entry{letltxmacro}{2008/06/12}{1.1}{Let assignment for \LaTeX{} macros}% +\entry{letltxmacro}{2008/06/13}{1.2}{Let assignment for \LaTeX{} macros}% [\entrysep] \entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}% [\entrysep] diff --git a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty index f247981c1c2..b30895306f9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/letltxmacro.sty @@ -67,7 +67,7 @@ \escapechar=92 % `\\ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{letltxmacro}% - [2008/06/12 v1.1 Let assignment for LaTeX macros (HO)] + [2008/06/13 v1.2 Let assignment for LaTeX macros (HO)] \newcommand*{\LetLtxMacro}[2]{% \edef\reserved@a{% \noexpand\protect @@ -93,16 +93,28 @@ \def\llm@LetLtxMacro#1#2{% \expandafter\llm@CheckParams\meaning#2:->\@nil{% \begingroup - \ifx\llm@protected\@empty - \edef\x{% + \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#2% - \expandafter\noexpand\csname\string#2\endcsname - }% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\y - \expandafter\expandafter\expandafter{% - \expandafter\llm@CarThree#2{}{}{}\llm@nil + \noexpand#1% }% \else \edef\x{% @@ -114,33 +126,27 @@ \expandafter\expandafter\expandafter{% \expandafter\llm@CarTwo#2{}{}\llm@nil }% - \fi - \expandafter\endgroup\ifx\x\y - \begingroup - \def\@protected@testopt##1##2##3{% - \toks@={##3}% - \xdef\llm@GlobalTemp{% - \noexpand\@protected@testopt - \noexpand#1% - \expandafter\noexpand\csname\string#1\endcsname - {\the\toks@}% - }% - }% - \def\@testopt##1##2{% - \toks@={##2}% - \protected\xdef\llm@GlobalTemp{% + \ifx\x\y + #2% + \def\llm@testopt{% \noexpand\@testopt - \expandafter\noexpand\csname\string#1\endcsname - {\the\toks@}% }% + \fi + \fi + \ifx\llm@testopt\@empty + \else + \llm@protected\xdef\llm@GlobalTemp{% + \llm@testopt + \expandafter\noexpand\csname\string#1\endcsname + {\the\toks@}% }% - #2% - \endgroup + \fi + \expandafter\endgroup\ifx\llm@testopt\@empty + \let#1=#2\relax + \else \let#1=\llm@GlobalTemp \expandafter\let\csname\string#1\expandafter\endcsname \csname\string#2\endcsname - \else - \let#1=#2\relax \fi }{% \let#1=#2\relax |