diff options
| author | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
| commit | 55ae6e504d04d806c4c5ac253dedb98196fc1c35 (patch) | |
| tree | 5200a08eba158000f26a357a2a54a0923dd189de | |
| parent | a7dfc63af349a5ea5fb37b110f584cc878308ea7 (diff) | |
oberdiek update 11/11
git-svn-id: svn://tug.org/texlive/trunk@5458 c570f23f-e606-0410-a88d-b1316a301751
260 files changed, 6753 insertions, 1064 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp-example.tex b/Master/texmf-dist/doc/latex/oberdiek/accsupp-example1.tex index 2b27907645c..ae00f5533c2 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/accsupp-example.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp-example1.tex @@ -1,10 +1,10 @@ %% -%% This is file `accsupp-example.tex', +%% This is file `accsupp-example1.tex', %% generated with the docstrip utility. %% %% The original source files were: %% -%% accsupp.dtx (with options: `example') +%% accsupp.dtx (with options: `example1') %% %% This is a generated file. %% @@ -26,13 +26,14 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \documentclass{article} -\usepackage{accsupp} +\usepackage{accsupp}[2007/11/14] \usepackage{centernot} - % U+2226 NOT PARALLEL - % \mathrel{...} prevents page break in between +% U+2226 NOT PARALLEL +% \mathrel{...} prevents page break in between \newcommand*{\notparallel}{% \ensuremath{% \mathrel{% @@ -49,4 +50,4 @@ A\notparallel B \end{document} \endinput %% -%% End of file `accsupp-example.tex'. +%% End of file `accsupp-example1.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp-example2.tex b/Master/texmf-dist/doc/latex/oberdiek/accsupp-example2.tex new file mode 100644 index 00000000000..903ff24093d --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/accsupp-example2.tex @@ -0,0 +1,51 @@ +%% +%% This is file `accsupp-example2.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% accsupp.dtx (with options: `example2') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file accsupp.dtx +%% and the derived files +%% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, +%% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. +%% +\documentclass{article} +\usepackage[unicode]{hyperref} +\usepackage{accsupp}[2007/11/14] +\begin{document} + \begin{equation} + \BeginAccSupp{ + method=pdfstringdef, + unicode, + ActualText={% + a\texttwosuperior +b\texttwosuperior + =c\texttwosuperior + } + } + a^2 + b^2 = c^2 + \EndAccSupp{} + \end{equation} +\end{document} +\endinput +%% +%% End of file `accsupp-example2.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf b/Master/texmf-dist/doc/latex/oberdiek/accsupp.pdf Binary files differindex 5ebb82a4e8e..e3a88d932f7 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 fdbe82b401e..c2376397692 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 4446ffc9403..da5c01db336 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 c94de31cb0d..33fa3f2fd33 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 f8809952403..f37b2acef96 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 9ee2b5540cf..05e4f2579cd 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 6095ed0386d..d46ff7e88ba 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 cee03833802..5206214d349 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 3e066a20909..766dc2c4b0d 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 486ed924641..5e13b517a11 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 436fcdbcd44..10d8e767841 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 81a4e651fd9..90eedb27ab6 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 098fc7d8978..2f9e5edb6b1 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 fd7ebe6859f..7b2af374a15 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 dd537f1e3fa..a439a6f560c 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 8459c0b2fef..c5b60f09e9b 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 bb8657f9a0a..b9a0d65fe73 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 5232b8a4df1..c657fa403e0 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-example-collection.tex b/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-collection.tex index 36faf70f708..13c5e6044ca 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-collection.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-collection.tex @@ -32,9 +32,9 @@ \NeedsTeXFormat{LaTeX2e} \documentclass{article} \usepackage[bookmarks=false]{hyperref} - % provides \pdfstringdef that is then used by `title' and - % other keys. -\usepackage{embedfile}[2007/10/29] +% provides \pdfstringdef that is then used by `title' and +% other keys. +\usepackage{embedfile}[2007/11/11] \embedfilesetup{ view=details, initialfile=embedfile.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex b/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex index fa63351711d..9844082a13e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/embedfile-example-plain.tex @@ -29,19 +29,19 @@ %% embedfile-example-collection.tex, embedfile-test1.tex, %% embedfile-test2.tex, embedfile-test3.tex. %% - % Load packages +% Load packages \input miniltx - % \def\Gin@driver{pdftex.def} - % \input graphicx.sty +% \def\Gin@driver{pdftex.def} +% \input graphicx.sty \input embedfile.sty \resetatcatcode - % default setting +% default setting \embedfilesetup{ mimetype=text/plain } - % Embed files +% Embed files \embedfile[ filespec=example.tex, desc={Source code (plain-TeX) of this example} @@ -56,10 +56,10 @@ desc={Documentation of package `embedfile'} ]{embedfile.pdf} - % Some text +% Some text This example document contains three embedded files. - % End of document +% End of document \embedfilefinish % don't forget \bye \endinput diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf Binary files differindex ea56bab12f4..147efb697c7 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 b35c60d279f..965e43dd197 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 6f4f40c58e2..f5dc7340d65 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 963a58c50bc..9c0380898d8 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 bc5f5ac4001..d0300ea5977 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 2bf9235e6b0..eae39cd8f99 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 d634f29c083..e0d955c159a 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 04e6e7212be..7820fc2b319 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 bd1f487974e..ec39f8fea26 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 6d5ccf00910..04481baadf7 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 3db9eff1d12..2bd961a6ddb 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 12a54f8b01d..471e6fbe992 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 5f2d6047109..68b24d7048d 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 8598cd388bc..2394df53e5b 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/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf Binary files differindex 6b03d43907b..979d7eebd72 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 2631d4ecd0a..9e6b8c2ebb3 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/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf Binary files differindex 55414485b3a..b23ff2a7533 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 3412646b135..78538b6dac9 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 7c7c49eea79..2a39df68bad 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 80cf433d7ae..0f2be7b6530 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 46a7a7ce7ee..fa4b4d84be2 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 61da64a457d..a22b268b6b7 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 e0628905157..feb4f7b7c33 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/listingsutf8.pdf b/Master/texmf-dist/doc/latex/oberdiek/listingsutf8.pdf Binary files differindex 805b6035175..7c25f1dc4c5 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/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf Binary files differindex 5fef6768426..a5e5ab6c1f0 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 aafcfbf26d4..1e0ed9dbae9 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 0bf6acacc2f..25cf118e91f 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 68d89ffe63e..e7cb759bab1 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 9ba3028f496..a1269219acc 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 9666528e5e7..ba461cabd93 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 e86e4239871..91fa72fcb67 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 861df572327..b5729f7ca46 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 26d3c67f36c..848eb36b75b 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 28fd50fe593..75a4fc9638f 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 f8f74799700..56e7680c10f 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 differnew file mode 100644 index 00000000000..2bc38d12ffb --- /dev/null +++ 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 616d596d9f4..b344104e872 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 dafe1d09367..9a21c9a6e64 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 8695cfab095..f62856711b1 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 f8cfc226318..074a2326900 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 c91379d1de1..6787901af87 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-example.tex b/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex index a0580c85347..4ba9f2de41a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/settobox-example.tex @@ -40,18 +40,18 @@ \setlength{\parskip}{10pt} \pagestyle{empty} - % \test{#1} - % The macro is called with commands in #1 that manipulates - % the box \mybox. These commands along with the result of - % the manipulation is shown. Thus the essence of the - % macro is: - % - % a) \sbox{\mybox}{The cracy fox.} - % b) #1 % manipulates \mybox - % c) Print #1 commands. - % d) Print box with frame - % - % The implemenation looks more weird: +% \test{#1} +% The macro is called with commands in #1 that manipulates +% the box \mybox. These commands along with the result of +% the manipulation is shown. Thus the essence of the +% macro is: +% +% a) \sbox{\mybox}{The cracy fox.} +% b) #1 % manipulates \mybox +% c) Print #1 commands. +% d) Print box with frame +% +% The implemenation looks more weird: \makeatletter \newcommand*{\test}[1]{% \par diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf Binary files differindex 20d8bb90bb6..6e30b282b03 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 bac181641ba..632e4e9097a 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 39e24f42bdb..7c01c755b40 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 68ee8291070..4d411f03f27 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 acd2c0f4238..ced498c32d6 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 c7b8fa5f746..fc626a56b1a 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 f6e693380f5..5142c5ebe28 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/accsupp-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/accsupp-test1.tex new file mode 100644 index 00000000000..3a5a3c3ccc0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/test/accsupp-test1.tex @@ -0,0 +1,77 @@ +%% +%% This is file `accsupp-test1.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% accsupp.dtx (with options: `test1') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file accsupp.dtx +%% and the derived files +%% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, +%% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\documentclass{minimal} +\makeatletter +\def\RestoreCatcodes{} +\count@=0 % +\loop + \edef\RestoreCatcodes{% + \RestoreCatcodes + \catcode\the\count@=\the\catcode\count@\relax + }% +\ifnum\count@<255 % + \advance\count@\@ne +\repeat + +\def\RangeCatcodeInvalid#1#2{% + \count@=#1\relax + \loop + \catcode\count@=15 % + \ifnum\count@<#2\relax + \advance\count@\@ne + \repeat +} +\def\Test{% + \RangeCatcodeInvalid{0}{47}% + \RangeCatcodeInvalid{58}{64}% + \RangeCatcodeInvalid{91}{96}% + \RangeCatcodeInvalid{123}{127}% + \catcode`\@=12 % + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\[=12 % + \catcode`\]=12 % + \catcode`\%=14 % + \catcode`\ =10 % + \catcode13=5 % + \RequirePackage{accsupp}[2007/11/14]\relax + \RestoreCatcodes +} +\Test +\csname @@end\endcsname +\end +\endinput +%% +%% End of file `accsupp-test1.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/alphalph-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/alphalph-test1.tex index 0823d890246..7f83416ca5f 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/alphalph-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/alphalph-test1.tex @@ -28,7 +28,39 @@ %% alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv, %% alphalph-test1.tex, alphalph-test2.tex, alphalph-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/atbegshi-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/atbegshi-test1.tex index b6677eb7b7c..3be6c2a4d2d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/atbegshi-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/atbegshi-test1.tex @@ -28,7 +28,39 @@ %% atbegshi-example.tex, atbegshi-test1.tex, %% atbegshi-test2.tex, atbegshi-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test1.tex index acedbc7d1bf..f4b9042515a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test1.tex @@ -28,7 +28,39 @@ %% bigintcalc-test1.tex, bigintcalc-test2.tex, %% bigintcalc-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test2.tex index 3d34ec0e48f..8bd7e9139f9 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test2.tex @@ -34,7 +34,7 @@ \makeatletter \chardef\BIC@TestMode=1 % \makeatother -\usepackage{bigintcalc}[2007/09/27] +\usepackage{bigintcalc}[2007/11/11] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test3.tex index 67b97d45a8d..3753a959b99 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test3.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/bigintcalc-test3.tex @@ -36,7 +36,7 @@ \makeatletter \chardef\BIC@TestMode=1 % \makeatother -\usepackage{bigintcalc}[2007/09/27] +\usepackage{bigintcalc}[2007/11/11] \let\numexpr\SavedNumexpr \usepackage{qstest} \IncludeTests{*} diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/bitset-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/bitset-test1.tex index c5baacfbc56..d6d1bb3579e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/bitset-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/bitset-test1.tex @@ -27,7 +27,39 @@ %% bitset.sty, bitset.pdf, bitset.ins, bitset.drv, %% bitset-test1.tex, bitset-test2.tex, bitset-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -36,7 +68,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -44,7 +76,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test1.tex index db2fbc18b9e..3b2f5cacc76 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test1.tex @@ -28,7 +28,39 @@ %% catchfile-test1.tex, catchfile-test2.tex, %% catchfile-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test2.tex index c3d195fb607..03138488611 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/catchfile-test2.tex @@ -32,7 +32,7 @@ \nofiles \listfiles \documentclass{minimal} -\usepackage{catchfile}[2007/09/09] +\usepackage{catchfile}[2007/11/11] \makeatletter \def\mysetup{% \let\do\@makeother diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test1.tex index 098a3a98d13..54335f9d3d6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test1.tex @@ -29,7 +29,39 @@ %% embedfile-example-collection.tex, embedfile-test1.tex, %% embedfile-test2.tex, embedfile-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -38,7 +70,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -46,7 +78,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test3.tex index 2afb4f67a64..5c68293e09e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test3.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/embedfile-test3.tex @@ -32,7 +32,7 @@ \NeedsTeXFormat{LaTeX2e} \let\SavedJobname\jobname \def\jobname{embedfile} -\RequirePackage{dtx-attach}[2007/10/29] +\RequirePackage{dtx-attach}[2007/11/11] \let\jobname\SavedJobname \documentclass{minimal} \begin{document} diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/engord-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/engord-test1.tex index 329ce58e477..45d4d992a54 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/engord-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/engord-test1.tex @@ -28,7 +28,39 @@ %% engord.sty, engord.pdf, engord.ins, engord.drv, %% engord-test1.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex index 86f8a5979e4..1e26bd568ec 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/epstopdf-test1.tex @@ -32,7 +32,39 @@ \def\Gin@driver{pdftex.def} \input graphicx.sty\relax \resetatcatcode +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -41,7 +73,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -49,7 +81,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/etexcmds-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/etexcmds-test1.tex index 6812abb9a5c..8e321f0e4f2 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/etexcmds-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/etexcmds-test1.tex @@ -28,7 +28,39 @@ %% etexcmds-test1.tex, etexcmds-test2.tex, etexcmds-test3.tex, %% etexcmds-test4.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/grfext-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/grfext-test1.tex index 4d8e64b1138..8b5ba6b2442 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/grfext-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/grfext-test1.tex @@ -29,7 +29,39 @@ %% \input miniltx.tex\relax \resetatcatcode +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -38,7 +70,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -46,7 +78,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/iflang-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/iflang-test1.tex index 19fe407c9f9..a40a927f7cd 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/iflang-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/iflang-test1.tex @@ -28,7 +28,39 @@ %% iflang-test1.tex, iflang-test2.tex, iflang-test3.tex, %% iflang-test4.tex, iflang-test5.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/ifpdf-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/ifpdf-test1.tex index a34a9e296e8..087063b89fe 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/ifpdf-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/ifpdf-test1.tex @@ -28,7 +28,39 @@ %% ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv, %% ifpdf-test1.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/ifvtex-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/ifvtex-test1.tex index 3f8329bdbf5..22d565938d3 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/ifvtex-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/ifvtex-test1.tex @@ -28,7 +28,39 @@ %% ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv, %% ifvtex-test1.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/infwarerr-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/infwarerr-test1.tex index 39fe9a2f27f..6612ecd10df 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/infwarerr-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/infwarerr-test1.tex @@ -28,7 +28,39 @@ %% infwarerr-test1.tex, infwarerr-test2.tex, %% infwarerr-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/intcalc-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/intcalc-test1.tex index 06bf9e08db3..0f4b47ca98c 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/intcalc-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/intcalc-test1.tex @@ -28,7 +28,39 @@ %% intcalc-test1.tex, intcalc-test2.tex, intcalc-test3.tex, %% intcalc-test4.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex index ffc4acdda7a..414683d972d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/kvoptions-test1.tex @@ -33,7 +33,39 @@ %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. \input miniltx.tex\relax +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -42,7 +74,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -50,7 +82,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/kvsetkeys-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/kvsetkeys-test1.tex index 14225a1cd0b..1f618abb728 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/kvsetkeys-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/kvsetkeys-test1.tex @@ -28,7 +28,39 @@ %% kvsetkeys-example.tex, kvsetkeys-test1.tex, %% kvsetkeys-test2.tex, kvsetkeys-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test1.tex index 009a172b75d..acf59dfa881 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test1.tex @@ -66,7 +66,7 @@ \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \RequirePackage{listingsutf8}[2007/10/22]\relax + \RequirePackage{listingsutf8}[2007/11/11]\relax \RestoreCatcodes } \Test diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test2.tex index 9c063c43c93..bc6254b0b3e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/listingsutf8-test2.tex @@ -50,7 +50,7 @@ public class ExampleUTF8 { } } \end{filecontents*} -\usepackage{listingsutf8}[2007/10/22] +\usepackage{listingsutf8}[2007/11/11] \def\Text{% Umlauts: % ^^c3^^84^^c3^^96^^c3^^9c^^c3^^a4^^c3^^b6^^c3^^bc^^c3^^9f% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfcol-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfcol-test1.tex index 531c7b9114f..61bb501fa5e 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/pdfcol-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfcol-test1.tex @@ -27,7 +27,39 @@ %% pdfcol.sty, pdfcol.pdf, pdfcol.ins, pdfcol.drv, %% pdfcol-test1.tex, pdfcol-test2.tex, pdfcol-test3.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -36,7 +68,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -44,7 +76,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test1.tex index ff1f9fc9d3a..d89151ecf3a 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test1.tex @@ -26,9 +26,42 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +70,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +78,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test2.tex index c1e3a648c8d..d4053620196 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test2.tex @@ -26,14 +26,15 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% \NeedsTeXFormat{LaTeX2e} \makeatletter -\ProvidesFile{pdfescape-test1.tex}% - [2007/10/27 v1.7 Test with \string\pdfescape... commands]% +\ProvidesFile{pdfescape-test2.tex}% + [2007/11/11 v1.8 Test with \string\pdfescape... commands]% \@ifundefined{pdfescapehex}{% - \PackageError{pdfescape-test1}{% + \PackageError{pdfescape-test2}{% Missing \string\pdfescape... commands% }{Test aborted.}% \stop diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test3.tex index 86794f6d35c..72c0ce34ce6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test3.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test3.tex @@ -26,18 +26,19 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% \NeedsTeXFormat{LaTeX2e} \makeatletter -\ProvidesFile{pdfescape-test2.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape..., with e-TeX]% +\ProvidesFile{pdfescape-test3.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape..., with e-TeX]% \let\pdfescapehex\@undefined \let\pdfunescapehex\@undefined \let\pdfescapename\@undefined \let\pdfescapestring\@undefined \@ifundefined{numexpr}{% - \PackageError{pdfescape-test2}{% + \PackageError{pdfescape-test3}{% Missing \eTeX }{Test aborted.}% \stop diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test4.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test4.tex index f2573ed132b..76b90c17ede 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test4.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test4.tex @@ -26,12 +26,13 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% \NeedsTeXFormat{LaTeX2e} \makeatletter -\ProvidesFile{pdfescape-test3.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape... and e-TeX]% +\ProvidesFile{pdfescape-test4.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape... and e-TeX]% \let\pdfescapehex\@undefined \let\pdfunescapehex\@undefined \let\pdfescapename\@undefined diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test5.tex b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test5.tex new file mode 100644 index 00000000000..2a17551708c --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/test/pdfescape-test5.tex @@ -0,0 +1,376 @@ +%% +%% This is file `pdfescape-test5.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfescape.dtx (with options: `test5') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file pdfescape.dtx +%% and the derived files +%% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, +%% pdfescape-test1.tex, pdfescape-test2.tex, +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\makeatletter +\ProvidesFile{pdfescape-test5.tex}% + [2007/11/11 v1.8 Test with LuaTeX]% +\@ifundefined{directlua}{% + \PackageError{pdfescape-test5}{% + Missing LuaTeX% + }{Test aborted.}% + \stop +}{} +\RequirePackage{qstest} +\IncludeTests{*} +\LogTests{log}{*}{*} + +\newcommand*{\ExpectVar}[2]{% + \ifx#1#2% + \else + \begingroup + \@onelevel@sanitize#1% + \@onelevel@sanitize#2% + \typeout{[#1] <> [#2]}% hash-ok + \endgroup + \fi + \Expect*{\ifx#1#2true\else false\fi}{true}% +} + +\makeatletter +\begingroup + \gdef\AllBytes{}% + \count@=0 % + \catcode0=12 % + \@whilenum\count@<256 \do{% + \lccode0=\count@ + \ifnum\count@=32 % + \xdef\AllBytes{\AllBytes\space}% + \else + \lowercase{% + \xdef\AllBytes{\AllBytes^^@}% + }% + \fi + \advance\count@ by 1 % + }% +\endgroup +\newcommand*{\AllBytesHex}{% + 000102030405060708090A0B0C0D0E0F% + 101112131415161718191A1B1C1D1E1F% + 202122232425262728292A2B2C2D2E2F% + 303132333435363738393A3B3C3D3E3F% + 404142434445464748494A4B4C4D4E4F% + 505152535455565758595A5B5C5D5E5F% + 606162636465666768696A6B6C6D6E6F% + 707172737475767778797A7B7C7D7E7F% + 808182838485868788898A8B8C8D8E8F% + 909192939495969798999A9B9C9D9E9F% + A0A1A2A3A4A5A6A7A8A9AAABACADAEAF% + B0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF% + C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF% + D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF% + E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF% + F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF% +} +\@onelevel@sanitize\AllBytesHex +\expandafter\lowercase\expandafter{% + \expandafter\newcommand\expandafter*\expandafter\AllBytesHexLC + \expandafter{\AllBytesHex}% +} +\newcommand*{\AllBytesName}{} +\begingroup + \catcode`\#=12 % + \xdef\AllBytesName{% + #01#02#03#04#05#06#07#08#09#0A#0B#0C#0D#0E#0F% + #10#11#12#13#14#15#16#17#18#19#1A#1B#1C#1D#1E#1F% + #20!"#23$#25&'#28#29*+,-.#2F% + 0123456789:;#3C=#3E?% + @ABCDEFGHIJKLMNO% + PQRSTUVWXYZ#5B\@backslashchar#5D^_% + `abcdefghijklmno% + pqrstuvwxyz#7B|#7D\string~#7F% + #80#81#82#83#84#85#86#87#88#89#8A#8B#8C#8D#8E#8F% + #90#91#92#93#94#95#96#97#98#99#9A#9B#9C#9D#9E#9F% + #A0#A1#A2#A3#A4#A5#A6#A7#A8#A9#AA#AB#AC#AD#AE#AF% + #B0#B1#B2#B3#B4#B5#B6#B7#B8#B9#BA#BB#BC#BD#BE#BF% + #C0#C1#C2#C3#C4#C5#C6#C7#C8#C9#CA#CB#CC#CD#CE#CF% + #D0#D1#D2#D3#D4#D5#D6#D7#D8#D9#DA#DB#DC#DD#DE#DF% + #E0#E1#E2#E3#E4#E5#E6#E7#E8#E9#EA#EB#EC#ED#EE#EF% + #F0#F1#F2#F3#F4#F5#F6#F7#F8#F9#FA#FB#FC#FD#FE#FF% + }% +\endgroup +\@onelevel@sanitize\AllBytesName + +\newcommand*{\AllBytesString}{} +\begingroup + \def\|{|}% + \edef\%{\@percentchar}% + \catcode`\|=0 % + \catcode`\#=12 % + \catcode`\~=12 % + \catcode`\\=12 % + |xdef|AllBytesString{% + \000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017% + \020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037% + \040!"#$|%&'\(\)*+,-./% + 0123456789:;<=>?% + @ABCDEFGHIJKLMNO% + PQRSTUVWXYZ[\\]^_% + `abcdefghijklmno% + pqrstuvwxyz{||}~\177% + \200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217% + \220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237% + \240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257% + \260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277% + \300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317% + \320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337% + \340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357% + \360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377% + }% +|endgroup +\@onelevel@sanitize\AllBytesString + +\RequirePackage{pdfescape} + +\begin{qstest}{all-hex}{\AllBytes, escapehex} + \EdefEscapeHex\x{\AllBytes}% + \Expect*{\x}*{\AllBytesHex}% + \ExpectVar\x\AllBytesHex +\end{qstest} + +\begin{qstest}{all-unhex}{\AllBytesHex, unescapehex} + \EdefUnescapeHex\x{\AllBytesHex}% + \Expect*{\x}*{\AllBytes}% + \ExpectVar\x\AllBytes +\end{qstest} + +\begin{qstest}{all-unhex-lc}{\AllBytesHexLC, unescapehex, lowercase} + \EdefUnescapeHex\x{\AllBytesHexLC}% + \Expect*{\x}*{\AllBytes}% + \ExpectVar\x\AllBytes +\end{qstest} + +\begin{qstest}{unhex-incomplete}{unescapehex, incomplete} + \EdefUnescapeHex\x{4}% + \Expect*{\x}{@}% +\end{qstest} + +\begin{qstest}{unhex-space}{unescapehex, space} + \EdefUnescapeHex\x{20}% + \Expect*{\x}{ }% + \ExpectVar\x\space +\end{qstest} + +\begin{qstest}{unhex-spaces}{unescapehex, spaces} + \EdefUnescapeHex\x{204020204120}% + \def\y#1{% + \edef\z{#1\string @#1#1\string A#1}% + }\y{ }% + \Expect*{\x}*{\z}% + \ExpectVar\x\z +\end{qstest} + +\begin{qstest}{unhex-hash}{unescapehex, hash} + \catcode`\#=12 % + \EdefUnescapeHex\x{#20}% + \ExpectVar\x\space +\end{qstest} + +\begin{qstest}{unhex-invalid}{unescapehex, invalid} + \def\test#1#2{% + \EdefUnescapeHex\x{#1}% + \edef\y{#2}% + \@onelevel@sanitize\y + \ExpectVar\x\y + }% + \test{X}{}% + \test{XY}{}% + \test{XYZ}{}% + \test{A}{^^a0}% + \test{AX}{^^a0}% + \test{XA}{^^a0}% + \test{XXAXX}{^^a0}% +\end{qstest} + +\begin{qstest}{all-name}{\AllBytes, escapename} + \EdefEscapeName\x{\AllBytes}% + \Expect*{\x}*{\AllBytesName}% + \ExpectVar\x\AllBytesName +\end{qstest} + +\begin{qstest}{all-string}{\AllBytes, escapestring} + \EdefEscapeString\x{\AllBytes}% + \Expect*{\x}*{\AllBytesString}% + \ExpectVar\x\AllBytesString +\end{qstest} + +\begin{qstest}{uchexdigit}{unescape, uppercase hex digit} + \catcode`\@=11 % + \catcode0=12 % + \def\test#1#2{% + \uccode0=#1\relax + \uppercase{% + \def\x{^^@}% + }% + \Expect*{% + \ifcase\expandafter\PE@TestUcHexDigit\x + true% + \else + false% + \fi + }{#2}% + }% + \def\range#1#2#3{% + \count0=#1\relax + \loop + \ifnum\count0<#2\relax + \test{\count0}{#3}% + \advance\count0 by 1 % + \repeat + }% + \range{0}{47}{false}% + \range{48}{57}{true}% + \range{58}{64}{false}% + \range{65}{70}{true}% + \range{71}{255}{false}% +\end{qstest} + +\begin{qstest}{unescapename}{unescapename} + \def\test#1#2{% + \EdefUnescapeName\x{#1}% + \edef\y{#2}% + \@onelevel@sanitize\y + \ExpectVar\x\y + }% + \catcode`\#=12 % + \catcode0=12 % + \test{}{}% + \test{x}{x}% + \test{xy}{xy}% + \test{#}{#}% + \test{##}{##}% + \test{###}{###}% + \test{####}{####}% + \test{#x}{#x}% + \test{#xy}{#xy}% + \test{#1}{#1}% + \test{#40}{@}% + \test{#400}{@0}% + \test{#4x0}{#4x0}% + \test{#ab}{^^ab}% + \test{#00}{^^@}% + \test{x#40y#40z}{x@y@z}% + \test{#40#40#40#40}{@@@@}% + \test{a#x}{a#x}% + \test{a#xy}{a#xy}% + \test{a#1}{a#1}% + \test{a#40}{a@}% + \test{a#400}{a@0}% + \test{#20}{ }% + \test{a#20}{a }% + \test{a#20b}{a b}% + \test{a#20#20#20b}{a \space\space b}% +\end{qstest} + +\begin{qstest}{unescapestring}{unescapestring} + \def\test#1#2{% + \EdefUnescapeString\x{#1}% + \edef\y{#2}% + \@onelevel@sanitize\y + \ExpectVar\x\y + }% + \catcode0=12 % + \def\DefChar#1#2{% + \begingroup + \uccode0=#2\relax + \uppercase{\endgroup + \def#1{^^@}% + }% + }% + \DefChar\nul{0}% + \DefChar\one{1}% + \DefChar\bel{8}% + \DefChar\tab{9}% + \DefChar\lf{10}% + \DefChar\ff{12}% + \DefChar\cr{13}% + \DefChar\\{92}% + \test{}{}% + \test{a}{a}% + \test{\\}{}% + \test{\\\\}{\\}% + \test{\\\\y}{\\y}% + \test{\\000}{\nul}% + \test{\\b}{\bel}% + \test{\\t}{\tab}% + \test{\\n}{\lf}% + \test{\\f}{\ff}% + \test{\\r}{\cr}% + \test{\\(}{(}% + \test{\\)}{)}% + \test{\\040}{ }% + \test{\\100}{@}% + \test{\\40}{ }% + \test{\\1}{\one}% + \test{\\01}{\one}% + \test{\\001}{\one}% + \test{\\18}{\one8}% + \test{\\018}{\one8}% + \test{\\0018}{\one8}% + \test{x\\}{x}% + \test{x\\\\}{x\\}% + \test{x\\\\y}{x\\y}% + \test{x\\000}{x\nul}% + \test{x\\b}{x\bel}% + \test{x\\t}{x\tab}% + \test{x\\n}{x\lf}% + \test{x\\f}{x\ff}% + \test{x\\r}{x\cr}% + \test{x\\(}{x(}% + \test{x\\)}{x)}% + \test{x\\040}{x }% + \test{x\\100}{x@}% + \test{x\\40}{x }% + \test{x\\1}{x\one}% + \test{x\\01}{x\one}% + \test{x\\001}{x\one}% + \test{x\\18}{x\one8}% + \test{x\\018}{x\one8}% + \test{x\\0018}{x\one8}% + \test{\\b\\t\\n\\f\\r\\(\\)\\\\\\000\\040}{% + \bel\tab\lf\ff\cr()\\\nul\space + }% + \test{\\\lf}{}% + \test{x\\\lf}{x}% + \test{\cr}{\lf}% + \test{\cr\lf}{\lf}% + \test{\lf}{\lf}% + \test{\lf\cr}{\lf\lf}% + \test{x\cr}{x\lf}% + \test{x\cr\lf}{x\lf}% + \test{x\lf}{x\lf}% + \test{x\lf\cr}{x\lf\lf}% + \test{x\\\cr\lf y\cr}{xy\lf}% +\end{qstest} +\stop +\endinput +%% +%% End of file `pdfescape-test5.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/setouterhbox-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/setouterhbox-test1.tex index 92b27d356ce..abd7f84aaa1 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/setouterhbox-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/setouterhbox-test1.tex @@ -29,7 +29,39 @@ %% setouterhbox-example.tex, setouterhbox-test1.tex, %% setouterhbox-test2.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -38,7 +70,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -46,7 +78,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/soulutf8-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/soulutf8-test1.tex index 573d15a8b42..9329266361d 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/soulutf8-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/soulutf8-test1.tex @@ -28,7 +28,39 @@ %% soulutf8-test1.tex, soulutf8-test2.tex, soulutf8-test3.tex, %% soulutf8-test4.tex, soulutf8-test5.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test1.tex index a43e30ed4ca..ec991977fa7 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test1.tex @@ -78,7 +78,7 @@ \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \usepackage{stringenc}[2007/10/22]% + \usepackage{stringenc}[2007/11/11]% \RestoreCatcodes } \Test diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test2.tex index e1f5df8704d..a890284b970 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test2.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/stringenc-test2.tex @@ -47,7 +47,7 @@ \let\SavedNumexpr\numexpr \let\numexpr\relax \fi -\usepackage{stringenc}[2007/10/22] +\usepackage{stringenc}[2007/11/11] \ifx\plainmode Y \let\numexpr\SavedNumexpr \fi diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/telprint-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/telprint-test1.tex index ed748e0c77a..fe61e8726c6 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/test/telprint-test1.tex +++ b/Master/texmf-dist/doc/latex/oberdiek/test/telprint-test1.tex @@ -28,7 +28,39 @@ %% telprint.sty, telprint.pdf, telprint.ins, telprint.drv, %% telprint-test1.tex. %% +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -37,7 +69,7 @@ \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -45,7 +77,7 @@ \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf Binary files differindex a41db28bd1e..f465bb0ba1e 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 5ca92d63848..4f02defcbf4 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 608d6bce44b..affc6bb4a15 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/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx index 65bad3c8b26..3794bcb98a5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx @@ -18,7 +18,8 @@ % and the derived files % accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, % accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -% accsupp-example.tex. +% accsupp-example1.tex, accsupp-example2.tex, +% accsupp-test1.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/accsupp.dtx @@ -56,7 +57,9 @@ % TDS:tex/latex/oberdiek/accsupp-dvipdfm.def % TDS:tex/latex/oberdiek/accsupp-dvips.def % TDS:doc/latex/oberdiek/accsupp.pdf -% TDS:doc/latex/oberdiek/accsupp-example.tex +% TDS:doc/latex/oberdiek/accsupp-example1.tex +% TDS:doc/latex/oberdiek/accsupp-example2.tex +% TDS:doc/latex/oberdiek/test/accsupp-test1.tex % TDS:source/latex/oberdiek/accsupp.dtx % %<*ignore> @@ -72,12 +75,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: accsupp 2007/03/21 v0.1 Accessibility support by marked content (HO)} +\Msg{* Package: accsupp 2007/11/14 v0.2 Accessibility support by marked content (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,9 +104,11 @@ This work consists of the main source file accsupp.dtx and the derived files accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, - accsupp-example.tex. + accsupp-example1.tex, accsupp-example2.tex, + accsupp-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{accsupp.ins}{\from{accsupp.dtx}{install}}% @@ -113,7 +119,10 @@ and the derived files \file{accsupp-dvipdfm.def}{\from{accsupp.dtx}{dvipdfm}}% \file{accsupp-dvips.def}{\from{accsupp.dtx}{dvips}}% \usedir{doc/latex/oberdiek}% - \file{accsupp-example.tex}{\from{accsupp.dtx}{example}}% + \file{accsupp-example1.tex}{\from{accsupp.dtx}{example1}}% + \file{accsupp-example2.tex}{\from{accsupp.dtx}{example2}}% + \usedir{doc/latex/oberdiek/test}% + \file{accsupp-test1.tex}{\from{accsupp.dtx}{test1}}% } \obeyspaces @@ -125,6 +134,10 @@ and the derived files \Msg{* accsupp.sty, accsupp-pdftex.def, accsupp-dvipdfm.def,} \Msg{* accsupp-dvips.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `accsupp.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -140,16 +153,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp.drv}% - [2007/03/21 v0.1 Accessibility support by marked content (HO)]% + [2007/11/14 v0.2 Accessibility support by marked content (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{accsupp.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{289} +% \CheckSum{395} % % \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 @@ -170,7 +183,7 @@ and the derived files % \GetFileInfo{accsupp.drv} % % \title{The \xpackage{accsupp} package} -% \date{2007/03/21 v0.1} +% \date{2007/11/14 v0.2} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -224,7 +237,8 @@ and the derived files % % \begin{description} % \item[\xoption{ActualText}:] -% Provides a replacement text, see example in section \ref{sec:example}. +% Provides a replacement text, see examples in +% section \ref{sec:example}. % \item[\xoption{Alt}:] % Provides an alternate description. % \item[\xoption{E}:] @@ -248,7 +262,7 @@ and the derived files % The result is a valid PDF string. % \item[\xoption{method=hex}:] % The string is given in hexadecimal notation. -% Section \ref{sec:example} shows an example. +% Section \ref{sec:example:notparallel} shows an example. % \item[\xoption{method=pdfstringdef}:] % If package \xpackage{hyperref} is loaded, then its \cs{pdfstringdef} % is used. This method is slow, but useful if the string contains @@ -307,17 +321,22 @@ and the derived files % |ps2pdf -dCompressPages=false input.ps output.pdf| % \end{description} % -% \section{Example}\label{sec:example} +% \section{Example} +% \label{sec:example} +% +% \subsection{Example \cs{notparallel}} +% \label{sec:example:notparallel} % % \begin{macrocode} -%<*example> +%<*example1> % \end{macrocode} % \begin{macrocode} +%<<END \documentclass{article} -\usepackage{accsupp} +\usepackage{accsupp}[2007/11/14] \usepackage{centernot} - % U+2226 NOT PARALLEL - % \mathrel{...} prevents page break in between +% U+2226 NOT PARALLEL +% \mathrel{...} prevents page break in between \newcommand*{\notparallel}{% \ensuremath{% \mathrel{% @@ -332,9 +351,40 @@ and the derived files A\notparallel B \end{equation} \end{document} +%END % \end{macrocode} % \begin{macrocode} -%</example> +%</example1> +% \end{macrocode} +% +% \subsection{Example with \xoption{pdfstringdef}} +% +% \begin{macrocode} +%<*example2> +% \end{macrocode} +% \begin{macrocode} +%<<END +\documentclass{article} +\usepackage[unicode]{hyperref} +\usepackage{accsupp}[2007/11/14] +\begin{document} + \begin{equation} + \BeginAccSupp{ + method=pdfstringdef, + unicode, + ActualText={% + a\texttwosuperior +b\texttwosuperior + =c\texttwosuperior + } + } + a^2 + b^2 = c^2 + \EndAccSupp{} + \end{equation} +\end{document} +%END +% \end{macrocode} +% \begin{macrocode} +%</example2> % \end{macrocode} % % \StopEventually{ @@ -346,34 +396,58 @@ A\notparallel B % % \begin{macrocode} %<*package> -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{accsupp}% - [2007/03/21 v0.1 Accessibility support by marked content (HO)]% % \end{macrocode} % % \begin{macrocode} -\edef\ACCSUPP@end{% - \catcode39 \the\catcode39 % ' - \catcode40 \the\catcode40 % ( - \catcode41 \the\catcode41 % ) - \catcode60 \the\catcode60 % < - \catcode61 \the\catcode61 % = - \catcode62 \the\catcode62 % > - \catcode94 \the\catcode94 % ^ - \catcode96 \the\catcode96 % ` - \catcode254 \the\catcode254 % ^^FE - \catcode255 \the\catcode255 % ^^FF +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ACCSUPP@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ACCSUPP@AtEnd{% + \ACCSUPP@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax } -\@makeother\( -\@makeother\) -\@makeother\' -\@makeother\< -\@makeother\= -\@makeother\> -\catcode94 = 7 % -\@makeother\` -\@makeother\^^fe -\@makeother\^^ff +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{254}{12}% ^^fe +\TMP@EnsureCode{255}{12}% ^^ff +\g@addto@macro\ACCSUPP@AtEnd{\endinput} +% \end{macrocode} +% +% Package identification. +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{accsupp}% + [2007/11/14 v0.2 Accessibility support by marked content (HO)] % \end{macrocode} % % \begin{macrocode} @@ -398,11 +472,11 @@ A\notparallel B \@dblarg\ACCSUPP@@DefineDriverKey } \def\ACCSUPP@@DefineDriverKey[#1]#2{% - \define@key{ActTxt}{#2}[]{% + \define@key{ACCSUPP}{#2}[]{% \def\ACCSUPP@driver{#1}% }% \g@addto@macro\ACCSUPP@DisableOptions{% - \DisableKeyvalOption{ActTxt}{#2}% + \DisableKeyvalOption{ACCSUPP}{#2}% }% } \let\ACCSUPP@DisableOptions\@empty @@ -412,6 +486,7 @@ A\notparallel B \ACCSUPP@DefineDriverKey{dvipdfm} \ACCSUPP@DefineDriverKey[dvipdfm]{dvipdfmx} \ACCSUPP@DefineDriverKey[dvipdfm]{xetex} +\let\ACCSUPP@driver\relax \InputIfFileExists{accsupp.cfg}{}{} \providecommand*{\ActualTextDriverDefault}{dvips} \ifpdf @@ -420,7 +495,9 @@ A\notparallel B \ifxetex \def\ACCSUPP@driver{dvipdfm}% \else - \let\ACCSUPP@driver\BookmarkDriverDefault + \ifx\ACCSUPP@driver\relax + \let\ACCSUPP@driver\ActualTextDriverDefault + \fi \fi \fi % \end{macrocode} @@ -450,7 +527,7 @@ A\notparallel B Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak Package loading is aborted% }\@ehc - \expandafter\expandafter\expandafter\endinput + \expandafter\expandafter\expandafter\ACCSUPP@AtEnd \fi \def\ACCSUPP@temp{dvipdfm}% \ifxetex @@ -464,12 +541,19 @@ A\notparallel B \fi \fi \fi +\ifx\ACCSUPP@driver\relax + \PackageError{accsupp}{% + Missing driver option.\MessageBreak + Package loading is aborted% + }\@ehc + \expandafter\ACCSUPP@AtEnd +\fi \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{% \PackageError{accsupp}{% Unsupported driver `\ACCSUPP@driver'.\MessageBreak Package loading is aborted% }\@ehc - \endinput + \ACCSUPP@AtEnd } % \end{macrocode} % @@ -585,7 +669,7 @@ A\notparallel B % \end{macrocode} % \begin{macrocode} \def\ACCSUPP@method@pdfstringdef#1{% - \ifActText@unicode + \ifACCSUPP@unicode \@ifundefined{hypersetup}{}{% \hypersetup{unicode}% }% @@ -596,14 +680,19 @@ A\notparallel B }\@ehc \let\ACCSUPP@temp\@empty }{% - \pdfstringdef\ACCSUPP@temp#1% + \begingroup + \setbox0=\hbox{% + \pdfstringdef\ACCSUPP@temp#1% + \global\let\ACCSUPP@temp\ACCSUPP@temp + }% + \endgroup }% \edef#1{(\ACCSUPP@temp)}% } % \end{macrocode} % % \begin{macrocode} -\ACCSUPP@end +\ACCSUPP@AtEnd %</package> % \end{macrocode} % @@ -615,7 +704,7 @@ A\notparallel B %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-pdftex.def}% - [2007/03/21 v0.1 accsupp driver for pdfTeX (HO)]% + [2007/11/14 v0.2 accsupp driver for pdfTeX (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -636,7 +725,7 @@ A\notparallel B %<*dvipdfm> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvipdfm.def}% - [2007/03/21 v0.1 accsupp driver for dvipdfm (HO)]% + [2007/11/14 v0.2 accsupp driver for dvipdfm (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -657,11 +746,11 @@ A\notparallel B %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvips.def}% - [2007/03/21 v0.1 accsupp driver for dvips (HO)]% + [2007/11/14 v0.2 accsupp driver for dvips (HO)]% % \end{macrocode} % % \begin{macrocode} -\def\ACCSUPP@bdc#1{% +\def\ACCSUPP@bdc{% \special{ps:[\ACCSUPP@span/BDC pdfmark}% } \def\ACCSUPP@emc{% @@ -672,6 +761,62 @@ A\notparallel B %</dvips> % \end{macrocode} % +% \section{Test} +% +% \subsection{Catcode checks for loading} +% +% \begin{macrocode} +%<*test1> +% \end{macrocode} +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\documentclass{minimal} +\makeatletter +\def\RestoreCatcodes{} +\count@=0 % +\loop + \edef\RestoreCatcodes{% + \RestoreCatcodes + \catcode\the\count@=\the\catcode\count@\relax + }% +\ifnum\count@<255 % + \advance\count@\@ne +\repeat + +\def\RangeCatcodeInvalid#1#2{% + \count@=#1\relax + \loop + \catcode\count@=15 % + \ifnum\count@<#2\relax + \advance\count@\@ne + \repeat +} +\def\Test{% + \RangeCatcodeInvalid{0}{47}% + \RangeCatcodeInvalid{58}{64}% + \RangeCatcodeInvalid{91}{96}% + \RangeCatcodeInvalid{123}{127}% + \catcode`\@=12 % + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\[=12 % + \catcode`\]=12 % + \catcode`\%=14 % + \catcode`\ =10 % + \catcode13=5 % + \RequirePackage{accsupp}[2007/11/14]\relax + \RestoreCatcodes +} +\Test +\csname @@end\endcsname +\end +% \end{macrocode} +% \begin{macrocode} +%</test1> +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -736,7 +881,9 @@ A\notparallel B % accsupp-dvipdfm.def & tex/latex/oberdiek/accsupp-dvipdfm.def\\ % accsupp-dvips.def & tex/latex/oberdiek/accsupp-dvips.def\\ % accsupp.pdf & doc/latex/oberdiek/accsupp.pdf\\ -% accsupp-example.tex & doc/latex/oberdiek/accsupp-example.tex\\ +% accsupp-example1.tex & doc/latex/oberdiek/accsupp-example1.tex\\ +% accsupp-example2.tex & doc/latex/oberdiek/accsupp-example2.tex\\ +% test/accsupp-test1.tex & doc/latex/oberdiek/test/accsupp-test1.tex\\ % accsupp.dtx & source/latex/oberdiek/accsupp.dtx\\ % \end{tabular}^^A % }^^A @@ -870,6 +1017,12 @@ A\notparallel B % \item % First version. % \end{Version} +% \begin{Version}{2007/11/14 v0.2} +% \item +% Various bug fixes. +% \item +% Catcode section rewritten, test added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx index 27b5cb3d8dc..e741a1c3276 100644 --- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files aliascnt.sty, aliascnt.pdf, aliascnt.ins, aliascnt.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{aliascnt.ins}{\from{aliascnt.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* aliascnt.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `aliascnt.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{aliascnt.drv}% [2006/09/25 v1.2 Alias counter (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{aliascnt.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx index 1082eb9626a..bc4e8c9b18a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx @@ -77,6 +77,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -102,6 +103,7 @@ and the derived files alphalph-test1.tex, alphalph-test2.tex, alphalph-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{alphalph.ins}{\from{alphalph.dtx}{install}}% @@ -122,6 +124,10 @@ and the derived files \Msg{*} \Msg{* alphalph.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `alphalph.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -139,7 +145,7 @@ and the derived files \ProvidesFile{alphalph.drv}% [2007/09/09 v2.0 Converting numbers to letters (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{alphalph}[2007/09/09] \makeatletter \newalphalph{\fnsymbolwrap}[wrap]{\@fnsymbol}{} @@ -172,7 +178,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1035} +% \CheckSum{1125} % % \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 @@ -566,6 +572,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -582,6 +591,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -590,6 +600,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -611,10 +623,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname AlPh@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AlPh@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AlPh@AtEnd{% \AlPh@AtEnd @@ -1242,7 +1266,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1251,7 +1307,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1259,7 +1315,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx index 0edb027fdb0..8d4ac57de34 100644 --- a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx @@ -113,6 +113,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -150,6 +151,7 @@ and the derived files askinclude-test23.tex, askinclude-test24.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{askinclude.ins}{\from{askinclude.dtx}{install}}% @@ -194,6 +196,10 @@ and the derived files \Msg{*} \Msg{* askinclude.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `askinclude.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -211,7 +217,7 @@ and the derived files \ProvidesFile{askinclude.drv}% [2007/10/23 v2.0 Interactive asking of included files]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage[T1]{fontenc} \usepackage{lmodern} \begin{document} @@ -220,7 +226,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{2022} +% \CheckSum{2044} % % \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 @@ -577,10 +583,22 @@ and the derived files % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname AskInc@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AskInc@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AskInc@AtEnd{% \AskInc@AtEnd diff --git a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx index 39c56ce0ecc..dd38c201ff3 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx @@ -78,6 +78,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -103,6 +104,7 @@ and the derived files atbegshi-test2.tex, atbegshi-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{atbegshi.ins}{\from{atbegshi.dtx}{install}}% @@ -125,6 +127,10 @@ and the derived files \Msg{*} \Msg{* atbegshi.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `atbegshi.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -142,14 +148,14 @@ and the derived files \ProvidesFile{atbegshi.drv}% [2007/09/09 v1.6 At begin shipout hook (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{atbegshi.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1283} +% \CheckSum{1373} % % \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 @@ -751,6 +757,9 @@ The last page. \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -767,6 +776,7 @@ The last page. % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -775,6 +785,8 @@ The last page. \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -796,10 +808,22 @@ The last page. % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname AtBegShi@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AtBegShi@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AtBegShi@AtEnd{% \AtBegShi@AtEnd @@ -1475,7 +1499,39 @@ X \endgroup %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1484,7 +1540,7 @@ X \endgroup \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1492,7 +1548,7 @@ X \endgroup \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx index 4068ec09ca1..c7e9ce2f798 100644 --- a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files atenddvi.sty, atenddvi.pdf, atenddvi.ins, atenddvi.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{atenddvi.ins}{\from{atenddvi.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* atenddvi.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `atenddvi.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{atenddvi.drv}% [2007/04/17 v1.1 At end DVI hook (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{atenddvi.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx index 456571eff25..a32492e9c0e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx @@ -53,9 +53,9 @@ % TDS:tex/latex/oberdiek/attachfile2.sty % TDS:tex/latex/oberdiek/atfidvips.def % TDS:tex/latex/oberdiek/atfipdftex.def +% TDS:scripts/oberdiek/pdfatfi.pl (exec flag) % TDS:doc/latex/oberdiek/attachfile2.pdf % TDS:source/latex/oberdiek/attachfile2.dtx -% TDS:scripts/oberdiek/pdfatfi.pl % %<*ignore> \begingroup @@ -76,6 +76,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files atfidvips.def, atfipdftex.def, pdfatfi.pl. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{attachfile2.ins}{\from{attachfile2.dtx}{install}}% @@ -108,9 +110,9 @@ and the derived files \file{attachfile2.sty}{\from{attachfile2.dtx}{package}}% \file{atfidvips.def}{\from{attachfile2.dtx}{dvips}}% \file{atfipdftex.def}{\from{attachfile2.dtx}{pdftex}}% - \usedir{scripts/oberdiek}% \nopreamble \nopostamble + \usedir{scripts/oberdiek}% \csname execfiletrue\endcsname \file{pdfatfi.pl}{\from{attachfile2.dtx}{pdfatfi}}% } @@ -123,6 +125,10 @@ and the derived files \Msg{*} \Msg{* attachfile2.sty, atfidvips.def, atfipdftex.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* pdfatfi.pl} +\Msg{*} \Msg{* To produce the documentation run the file `attachfile2.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -140,16 +146,7 @@ and the derived files \ProvidesFile{attachfile2.drv}% [2007/04/11 v2.3 attach files into PDF (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] -\AtBeginDocument{% - \csname @ifpackageloaded\endcsname{dtx-attach}{% - \embedfile[% - stringmethod=escape,% - mimetype=text/plain,% - desc={Helper Perl script for package `attachfile2'}% - ]{pdfatfi.pl}% - }{}% -} +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{attachfile2.dtx}% \end{document} @@ -1939,7 +1936,6 @@ __END__ % \begin{description} % \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.dtx}] The source file. % \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.pdf}] Documentation. -% \item[\CTAN{macros/latex/contrib/oberdiek/pdfatfi.pl}] Script. % \end{description} % % @@ -1993,9 +1989,9 @@ __END__ % attachfile2.sty & tex/latex/oberdiek/attachfile2.sty\\ % atfidvips.def & tex/latex/oberdiek/atfidvips.def\\ % atfipdftex.def & tex/latex/oberdiek/atfipdftex.def\\ +% pdfatfi.pl & scripts/oberdiek/pdfatfi.pl\\ % attachfile2.pdf & doc/latex/oberdiek/attachfile2.pdf\\ % attachfile2.dtx & source/latex/oberdiek/attachfile2.dtx\\ -% pdfatfi.pl & scripts/oberdiek/pdfatfi.pl\\ % \end{tabular}^^A % }^^A % \sbox0{\t}^^A diff --git a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx index 562a9b08efb..62158aa01fc 100644 --- a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files auxhook.sty, auxhook.pdf, auxhook.ins, auxhook.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{auxhook.ins}{\from{auxhook.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* auxhook.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `auxhook.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{auxhook.drv}% [2007/04/06 v1.1 Hooks for auxiliary files (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{auxhook.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx index 7faef5ce447..ac70855fd7d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx @@ -71,12 +71,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bigintcalc 2007/09/27 v1.0 Expandable big integer calculations (HO)} +\Msg{* Package: bigintcalc 2007/11/11 v1.1 Expandable big integer calculations (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -102,6 +103,7 @@ and the derived files bigintcalc-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{bigintcalc.ins}{\from{bigintcalc.dtx}{install}}% @@ -122,6 +124,10 @@ and the derived files \Msg{*} \Msg{* bigintcalc.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `bigintcalc.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -137,9 +143,9 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bigintcalc.drv}% - [2007/09/27 v1.0 Expandable big integer calculations (HO)]% + [2007/11/11 v1.1 Expandable big integer calculations (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{wasysym} \let\iint\relax \let\iiint\relax @@ -181,7 +187,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{3507} +% \CheckSum{3620} % % \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 @@ -202,7 +208,7 @@ and the derived files % \GetFileInfo{bigintcalc.drv} % % \title{The \xpackage{bigintcalc} package} -% \date{2007/09/27 v1.0} +% \date{2007/11/11 v1.1} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -628,6 +634,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -644,6 +653,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -652,6 +662,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -667,16 +679,28 @@ and the derived files \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2007/09/27 v1.0 Expandable big integer calculations (HO)] + [2007/11/11 v1.1 Expandable big integer calculations (HO)] % \end{macrocode} % % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname BIC@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BIC@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\BIC@AtEnd{% \BIC@AtEnd @@ -692,6 +716,7 @@ and the derived files \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}% < @@ -754,7 +779,16 @@ and the derived files % % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +% \end{macrocode} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax % \end{macrocode} % % \begin{macro}{\BIC@Expand} @@ -809,8 +843,10 @@ and the derived files % \begin{macro}{\BIC@Expand} % \begin{macrocode} \def\BIC@Expand#1{% - \pdfunescapehex{% - \expandafter\BIC@StripHexSpace\pdfescapehex{#1}20\@nil + \romannumeral0\expandafter\expandafter\expandafter\BIC@Space + \pdf@unescapehex{% + \expandafter\expandafter\expandafter + \BIC@StripHexSpace\pdf@escapehex{#1}20\@nil }% }% % \end{macrocode} @@ -3314,7 +3350,39 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -3323,7 +3391,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -3331,7 +3399,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -3374,7 +3442,7 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% \makeatletter \chardef\BIC@TestMode=1 % \makeatother -\usepackage{bigintcalc}[2007/09/27] +\usepackage{bigintcalc}[2007/11/11] %<noetex>\let\numexpr\SavedNumexpr \usepackage{qstest} \IncludeTests{*} @@ -4363,6 +4431,10 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}% % \item % First version. % \end{Version} +% \begin{Version}{2007/11/11 v1.1} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx index 830cf24f26c..cb8a06b9c27 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx @@ -76,6 +76,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files bitset-test1.tex, bitset-test2.tex, bitset-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{bitset.ins}{\from{bitset.dtx}{install}}% @@ -120,6 +122,10 @@ and the derived files \Msg{*} \Msg{* bitset.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `bitset.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -137,7 +143,7 @@ and the derived files \ProvidesFile{bitset.drv}% [2007/09/28 v1.0 Data type bit set (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{amstext} \usepackage[T1]{fontenc} \usepackage{lmodern} @@ -147,7 +153,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{3319} +% \CheckSum{3409} % % \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 @@ -664,6 +670,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -680,6 +689,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -688,6 +698,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -709,10 +721,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname BitSet@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BitSet@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\BitSet@AtEnd{% \BitSet@AtEnd @@ -2725,7 +2749,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -2734,7 +2790,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -2742,7 +2798,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx index b85d24db910..982ef023778 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx @@ -73,12 +73,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bmpsize 2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)} +\Msg{* Package: bmpsize 2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -104,6 +105,7 @@ and the derived files bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{bmpsize.ins}{\from{bmpsize.dtx}{install}}% @@ -127,6 +129,10 @@ and the derived files \Msg{* bmpsize-dvips.def, bmpsize-dvipdfm.def,} \Msg{* bmpsize-dvipdfmx.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `bmpsize.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -142,16 +148,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bmpsize.drv}% - [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]% + [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{bmpsize.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{3562} +% \CheckSum{3585} % % \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 @@ -172,7 +178,7 @@ and the derived files % \GetFileInfo{bmpsize.drv} % % \title{The \xpackage{bmpsize} package} -% \date{2007/05/01 v1.3} +% \date{2007/11/11 v1.4} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -368,7 +374,7 @@ and the derived files % \begin{macrocode} %<*base> \ProvidesPackage{bmpsize-base}% - [2007/05/01 v1.3 Basic part of bmpsize (HO)]% + [2007/11/11 v1.4 Basic part of bmpsize (HO)]% % \end{macrocode} % Modules of package \xpackage{fp} are used for calculations. % \begin{macrocode} @@ -391,6 +397,9 @@ and the derived files % \end{macrocode} % \end{macro} % \begin{macrocode} +\RequirePackage{pdftexcmds}[2007/11/11] +% \end{macrocode} +% \begin{macrocode} \newif\ifbmpsize@ok \let\@bmpsize@ok\bmpsize@oktrue @@ -425,7 +434,7 @@ and the derived files \def\@bmpsize@break#1\@bmpsize@loop#2{} \def\@bmpsize@size#1#2#3{% - \edef#3{\pdffilesize{#1}}% + \edef#3{\pdf@filesize{#1}}% \ifx#3\@empty \expandafter\@bmpsize@stop \fi @@ -435,7 +444,7 @@ and the derived files } \def\@bmpsize@read#1#2#3{% - \edef\@bmpsize@buf{\pdffiledump offset#3length#2{#1}}% + \edef\@bmpsize@buf{\pdf@filedump{#3}{#2}{#1}}% \edef\@bmpsize@temp{% \noexpand\@bmpsize@check@byte{#2}\@bmpsize@buf{}{}\noexpand\\% }% @@ -449,8 +458,7 @@ and the derived files \fi {% \edef\@bmpsize@buf{% - \pdffiledump offset\bmpsize@offset - length\bmpsize@fillbuflength{#1}% + \pdf@filedump{\bmpsize@offset}{\bmpsize@fillbuflength}{#1}% }% \ifx\@bmpsize@buf\@empty \expandafter\@bmpsize@stop @@ -468,13 +476,13 @@ and the derived files } \def\@bmpsize@iswhite#1{% - \ifnum\pdfstrcmp{#1}{09}=\z@ + \ifnum\pdf@strcmp{#1}{09}=\z@ \else - \ifnum\pdfstrcmp{#1}{0A}=\z@ + \ifnum\pdf@strcmp{#1}{0A}=\z@ \else - \ifnum\pdfstrcmp{#1}{0D}=\z@ + \ifnum\pdf@strcmp{#1}{0D}=\z@ \else - \ifnum\pdfstrcmp{#1}{20}=\z@ + \ifnum\pdf@strcmp{#1}{20}=\z@ \else 1% \fi @@ -484,10 +492,10 @@ and the derived files \space } \def\@bmpsize@isdigit#1{% - \ifnum\pdfstrcmp{#1}{30}<\z@ + \ifnum\pdf@strcmp{#1}{30}<\z@ 1% \else - \ifnum\pdfstrcmp{#1}{39}>\z@ + \ifnum\pdf@strcmp{#1}{39}>\z@ 1% \fi \fi @@ -550,7 +558,7 @@ and the derived files \if@bmpsize@absnum \ifnum"\expandafter\@car#1\@nil>7 % \edef#1{\expandafter\@bmpsize@abs@byte#1\relax}% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}=\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}=\z@ \let\@bmpsize@temp\@bmpsize@stop \else \def\@bmpsize@temp{\edef#1{\the\numexpr#1+1}}% @@ -588,7 +596,7 @@ and the derived files \@bmpsize@grab#14% \@bmpsize@swap@maybe#1% \@bmpsize@abs@maybe#1% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}>\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}>\z@ \expandafter\@bmpsize@stop \fi \edef#1{\number"#1}% @@ -834,14 +842,14 @@ and the derived files \@bmpsize@grab\bmpsize@temp{8}% \@bmpsize@skip@four \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49484452}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -854,7 +862,7 @@ and the derived files \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49444154}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49444154}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -862,7 +870,7 @@ and the derived files {% \@bmpsize@stop }% - \ifnum\pdfstrcmp{\bmpsize@temp}{70485973}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{70485973}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1089,7 +1097,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FFD8FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FFD8FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1099,7 +1107,7 @@ and the derived files \@bmpsize@read{#1}{4}{\bmpsize@offset}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1135,7 +1143,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{4A46494600}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4A46494600}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1186,7 +1194,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{6}% \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{457869660000}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{457869660000}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1195,7 +1203,7 @@ and the derived files \edef\bmpsize@exifoffset{\the\numexpr\bmpsize@offset+10}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1203,7 +1211,7 @@ and the derived files {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1444,7 +1452,7 @@ and the derived files \@bmpsize@read{#1}{26}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{424D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{424D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1531,7 +1539,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{474946}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{474946}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1657,7 +1665,7 @@ and the derived files \@bmpsize@read{#1}{8}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1665,7 +1673,7 @@ and the derived files {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1882,16 +1890,16 @@ and the derived files \def\bmpsize@offset{3}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{31}<\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{31}<\z@ \expandafter\@bmpsize@stop \fi - \ifnum\pdfstrcmp{\bmpsize@temp}{36}>\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{36}>\z@ \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% @@ -1914,7 +1922,7 @@ and the derived files \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1924,7 +1932,7 @@ and the derived files \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1932,7 +1940,7 @@ and the derived files {% \@bmpsize@break }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{0D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0D}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1973,7 +1981,7 @@ and the derived files }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% @@ -2013,7 +2021,7 @@ and the derived files }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -2176,7 +2184,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50370A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50370A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -2192,7 +2200,7 @@ and the derived files {% \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -2204,7 +2212,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2219,7 +2227,7 @@ and the derived files \@bmpsize@grab\bmpsize@head{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@head}{5749445448}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{5749445448}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -2274,7 +2282,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2283,12 +2291,12 @@ and the derived files \@bmpsize@break }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \@bmpsize@append\bmpsize@head\bmpsize@head\bmpsize@temp - \ifnum\pdfstrcmp{\bmpsize@head}{454E44484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{454E44484452}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -2297,7 +2305,7 @@ and the derived files \@bmpsize@ok \@bmpsize@stop }{% - \ifnum\pdfstrcmp{\bmpsize@head}{484549474854}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{484549474854}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -2352,7 +2360,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2361,7 +2369,7 @@ and the derived files \@bmpsize@break }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@pushback\bmpsize@head \@bmpsize@loop{% @@ -2369,7 +2377,7 @@ and the derived files \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2508,7 +2516,7 @@ and the derived files \@bmpsize@skip@four \@bmpsize@skip@one \def\bmpsize@offset{9}% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -2516,7 +2524,7 @@ and the derived files \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{22}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{22}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2524,7 +2532,7 @@ and the derived files {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2533,7 +2541,7 @@ and the derived files \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2543,7 +2551,7 @@ and the derived files \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2553,7 +2561,7 @@ and the derived files \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2561,7 +2569,7 @@ and the derived files {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -2570,7 +2578,7 @@ and the derived files \@bmpsize@break }% }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -2631,7 +2639,7 @@ and the derived files }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \def\bmpsize@tempnum{}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% @@ -2680,7 +2688,7 @@ and the derived files }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -2745,13 +2753,13 @@ and the derived files \@bmpsize@read{#1}{16}{1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{01}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -2775,7 +2783,7 @@ and the derived files \@bmpsize@skip@four \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -2848,7 +2856,7 @@ and the derived files \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -2924,13 +2932,13 @@ and the derived files \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{44616E4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{44616E4D}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{4C696E53}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4C696E53}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -2986,7 +2994,7 @@ and the derived files \@bmpsize@read{#1}{10}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{01DA}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01DA}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -3015,24 +3023,39 @@ and the derived files % \begin{macrocode} %<*package> \ProvidesPackage{bmpsize}% - [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]% + [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% \expandafter\endinput \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffiledump\endcsname\relax +\expandafter\ifx\csname pdf@filedump\endcsname\relax \PackageError{bmpsize}{% You need pdfTeX 1.30.0 or newer% }{Package loading is aborted.}% \expandafter\endinput \fi +\RequirePackage{infwarerr}[2007/09/09] \RequirePackage{graphics} -\RequirePackage{keyval} +% \end{macrocode} +% In case of \plainTeX\ options are not executed +% and \cs{KV@err} and \cs{KV@errx} are undefined. +% \begin{macrocode} +\RequirePackage{keyval}\relax +\expandafter\ifx\csname KV@errx\endcsname\relax + \def\KV@errx#1{% + \@PackageError{keyval}{#1}\@ehc + }% +\fi +\expandafter\ifx\csname KV@err\endcsname\relax + \let\KV@err\KV@errx +\fi +% \end{macrocode} +% \begin{macrocode} \RequirePackage{bmpsize-base} -\RequirePackage{infwarerr} \InputIfFileExists{bmpsize-\Gin@driver}{}{} @@ -3058,18 +3081,18 @@ and the derived files \x{ } \def\@bmpsize@read@resolution#1#2 #3 #4\@nil{% \ifcase 0\ifx\\#2\\1\fi - \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@ \ifx\\#3\\1\fi - \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@ 1% \fi \fi - \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax \let\bmpsize@pixelx@default\Gin@exclamation \else \edef\bmpsize@pixelx@default{#2}% \fi - \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax \let\bmpsize@pixely@default\Gin@exclamation \else \ifx\\#3\\% @@ -3091,7 +3114,7 @@ and the derived files \let\@bmpsize@org@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% - \ifcase\pdfstrcmp{#1}{bmp}\relax + \ifcase\pdf@strcmp{#1}{bmp}\relax \expandafter\@firstofone \else \expandafter\@gobble @@ -3188,7 +3211,7 @@ and the derived files % \begin{macrocode} %<*dvips> \ProvidesFile{bmpsize-dvips.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvips (HO)]% % \end{macrocode} % Ensure correct catcodes. % \begin{macrocode} @@ -3311,11 +3334,11 @@ and the derived files % \begin{macrocode} %<*dvipdfm> \ProvidesFile{bmpsize-dvipdfm.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfm (HO)]% %</dvipdfm> %<*dvipdfmx> \ProvidesFile{bmpsize-dvipdfmx.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfmx (HO)]% %</dvipdfmx> %<*dvipdfm|dvipdfmx> % \end{macrocode} @@ -3350,10 +3373,10 @@ and the derived files % \begin{macro}{\@bmpsize@pdfescapestring} % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \def\@bmpsize@pdfescapestring#1{#1}% \else - \let\@bmpsize@pdfescapestring\pdfescapestring + \let\@bmpsize@pdfescapestring\pdf@escapestring \fi % \end{macrocode} % \end{macro} @@ -3529,7 +3552,7 @@ and the derived files % \begin{macrocode} %<*test> \expandafter\ifx\csname NeedsTeXFormat\endcsname\relax -\input miniltx + \input miniltx\relax \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfoutput\endcsname\relax @@ -3560,7 +3583,7 @@ and the derived files \csname @@end\endcsname \end }{% - \ifnum\pdfstrcmp{\imagename}{opt}=\z@ + \ifnum\pdf@strcmp{\imagename}{opt}=\z@ \expandafter\optionmenu \else \startimg @@ -3630,7 +3653,7 @@ and the derived files \fi }% \ifx\@found\@empty - \edef\@file@date{\pdffilemoddate{\imagename}}% + \edef\@file@date{\pdf@filemoddate{\imagename}}% \ifx\@file@date\@empty \msg{\space\space --> File not found <--}% \else @@ -3931,6 +3954,13 @@ and the derived files % \item % Some support for Exif's orientation tag. % \end{Version} +% \begin{Version}{2007/11/11 v1.4} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \item +% Fix of bug of package \xpackage{keyval}: \cs{KV@err} and \cs{KV@errx} +% are used, but undefined if loaded by \plainTeX. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx index 00bc1fc8eea..e9f193b9ec6 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx @@ -82,6 +82,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -108,6 +109,7 @@ and the derived files bookmark-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{bookmark.ins}{\from{bookmark.dtx}{install}}% @@ -134,6 +136,10 @@ and the derived files \Msg{* bkm-dvipsone.def, bkm-textures.def, bkm-pdftex.def,} \Msg{* bkm-vtex.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `bookmark.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -151,7 +157,7 @@ and the derived files \ProvidesFile{bookmark.drv}% [2007/09/25 v1.2 PDF bookmarks (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{bookmark.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx index 8185adb83d8..c4a7b89b8f2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx @@ -71,12 +71,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: catchfile 2007/09/09 v1.1 Catches the contents of a file (HO)} +\Msg{* Package: catchfile 2007/11/11 v1.2 Catches the contents of a file (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -102,6 +103,7 @@ and the derived files catchfile-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{catchfile.ins}{\from{catchfile.dtx}{install}}% @@ -122,6 +124,10 @@ and the derived files \Msg{*} \Msg{* catchfile.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `catchfile.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -137,16 +143,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{catchfile.drv}% - [2007/09/09 v1.1 Catches the contents of a file (HO)]% + [2007/11/11 v1.2 Catches the contents of a file (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{catchfile.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{481} +% \CheckSum{575} % % \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 @@ -167,7 +173,7 @@ and the derived files % \GetFileInfo{catchfile.drv} % % \title{The \xpackage{catchfile} package} -% \date{2007/09/09 v1.1} +% \date{2007/11/11 v1.2} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -223,6 +229,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -239,6 +248,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -247,6 +257,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -262,16 +274,28 @@ and the derived files \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2007/09/09 v1.1 Catches the contents of a file (HO)] + [2007/11/11 v1.2 Catches the contents of a file (HO)] % \end{macrocode} % % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname CatchFile@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname CatchFile@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\CatchFile@AtEnd{% \CatchFile@AtEnd @@ -363,8 +387,9 @@ and the derived files % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\CatchFile@CheckFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -379,7 +404,8 @@ and the derived files }% \else \def\CatchFile@CheckFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\expandafter\expandafter\ifx + \expandafter\expandafter\expandafter\relax\pdf@filesize{#1}\relax \let\CatchFile@File\relax \else \def\CatchFile@File{#1}% @@ -492,7 +518,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -501,7 +559,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -509,7 +567,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -546,7 +604,7 @@ and the derived files \nofiles \listfiles \documentclass{minimal} -\usepackage{catchfile}[2007/09/09] +\usepackage{catchfile}[2007/11/11] \makeatletter \def\mysetup{% \let\do\@makeother @@ -791,6 +849,10 @@ and the derived files % \item % Catcode section rewritten. % \end{Version} +% \begin{Version}{2007/11/11 v1.2} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx index ccbb7a66c75..31ca8f41dd9 100644 --- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files centernot.sty, centernot.pdf, centernot.ins, centernot.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{centernot.ins}{\from{centernot.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* centernot.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `centernot.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{centernot.drv}% [2007/05/31 v1.1 Centers the not symbol horizontally (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{centernot} \usepackage{amssymb} \DeclareFontFamily{U}{matha}{\hyphenchar\font45} diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx index d86dfb2f54a..e76bdff6d8b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files chemarr-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{chemarr.ins}{\from{chemarr.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* chemarr.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `chemarr.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{chemarr.drv}% [2006/02/20 v1.2 Chemical reaction arrows (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{chemarr} \begin{document} \DocInput{chemarr.dtx}% diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx index 0993f2c3b93..124305c134e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files classlist.sty, classlist.pdf, classlist.ins, classlist.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{classlist.ins}{\from{classlist.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* classlist.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `classlist.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{classlist.drv}% [2006/02/20 v1.2 Record loaded classes (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{classlist.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx index cc1f04f34bd..793465304b1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files colonequals.sty, colonequals.pdf, colonequals.ins, colonequals.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{colonequals.ins}{\from{colonequals.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* colonequals.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `colonequals.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{colonequals.drv}% [2006/08/01 v1.0 Colon equals symbols (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{colonequals} \usepackage{array} \usepackage{capt-of} diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx index 0d479a144a0..3749abef2dc 100644 --- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files dvipscol.sty, dvipscol.pdf, dvipscol.ins, dvipscol.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{dvipscol.ins}{\from{dvipscol.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* dvipscol.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `dvipscol.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{dvipscol.drv}% [2006/02/20 v1.1 Fix for dvips.def (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{dvipscol.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx index 9f0879785bb..03c0959cc19 100644 --- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx @@ -75,12 +75,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: embedfile 2007/10/29 v2.1 embed files into PDF (HO)} +\Msg{* Package: embedfile 2007/11/11 v2.2 embed files into PDF (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -107,6 +108,7 @@ and the derived files embedfile-test2.tex, embedfile-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{embedfile.ins}{\from{embedfile.dtx}{install}}% @@ -131,6 +133,10 @@ and the derived files \Msg{*} \Msg{* embedfile.sty, dtx-attach.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `embedfile.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -146,16 +152,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{embedfile.drv}% - [2007/10/29 v2.1 embed files into PDF (HO)]% + [2007/11/11 v2.2 embed files into PDF (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{embedfile.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1287} +% \CheckSum{1378} % % \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 @@ -176,7 +182,7 @@ and the derived files % \GetFileInfo{embedfile.drv} % % \title{The \xpackage{embedfile} package} -% \date{2007/10/29 v2.1} +% \date{2007/11/11 v2.2} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -464,19 +470,20 @@ and the derived files % after the last embedded file. % \begin{macrocode} %<*exampleplain> - % Load packages +%<<END +% Load packages \input miniltx - % \def\Gin@driver{pdftex.def} - % \input graphicx.sty +% \def\Gin@driver{pdftex.def} +% \input graphicx.sty \input embedfile.sty \resetatcatcode - % default setting +% default setting \embedfilesetup{ mimetype=text/plain } - % Embed files +% Embed files \embedfile[ filespec=example.tex, desc={Source code (plain-TeX) of this example} @@ -491,12 +498,13 @@ and the derived files desc={Documentation of package `embedfile'} ]{embedfile.pdf} - % Some text +% Some text This example document contains three embedded files. - % End of document +% End of document \embedfilefinish % don't forget \bye +%END %</exampleplain> % \end{macrocode} % @@ -504,12 +512,13 @@ This example document contains three embedded files. % % \begin{macrocode} %<*examplecollection> +%<<END \NeedsTeXFormat{LaTeX2e} \documentclass{article} \usepackage[bookmarks=false]{hyperref} - % provides \pdfstringdef that is then used by `title' and - % other keys. -\usepackage{embedfile}[2007/10/29] +% provides \pdfstringdef that is then used by `title' and +% other keys. +\usepackage{embedfile}[2007/11/11] \embedfilesetup{ view=details, initialfile=embedfile.pdf @@ -562,7 +571,7 @@ You need Acrobat Reader 8 or higher. ]{\jobname.tex} \end{document} -% +%END %</examplecollection> % \end{macrocode} % @@ -577,8 +586,8 @@ You need Acrobat Reader 8 or higher. %<*dtxattach> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2007/10/29 v2.1 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2007/10/29] + [2007/11/11 v2.2 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2007/11/11] \embedfile[% stringmethod=escape,% mimetype=plain/text,% @@ -615,6 +624,9 @@ You need Acrobat Reader 8 or higher. \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -631,6 +643,7 @@ You need Acrobat Reader 8 or higher. % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -639,6 +652,8 @@ You need Acrobat Reader 8 or higher. \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -654,16 +669,28 @@ You need Acrobat Reader 8 or higher. \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2007/10/29 v2.1 embed files into PDF (HO)] + [2007/11/11 v2.2 embed files into PDF (HO)] % \end{macrocode} % % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname EmFi@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname EmFi@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\EmFi@AtEnd{% \EmFi@AtEnd @@ -727,10 +754,13 @@ You need Acrobat Reader 8 or higher. \expandafter\endinput \fi % \end{macrocode} +% \begin{macrocode} +\EmFi@RequirePackage{pdftexcmds}[2007/11/11] +% \end{macrocode} % Check version. % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax +\expandafter\ifx\csname pdf@filesize\endcsname\relax \EmFi@Error{% Unsupported pdfTeX version% }{% @@ -746,7 +776,7 @@ You need Acrobat Reader 8 or higher. % Minimal version of package \xpackage{pdfescape} is 2007/08/27 v1.5 % because of \cs{EdefSanitize}. % \begin{macrocode} -\EmFi@RequirePackage{pdfescape}[2007/10/27] +\EmFi@RequirePackage{pdfescape}[2007/11/11] % \end{macrocode} % % \begin{macrocode} @@ -1186,7 +1216,7 @@ You need Acrobat Reader 8 or higher. \EmFi@convert\EmFi@title\EmFi@title \xdef\EmFi@schema{% \EmFi@schema - /\pdfescapename{\EmFi@key}<<% + /\pdf@escapename{\EmFi@key}<<% /Subtype/% \ifx\EmFi@type\EmFi@S@date D% \else\ifx\EmFi@type\EmFi@S@number N% @@ -1265,7 +1295,7 @@ You need Acrobat Reader 8 or higher. \else \xdef\EmFi@sortkeys{% \EmFi@sortkeys - /\pdfescapename{#1}% + /\pdf@escapename{#1}% }% \ifx\EmFi@sortorders\empty \global\let\EmFi@sortorders\EmFi@temp @@ -1397,7 +1427,7 @@ You need Acrobat Reader 8 or higher. \global\EmFi@initialfiletrue \fi \setkeys{EmFi}{#1}% - \expandafter\ifx\expandafter\\\pdffilesize{\EmFi@file}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{\EmFi@file}\\% \EmFi@Error{% File `\EmFi@file' not found% }{% @@ -1423,12 +1453,12 @@ You need Acrobat Reader 8 or higher. /Type/EmbeddedFile% \ifx\EmFi@mimetype\empty \else - /Subtype/\pdfescapename{\EmFi@mimetype}% + /Subtype/\pdf@escapename{\EmFi@mimetype}% \fi /Params<<% - /ModDate(\pdffilemoddate{\EmFi@file})% - /Size \pdffilesize{\EmFi@file}% - /CheckSum<\pdfmdfivesum file{\EmFi@file}>% + /ModDate(\pdf@filemoddate{\EmFi@file})% + /Size \pdf@filesize{\EmFi@file}% + /CheckSum<\pdf@filemdfivesum{\EmFi@file}>% >>% }file{\EmFi@file}\relax \EmFi@defobj{EmbeddedFile}% @@ -1437,7 +1467,7 @@ You need Acrobat Reader 8 or higher. /Type/Filespec% \ifx\EmFi@filesystem\empty \else - /FS/\pdfescapename{\EmFi@filesystem}% + /FS/\pdf@escapename{\EmFi@filesystem}% \fi /F(\EmFi@@filespec)% \ifx\EmFi@@desc\empty @@ -1468,10 +1498,10 @@ You need Acrobat Reader 8 or higher. \expandafter\ifx\csname EmFi@P@#1\endcsname\relax \expandafter\ifx\csname EmFi@V@#1\endcsname\relax \else - /\pdfescapename{#1}\csname EmFi@V@#1\endcsname + /\pdf@escapename{#1}\csname EmFi@V@#1\endcsname \fi \else - /\pdfescapename{#1}<<% + /\pdf@escapename{#1}<<% \expandafter\ifx\csname EmFi@V@#1\endcsname\relax \else /D\csname EmFi@V@#1\endcsname @@ -1485,11 +1515,11 @@ You need Acrobat Reader 8 or higher. % \begin{macro}{\EmFi@convert} % \begin{macrocode} \def\EmFi@convert#1#2{% - \ifnum\pdfstrcmp{\EmFi@stringmethod}{psd}=0 % + \ifnum\pdf@strcmp{\EmFi@stringmethod}{psd}=0 % \pdfstringdef\EmFi@temp{#1}% \let#2\EmFi@temp \else - \edef#2{\pdfescapestring{#1}}% + \edef#2{\pdf@escapestring{#1}}% \fi } % \end{macrocode} @@ -1506,12 +1536,12 @@ You need Acrobat Reader 8 or higher. % \begin{macrocode} \def\EmFi@add#1#2{% \begingroup - \edef\key{\pdfescapehex{#1}}% + \edef\key{\pdf@escapehex{#1}}% \ifx\EmFi@list\empty \xdef\EmFi@list{\noexpand\do{\key}{#2}}% \else \def\do##1##2{% - \ifnum\pdfstrcmp{##1}{\key}>0 % + \ifnum\pdf@strcmp{##1}{\key}>0 % \edef\x{% \toks@{% \the\toks@% @@ -1657,7 +1687,39 @@ You need Acrobat Reader 8 or higher. %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1666,7 +1728,7 @@ You need Acrobat Reader 8 or higher. \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1674,7 +1736,7 @@ You need Acrobat Reader 8 or higher. \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -1737,7 +1799,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% \NeedsTeXFormat{LaTeX2e} \let\SavedJobname\jobname \def\jobname{embedfile} -\RequirePackage{dtx-attach}[2007/10/29] +\RequirePackage{dtx-attach}[2007/11/11] \let\jobname\SavedJobname \documentclass{minimal} \begin{document} @@ -1986,6 +2048,10 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% % Export of object references by adding new option \xoption{id} and % new macros \cs{embedfileifobjectexists} and \cs{embedfilegetobject}. % \end{Version} +% \begin{Version}{2007/11/11 v2.2} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx index 2a35d9e6287..47b2ece228c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files engord-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{engord.ins}{\from{engord.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* engord.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `engord.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,14 +141,14 @@ and the derived files \ProvidesFile{engord.drv}% [2007/09/20 v1.6 Provides English ordinal numbers (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{engord.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{369} +% \CheckSum{459} % % \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 @@ -284,6 +290,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -300,6 +309,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -308,6 +318,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -329,10 +341,22 @@ and the derived files % \subsection{Help commands for plain compatibility} % % \begin{macrocode} -\expandafter\edef\csname EO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname EO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\EO@AtEnd{% \EO@AtEnd @@ -592,7 +616,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -601,7 +657,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -609,7 +665,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx index bf464a0acd9..09d191305ab 100644 --- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx @@ -69,12 +69,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files epstopdf-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{epstopdf.ins}{\from{epstopdf.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* epstopdf.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `epstopdf.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,16 +139,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)]% + [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{epstopdf.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{513} +% \CheckSum{607} % % \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 @@ -163,7 +169,7 @@ and the derived files % \GetFileInfo{epstopdf.drv} % % \title{The \xpackage{epstopdf} package} -% \date{2007/10/02 v1.5} +% \date{2007/11/11 v1.6} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -421,6 +427,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -437,6 +446,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -445,6 +455,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -460,16 +472,28 @@ and the derived files \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)] + [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)] % \end{macrocode} % % \subsubsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ETE@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd @@ -497,6 +521,7 @@ and the derived files \RequirePackage{infwarerr}[2007/09/09] \RequirePackage{grfext}\relax \RequirePackage{kvoptions}[2007/10/02] +\RequirePackage{pdftexcmds}[2007/11/11] % \end{macrocode} % % \subsection{Checks} @@ -539,9 +564,9 @@ and the derived files % % \begin{macrocode} \begingroup - \expandafter\ifx\csname pdfshellescape\endcsname\relax + \expandafter\ifx\csname pdf@shellescape\endcsname\relax \else - \ifnum\pdfshellescape>0 % + \ifnum\pdf@shellescape>0 % \else \@PackageWarningNoLine{epstopdf}{% Shell escape feature is not enabled% @@ -574,7 +599,7 @@ and the derived files % % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilemoddate\endcsname\relax +\expandafter\ifx\csname pdf@filemoddate\endcsname\relax \def\ETE@Make#1#2{% \ifETE@update \ETE@WarnModDate @@ -592,7 +617,7 @@ and the derived files \else \def\ETE@Make#1#2{% \ifETE@update - \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 % + \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % \expandafter\expandafter\expandafter\@firstofone \else \@PackageInfoNoLine{epstopdf}{% @@ -606,8 +631,10 @@ and the derived files }% \def\ETE@FileInfo#1#2{% #1 file: <#2>% - \expandafter\ETE@Date\pdffilemoddate{#2}\@nil - \expandafter\ETE@Size\pdffilesize{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Date\pdf@filemoddate{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Size\pdf@filesize{#2}\@nil }% \def\ETE@Date#1\@nil{% \ifx\\#1\\% @@ -685,7 +712,7 @@ and the derived files }% \fi \ETE@Make\SourceFile\OutputFile{% - \immediate\write18{\CommandLine}% + \pdf@system{\CommandLine}% \ifETE@verbose \@PackageInfoNoLine{epstopdf}{% \ETE@FileInfo{Result}\OutputFile @@ -776,7 +803,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -785,7 +844,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -793,7 +852,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -1047,6 +1106,10 @@ and the derived files % \item % Configuration file support added. % \end{Version} +% \begin{Version}{2007/11/11 v1.6} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx index 0d989897b1d..6f8076e1e62 100644 --- a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx @@ -78,6 +78,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -103,6 +104,7 @@ and the derived files etexcmds-test4.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{etexcmds.ins}{\from{etexcmds.dtx}{install}}% @@ -124,6 +126,10 @@ and the derived files \Msg{*} \Msg{* etexcmds.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `etexcmds.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -141,14 +147,14 @@ and the derived files \ProvidesFile{etexcmds.drv}% [2007/09/09 v1.1 Prefix for e-TeX command names (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{etexcmds.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{315} +% \CheckSum{405} % % \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 @@ -232,6 +238,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -248,6 +257,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -256,6 +266,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -277,10 +289,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname etexcmds@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname etexcmds@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\etexcmds@AtEnd{% \etexcmds@AtEnd @@ -364,7 +388,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -373,7 +429,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -381,7 +437,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx index f9be7467a64..a635ef8a9d0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files flags.sty, flags.pdf, flags.ins, flags.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{flags.ins}{\from{flags.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* flags.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `flags.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{flags.drv}% [2007/09/30 v0.4 Flag setting in bit fields (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{flags.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx index 48b3d7e2ccc..8cf781abcfb 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -99,6 +100,7 @@ and the derived files grfext-test1.tex, grfext-test2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{grfext.ins}{\from{grfext.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* grfext.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `grfext.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,14 +141,14 @@ and the derived files \ProvidesFile{grfext.drv}% [2007/09/30 v1.0 Managing graphics extensions (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{grfext.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{531} +% \CheckSum{621} % % \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 @@ -283,6 +289,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -299,6 +308,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -307,6 +317,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -328,10 +340,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname grfext@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname grfext@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\grfext@AtEnd{% \grfext@AtEnd @@ -549,7 +573,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -558,7 +614,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -566,7 +622,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx index a41250581b5..64e985915da 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx @@ -66,12 +66,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: grffile 2007/08/16 v1.5 Extended file name support for graphics (HO)} +\Msg{* Package: grffile 2007/11/11 v1.6 Extended file name support for graphics (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files grffile.sty, grffile.pdf, grffile.ins, grffile.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{grffile.ins}{\from{grffile.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* grffile.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `grffile.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -126,16 +132,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{grffile.drv}% - [2007/08/16 v1.5 Extended file name support for graphics (HO)]% + [2007/11/11 v1.6 Extended file name support for graphics (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{grffile.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{437} +% \CheckSum{438} % % \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 @@ -156,7 +162,7 @@ and the derived files % \GetFileInfo{grffile.drv} % % \title{The \xpackage{grffile} package} -% \date{2007/08/16 v1.5} +% \date{2007/11/11 v1.6} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -364,7 +370,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2007/08/16 v1.5 Extended file name support for graphics (HO)]% + [2007/11/11 v1.6 Extended file name support for graphics (HO)]% % \end{macrocode} % % \subsection{Catcode stuff} @@ -416,8 +422,9 @@ and the derived files % \end{macrocode} % Default setting for option \xoption{space}. % \begin{macrocode} +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax +\expandafter\ifx\csname pdf@filesize\endcsname\relax \grffile@spacefalse \let\grffile@space@disabled\@empty \def\grffile@spacetrue{% @@ -459,7 +466,8 @@ and the derived files \else \ifx\grffile@inputencoding\@empty \expandafter\ifx\csname inputencodingname\endcsname\relax - \expandafter\ifx\csname CurrentInputEncodingOption\endcsname\relax + \expandafter\ifx\csname + CurrentInputEncodingOption\endcsname\relax \else \let\grffile@inputencoding\CurrentInputEncodingOption \fi @@ -560,13 +568,13 @@ and the derived files }% } \def\grffile@IfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \let\reserved@a\@secondoftwo \ifx\input@path\@undefined \else \expandafter\@tfor\expandafter\reserved@b\expandafter :\expandafter=\input@path\do{% - \expandafter\ifx\expandafter\\\pdffilesize{\reserved@b#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{\reserved@b#1}\\% \else \edef\grffile@file@found{\reserved@b#1}% \let\reserved@a\@firstoftwo @@ -875,6 +883,10 @@ and the derived files % \item % Bug fix in encoding support. % \end{Version} +% \begin{Version}{2007/11/11 v1.6} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx index a77c3cae342..0c1018578b5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx @@ -66,12 +66,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: holtxdoc 2007/10/21 v0.8 Private additional ltxdoc support (HO)} +\Msg{* Package: holtxdoc 2007/11/11 v0.9 Private additional ltxdoc support (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files holtxdoc.sty, holtxdoc.pdf, holtxdoc.ins, holtxdoc.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{holtxdoc.ins}{\from{holtxdoc.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* holtxdoc.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `holtxdoc.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -126,16 +132,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{holtxdoc.drv}% - [2007/10/21 v0.8 Private additional ltxdoc support (HO)]% + [2007/11/11 v0.9 Private additional ltxdoc support (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{holtxdoc.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{266} +% \CheckSum{270} % % \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 @@ -156,7 +162,7 @@ and the derived files % \GetFileInfo{holtxdoc.drv} % % \title{The \xpackage{holtxdoc} package} -% \date{2007/10/21 v0.8} +% \date{2007/11/11 v0.9} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -196,7 +202,7 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2007/10/21 v0.8 Private additional ltxdoc support (HO)] + [2007/11/11 v0.9 Private additional ltxdoc support (HO)] % \end{macrocode} % % \begin{macrocode} @@ -352,6 +358,7 @@ and the derived files \providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}} \providecommand*{\pdfTeX}{pdf\TeX} \providecommand*{\pdfLaTeX}{pdf\LaTeX} +\providecommand*{\LuaTeX}{L\textsc{ua}\TeX} \def\@temp#1#2{% \providecommand*{#1}{% \begingroup @@ -616,6 +623,10 @@ and the derived files % \item % \cs{XeTeX} and \cs{XeLaTeX} added. % \end{Version} +% \begin{Version}{2007/11/11 v0.9} +% \item +% \cs{LuaTeX} added. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx index 6773beb52f7..4aa8987bf74 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -99,6 +100,7 @@ and the derived files hycolor-test1.tex, hycolor-test2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hycolor.ins}{\from{hycolor.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* hycolor.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hycolor.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,7 +141,7 @@ and the derived files \ProvidesFile{hycolor.drv}% [2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage[ruled]{algorithm2e} \makeatletter diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx index ff602303c20..66d8bf27d83 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files hypbmsec.sty, hypbmsec.pdf, hypbmsec.ins, hypbmsec.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hypbmsec.ins}{\from{hypbmsec.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* hypbmsec.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hypbmsec.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{hypbmsec.drv}% [2007/04/11 v2.4 Bookmarks in sectioning commands (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{hypbmsec.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx index fcf8afc7be0..0af2f03dcf8 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files hypcap.sty, hypcap.pdf, hypcap.ins, hypcap.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hypcap.ins}{\from{hypcap.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* hypcap.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hypcap.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{hypcap.drv}% [2007/04/09 v1.7 Adjusting anchors of captions (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{hypcap.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx index 10546cac666..fd614692008 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -66,17 +66,18 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hypdestopt 2006/06/01 v2.0 Hyperref destination optimizer (HO)} +\Msg{* Package: hypdestopt 2007/11/11 v2.1 Hyperref destination optimizer (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. -Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -95,6 +96,7 @@ and the derived files hypdestopt.sty, hypdestopt.pdf, hypdestopt.ins, hypdestopt.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hypdestopt.ins}{\from{hypdestopt.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* hypdestopt.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hypdestopt.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -126,16 +132,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hypdestopt.drv}% - [2006/06/01 v2.0 Hyperref destination optimizer (HO)]% + [2007/11/11 v2.1 Hyperref destination optimizer (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{hypdestopt.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{514} +% \CheckSum{515} % % \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 @@ -156,7 +162,7 @@ and the derived files % \GetFileInfo{hypdestopt.drv} % % \title{The \xpackage{hypdestopt} package} -% \date{2006/06/01 v2.0} +% \date{2007/11/11 v2.1} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -278,7 +284,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2006/06/01 v2.0 Hyperref destination optimizer (HO)]% + [2007/11/11 v2.1 Hyperref destination optimizer (HO)]% % \end{macrocode} % % \subsection{Options} @@ -320,7 +326,8 @@ and the derived files % % First \pdfTeX\ must running in PDF mode. % \begin{macrocode} -\RequirePackage{ifpdf} +\RequirePackage{ifpdf}[2007/09/09] +\RequirePackage{pdftexcmds}[2007/11/11] \ifpdf \else \PackageError{hypdestopt}{% @@ -333,7 +340,7 @@ and the derived files % \cs{pdfescapehex} and \cs{pdfunescapehex} are used. % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \PackageError{hypdestopt}{% This pdfTeX is too old, at least 1.30.0 is required% }\@ehc @@ -474,7 +481,7 @@ and the derived files % For use, the hexadecimal string is converted back. % \begin{macrocode} \renewcommand*{\theHypDest}{% - \pdfunescapehex{\HypDest@HexString{\value{HypDest}}}% + \pdf@unescapehex{\HypDest@HexString{\value{HypDest}}}% }% % \end{macrocode} % \end{macro} @@ -508,7 +515,7 @@ and the derived files \begingroup \edef\x{% \expandafter\noexpand - \csname\HypDest@Prefix\pdfunescapehex{#1}\endcsname + \csname\HypDest@Prefix\pdf@unescapehex{#1}\endcsname }% \expandafter\ifx\x\relax \stepcounter{HypDest}% @@ -516,12 +523,12 @@ and the derived files \let\on@line\@empty \ifHypDest@name \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> % - 0x\pdfescapehex{\x} (\number\value{HypDest})% + Use: (\pdf@unescapehex{#1}) -\string> % + 0x\pdf@escapehex{\x} (\number\value{HypDest})% }% \else \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> num \x + Use: (\pdf@unescapehex{#1}) -\string> num \x }% \fi \fi @@ -548,7 +555,7 @@ and the derived files }% \if@filesw \immediate\write\@auxout{% - \string\HypDest@Use{\pdfescapehex{#1}}% + \string\HypDest@Use{\pdf@escapehex{#1}}% }% \fi }% @@ -586,7 +593,7 @@ and the derived files \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}% \HypDest@VerboseInfo{% DestName: (#1) % - 0x\pdfescapehex{\csname\HypDest@Prefix#1\endcsname}% + 0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}% }% }% }% @@ -899,6 +906,10 @@ and the derived files % \item % Options \xoption{name} and \xoption{num} added. % \end{Version} +% \begin{Version}{2007/11/11 v2.1} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx index a591f297412..911625a2093 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx @@ -67,12 +67,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hypdoc 2007/04/11 v1.5 Hyper extensions for doc.sty (HO)} +\Msg{* Package: hypdoc 2007/11/12 v1.6 Hyper extensions for doc.sty (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files hypdoc.sty, hypdoc.pdf, hypdoc.ins, hypdoc.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hypdoc.ins}{\from{hypdoc.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* hypdoc.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hypdoc.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,16 +134,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hypdoc.drv}% - [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]% + [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{hypdoc.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{682} +% \CheckSum{680} % % \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 @@ -158,7 +164,7 @@ and the derived files % \GetFileInfo{hypdoc.drv} % % \title{The \xpackage{hypdoc} package} -% \date{2007/04/11 v1.5} +% \date{2007/11/12 v1.6} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -335,24 +341,36 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]% + [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]% % \end{macrocode} % The package identification is done at the top of the |.dtx| file % in order to use only one identification string. % % For unique command names this package uses |HD@| as prefix % -% \begin{macrocode} +% \subsection{Options} % +% \begin{macro}{\ifHD@numbered} +% \begin{macrocode} \newif\ifHD@numbered +% \end{macrocode} +% \end{macro} +% \begin{macrocode} \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax - +% \end{macrocode} +% +% \subsection{Package loading} +% +% \begin{macrocode} \RequirePackage{doc} - +% \end{macrocode} +% \begin{macrocode} \ifx\numexpr\@undefined \RequirePackage{calc}% \fi +% \end{macrocode} +% \begin{macrocode} \RequirePackage[% hyperindex=false,% pdfusetitle,% @@ -369,12 +387,20 @@ and the derived files }},% } \RequirePackage{thumbpdf} - +% \end{macrocode} +% +% \begin{macrocode} \newcounter{HD@unique} +% \end{macrocode} +% \begin{macro}{\theHD@unique} +% \begin{macrocode} \renewcommand{\theHD@unique}{% \number\value{HD@unique}% } - +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} \g@addto@macro\Hy@UseMaketitleInfos{% \@ifundefined{fileinfo}{}{% \ifx\@pdfsubject\@empty @@ -382,7 +408,9 @@ and the derived files \fi }% } - +% \end{macrocode} +% +% \begin{macrocode} \pdfstringdefDisableCommands{% \let\thanks\@gobble \let\footnote\@gobble @@ -391,9 +419,12 @@ and the derived files \let\scshape\@empty \def\and{and }% } - -%%% Bookmarks - +% \end{macrocode} +% +% \subsection{Bookmarks} +% +% \begin{macro}{\HD@sectionpatch} +% \begin{macrocode} \def\HD@sectionpatch{% \ifHD@numbered \HD@@sectionpatch{section}% @@ -402,6 +433,10 @@ and the derived files \let\Hy@writebookmark\HD@disable@writebookmark \fi } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@@sectionpatch} +% \begin{macrocode} \def\HD@@sectionpatch#1{% \expandafter\let\csname HDorg@@#1\expandafter\endcsname \csname #1\endcsname @@ -409,13 +444,25 @@ and the derived files \@ifstar{\@nameuse{HDorg@@#1}}{\@nameuse{HDorg@@#1}}% }% } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@disable@writebookmark} +% \begin{macrocode} \def\HD@disable@writebookmark#1#2#3#4#5{} - -% A wild guessing of the toclevel. There is the hope, that -% the macro \verb|#1| starts with a sectioning command. +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HD@guesstoclevel} +% A wild guessing of the toclevel. There is the hope, that +% the macro |#1| starts with a sectioning command. +% \begin{macrocode} \def\HD@guesstoclevel#1{% \expandafter\HD@@guesstoclevel#1\section\HD@end } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@@guesstoclevel} +% \begin{macrocode} \def\HD@@guesstoclevel#1#2\HD@end{% \@ifundefined{toclevel@\expandafter\@gobble\string#1\@empty}{% 1% @@ -423,12 +470,22 @@ and the derived files \@nameuse{toclevel@\expandafter\@gobble\string#1\@empty}% }% } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{tableofcontents}} +% +% \begin{macro}{\HDorg@tableofcontents} +% \begin{macrocode} \let\HDorg@tableofcontents\tableofcontents +% \end{macrocode} +% \end{macro} +% \begin{macro}{\tableofcontents} +% As first section the table of contents shouldn't +% go into the toc itself. Also a number looks too funny then. +% Just a bookmark is enough in this case. +% \begin{macrocode} \def\tableofcontents{% - % As first section the table of contents shouldn't - % go into the toc itself. Also a number looks too funny then. - % Just a bookmark is enough in this case. \begingroup \@ifundefined{c@section}{% \def\c@section{0}% @@ -452,22 +509,42 @@ and the derived files \endgroup \fi } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{listoffigures}} +% +% \begin{macro}{\HDorg@listoffigures} +% \begin{macrocode} \let\HDorg@listoffigures\listoffigures +% \end{macrocode} +% \end{macro} +% \begin{macro}{\listoffigures} +% \begin{macrocode} \def\listoffigures{% \ifHD@numbered \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHd@unique}% + {\contentsname}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch \HDorg@listoffigures \endgroup } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{listoftables}} +% +% \begin{macro}{\HDorg@listoftables} +% \begin{macrocode} \let\HDorg@listoftables\listoftables +% \end{macrocode} +% \end{macro} +% \begin{macro}{\listoftables} +% \begin{macrocode} \def\listoftables{% \ifHD@numbered \else @@ -480,8 +557,18 @@ and the derived files \HDorg@listoftables \endgroup } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{thebibliography}} +% +% \begin{macro}{\HDorg@thebibliography} +% \begin{macrocode} \let\HDorg@thebibliography\thebibliography +% \end{macrocode} +% \end{macro} +% \begin{macro}{\thebibliography} +% \begin{macrocode} \def\thebibliography{% \ifHD@numbered \else @@ -492,8 +579,18 @@ and the derived files \HD@sectionpatch \HDorg@thebibliography } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{theindex}} +% +% \begin{macro}{\HDorg@theindex} +% \begin{macrocode} \let\HDorg@theindex\theindex +% \end{macrocode} +% \end{macro} +% \begin{macro}{\theindex} +% \begin{macrocode} \def\theindex{% \let\HDorg@index@prologue\index@prologue \let\HDorg@writebookmark\Hy@writebookmark @@ -525,14 +622,30 @@ and the derived files }% \HDorg@theindex } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HDorg@bfseries} +% \begin{macrocode} \let\HDorg@bfseries\bfseries +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@bfseries} +% \begin{macrocode} \def\HD@bfseries{\futurelet\HD@hfil\HD@@bfseries}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@@bfseries} +% \begin{macrocode} \def\HD@@bfseries{% \HDorg@bfseries \ifx\HD@hfil\hfil \expandafter\HD@@@bfseries \fi -}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@@@bfseries} +% \begin{macrocode} \def\HD@@@bfseries\hfil#1\hfil{% \ifx\\#1\\% \else @@ -544,9 +657,23 @@ and the derived files \fi \hfil#1\hfil }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@margin} +% \begin{macrocode} \def\HD@margin{1mm} - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{theglossary}} +% +% \begin{macro}{\HDorg@theglossary} +% \begin{macrocode} \let\HDorg@theglossary\theglossary +% \end{macrocode} +% \end{macro} +% \begin{macro}{\theglossary} +% \begin{macrocode} \def\theglossary{% \let\HDorg@glossary@prologue\glossary@prologue \let\HDorg@writebookmark\Hy@writebookmark @@ -565,17 +692,37 @@ and the derived files }% \HDorg@theglossary } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\glossaryname} +% \begin{macrocode} \providecommand*{\glossaryname}{Change History} - -%%% Index stuff - +% \end{macrocode} +% \end{macro} +% +% \subsection{Index} +% +% \begin{macrocode} \newcounter{HD@hypercount} +% \end{macrocode} +% \begin{macro}{\HD@helplength} +% \begin{macrocode} \newlength{\HD@helplength} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ifHD@savedest} +% \begin{macrocode} \newif\ifHD@savedest \HD@savedesttrue +% \end{macrocode} +% \end{macro} +% \begin{macrocode} \AtBeginDocument{% \HD@savedest@init } +% \end{macrocode} +% \begin{macro}{\HD@savedest@init} +% \begin{macrocode} \begingroup \catcode`\^^M=\active \@firstofone{\endgroup @@ -596,17 +743,31 @@ and the derived files \let\HD@savedest@add\@gobble \fi }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@savedest@entry} +% \begin{macrocode} \def\HD@savedest@entry#1^^M{% \@namedef{HD.#1}{}% }% } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@savedest@add} +% \begin{macrocode} \def\HD@savedest@add#1{% \immediate\write\HD@savedest@out{\string~#1}% } - +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ifHD@targetraise} +% \begin{macrocode} \newif\ifHD@targetraise \HD@targetraisetrue - +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@target} +% \begin{macrocode} \def\HD@target{% \ifHD@targetraise \ifhmode @@ -622,6 +783,10 @@ and the derived files \HD@maketarget \fi } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@maketarget} +% \begin{macrocode} \def\HD@maketarget{% \stepcounter{HD@hypercount}% \def\HD@next{% @@ -635,14 +800,26 @@ and the derived files \fi \HD@next } - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\CodelineIndex} +% \begin{macrocode} \g@addto@macro\CodelineIndex{% \let\special@index\HD@codeline@wrindex } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PageIndex} +% \begin{macrocode} \g@addto@macro\PageIndex{% \let\special@index\HD@page@wrindex } - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HD@codeline@wrindex} +% \begin{macrocode} \def\HD@codeline@wrindex#1{% \begingroup \let\HDorg@encapchar\encapchar @@ -655,6 +832,10 @@ and the derived files }% \endgroup } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\HD@page@wrindex} +% \begin{macrocode} \def\HD@page@wrindex#1{% \begingroup \let\HDorg@encapchar\encapchar @@ -665,20 +846,38 @@ and the derived files \HDorg@index{#1\encapchar\encapchar\@nil}% \endgroup } - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\hdclindex} +% \begin{macrocode} \def\hdclindex#1#2#3{% \csname\ifx\\#2\\relax\else#2\fi\endcsname{% \hyperlink{HD.#1}{#3}% \HD@savedest@add{#1}% }% } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\hdpindex} +% \begin{macrocode} \def\hdpindex#1#2{% \csname\ifx\\#1\\relax\else#1\fi\endcsname{% \hyperpage{#2}% }% } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{PrintDescribeMacro}} +% +% \begin{macro}{\HDorg@PrintDescribeMacro} +% \begin{macrocode} \let\HDorg@PrintDescribeMacro\PrintDescribeMacro +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PrintDescribeMacro} +% \begin{macrocode} \renewcommand\PrintDescribeMacro[1]{% \begingroup \let\HDorg@MacroFont\MacroFont @@ -689,8 +888,18 @@ and the derived files \HDorg@PrintDescribeMacro{#1}% \endgroup } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{PrintMacroName}} +% +% \begin{macro}{\HDorg@PrintMacroName} +% \begin{macrocode} \let\HDorg@PrintMacroName\PrintMacroName +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PrintMacroName} +% \begin{macrocode} \renewcommand\PrintMacroName[1]{% \begingroup \let\HDorg@MacroFont\MacroFont @@ -701,8 +910,18 @@ and the derived files \HDorg@PrintMacroName{#1}% \endgroup } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{theCodelineNo}} +% +% \begin{macro}{\HDorg@theCodelineNo} +% \begin{macrocode} \let\HDorg@theCodelineNo\theCodelineNo +% \end{macrocode} +% \end{macro} +% \begin{macro}{\theCodelineNo} +% \begin{macrocode} \renewcommand*\theCodelineNo{% \settowidth{\HD@helplength}{\HDorg@theCodelineNo\ }% \ifdim\HD@helplength<\MacroIndent @@ -716,11 +935,21 @@ and the derived files \fi \HDorg@theCodelineNo } - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\HDorg@index} +% \begin{macrocode} \AtBeginDocument{% \let\HDorg@index\index } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{SpecialUsageIndex}} +% +% \begin{macro}{\HDorg@SpecialUsageIndex} +% \begin{macrocode} \let\HDorg@SpecialUsageIndex\SpecialUsageIndex \renewcommand*\SpecialUsageIndex[1]{% \@bsphack @@ -735,11 +964,23 @@ and the derived files \endgroup \@esphack } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{autoindex}} +% +% \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname autoindex\endcsname\relax \else +% \end{macrocode} +% \begin{macro}{\HDorg@autoindex} +% \begin{macrocode} \let\HDorg@autoindex\autoindex +% \end{macrocode} +% \end{macro} +% \begin{macro}{\autoindex} +% \begin{macrocode} \renewcommand*\autoindex[1]{% \@bsphack \begingroup @@ -754,8 +995,18 @@ and the derived files \@esphack }% \fi - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{SpecialEnvIndex}} +% +% \begin{macro}{\HDorg@SpecialEnvIndex} +% \begin{macrocode} \let\HDorg@SpecialEnvIndex\SpecialEnvIndex +% \end{macrocode} +% \end{macro} +% \begin{macro}{\SpecialEnvIndex} +% \begin{macrocode} \renewcommand*\SpecialEnvIndex[1]{% \@bsphack \begingroup @@ -768,8 +1019,18 @@ and the derived files \endgroup \@esphack } - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{SortIndex}} +% +% \begin{macro}{\HDorg@SortIndex} +% \begin{macrocode} \let\HDorg@SortIndex\SortIndex +% \end{macrocode} +% \end{macro} +% \begin{macro}{\SortIndex} +% \begin{macrocode} \renewcommand*{\SortIndex}[2]{% \@bsphack \begingroup @@ -778,11 +1039,18 @@ and the derived files \endgroup \@esphack } - - -%%% glossary stuff - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{@wrglossary}} +% +% \begin{macro}{\HDorg@wrglossary} +% \begin{macrocode} \let\HDorg@wrglossary\@wrglossary +% \end{macrocode} +% \end{macro} +% \begin{macro}{\@wrglossary} +% \begin{macrocode} \def\@wrglossary#1{% \let\HDorg@encapchar\encapchar \def\encapchar##1\encapchar##2\@nil{% @@ -791,9 +1059,13 @@ and the derived files }% \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } - -%%% \MacroIndent automatically calculated - +% \end{macrocode} +% \end{macro} +% +% \subsection{\cs{MacroIndent}} +% +% \cs{MacroIndent} automatically calculated. +% \begin{macrocode} \AtEndDocument{% \if@filesw \immediate\write\@auxout{% @@ -801,6 +1073,9 @@ and the derived files }% \fi } +% \end{macrocode} +% \begin{macro}{\HD@SetMacroIndent} +% \begin{macrocode} \def\HD@SetMacroIndent#1{% \begingroup \value{CodelineNo}=#1\relax @@ -809,6 +1084,7 @@ and the derived files \endgroup } % \end{macrocode} +% \end{macro} % % \begin{macrocode} %</package> @@ -1030,6 +1306,12 @@ and the derived files % \item % Line ends sanitized. % \end{Version} +% \begin{Version}{2007/11/12 v1.6} +% \item +% Bug fix in \cs{listoffigures} (Axel Sommerfeldt). +% \item +% Markup added in implementation section. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx index f6f466b4676..f4af01e7c67 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypgotoe.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files hypgotoe-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{hypgotoe.ins}{\from{hypgotoe.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* hypgotoe.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `hypgotoe.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{hypgotoe.drv}% [2007/10/30 v0.1 Experimental links to embedded files (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{hypgotoe.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx index 6a5332ac4e5..e87b33ce84e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files ifdraft.sty, ifdraft.pdf, ifdraft.ins, ifdraft.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{ifdraft.ins}{\from{ifdraft.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* ifdraft.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `ifdraft.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{ifdraft.drv}% [2006/02/20 v1.2 Switch for option draft (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{ifdraft.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx index 198e19160f7..14d6677ad83 100644 --- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx @@ -73,12 +73,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: iflang 2007/09/09 v1.4 Language checks (HO)} +\Msg{* Package: iflang 2007/11/11 v1.5 Language checks (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -104,6 +105,7 @@ and the derived files iflang-test4.tex, iflang-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{iflang.ins}{\from{iflang.dtx}{install}}% @@ -126,6 +128,10 @@ and the derived files \Msg{*} \Msg{* iflang.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `iflang.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -141,16 +147,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{iflang.drv}% - [2007/09/09 v1.4 Language checks (HO)]% + [2007/11/11 v1.5 Language checks (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{iflang.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{727} +% \CheckSum{820} % % \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 @@ -171,7 +177,7 @@ and the derived files % \GetFileInfo{iflang.drv} % % \title{The \xpackage{iflang} package} -% \date{2007/09/09 v1.4} +% \date{2007/11/11 v1.5} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -283,6 +289,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -299,6 +308,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -307,6 +317,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -322,14 +334,26 @@ and the derived files \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/09/09 v1.4 Language checks (HO)] + [2007/11/11 v1.5 Language checks (HO)] % \end{macrocode} % % \begin{macrocode} -\expandafter\edef\csname IfLang@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname IfLang@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\IfLang@AtEnd{% \IfLang@AtEnd @@ -411,8 +435,10 @@ and the derived files \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input pdftexcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{pdftexcmds}[2007/11/11]% \fi % \end{macrocode} % @@ -497,14 +523,15 @@ and the derived files % % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfstrcmp\endcsname\relax +\expandafter\ifx\csname pdf@strcmp\endcsname\relax \expandafter\@firstoftwo \else \expandafter\@secondoftwo \fi {% % \end{macrocode} -% We do not have \cs{pdfstrcmp}. Thus we must define +% We do not have \cs{pdf@strcmp} (and \cs{pdfstrcmp}). +% Thus we must define % our own expandable string comparison. The following % implementation is based on a \TeX\ pearl from David Kastrup, presented % at the conference Bacho\TeX~2005: @@ -568,7 +595,7 @@ and the derived files % \begin{macrocode} \def\IfLanguageName#1{% \ifnum\IfLang@IfDefined{languagename}{% - \pdfstrcmp{#1}{\languagename}% + \pdf@strcmp{#1}{\languagename}% }{1}=0 % \expandafter\@firstoftwo \else @@ -610,7 +637,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -619,7 +678,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -627,7 +686,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -1077,6 +1136,10 @@ and the derived files % \item % Catcode section rewritten. % \end{Version} +% \begin{Version}{2007/11/11 v1.5} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx index 44b9b080985..20b561ab84a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files ifpdf-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{ifpdf.ins}{\from{ifpdf.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* ifpdf.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `ifpdf.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,14 +141,14 @@ and the derived files \ProvidesFile{ifpdf.drv}% [2007/09/09 v1.5 Provides the ifpdf switch (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{ifpdf.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{271} +% \CheckSum{361} % % \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 @@ -332,6 +338,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -348,6 +357,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -356,6 +366,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -377,10 +389,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname ifpdf@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifpdf@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ifpdf@AtEnd{% \ifpdf@AtEnd @@ -492,7 +516,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -501,7 +557,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -509,7 +565,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx index ea42506f008..4ff78bb2f4f 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files ifvtex-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{ifvtex.ins}{\from{ifvtex.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* ifvtex.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `ifvtex.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,14 +141,14 @@ and the derived files \ProvidesFile{ifvtex.drv}% [2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{ifvtex.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{340} +% \CheckSum{430} % % \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 @@ -243,6 +249,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -259,6 +268,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -267,6 +277,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -288,10 +300,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname ifvtex@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifvtex@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ifvtex@AtEnd{% \ifvtex@AtEnd @@ -439,7 +463,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -448,7 +504,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -456,7 +512,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx index 62ddbf4a7e6..f4a8769c4e5 100644 --- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx @@ -77,6 +77,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -102,6 +103,7 @@ and the derived files infwarerr-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{infwarerr.ins}{\from{infwarerr.dtx}{install}}% @@ -122,6 +124,10 @@ and the derived files \Msg{*} \Msg{* infwarerr.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `infwarerr.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -139,14 +145,14 @@ and the derived files \ProvidesFile{infwarerr.drv}% [2007/09/09 v1.2 Providing info/warning/message (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{infwarerr.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{692} +% \CheckSum{782} % % \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 @@ -235,6 +241,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -251,6 +260,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -259,6 +269,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -280,10 +292,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname InfWarErr@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InfWarErr@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\InfWarErr@AtEnd{% \InfWarErr@AtEnd @@ -616,7 +640,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -625,7 +681,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -633,7 +689,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx index bc39dfd4523..54a46c9754a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx @@ -120,6 +120,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -154,6 +155,7 @@ and the derived files inputenx-licrcmds.txt, inputenx-utf8enc.txt. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{inputenx.ins}{\from{inputenx.dtx}{install}}% @@ -218,6 +220,10 @@ and the derived files \Msg{* x-mac-centeuro.def, x-mac-cyrillic.def, x-mac-roman.def,} \Msg{* x-nextstep.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `inputenx.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -235,7 +241,7 @@ and the derived files \ProvidesFile{inputenx.drv}% [2007/08/16 v1.3 Enhanced input encoding handling (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{longtable} \begin{document} \DocInput{inputenx.dtx}% diff --git a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx index 4d06f648ad4..fb84183f530 100644 --- a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx @@ -78,6 +78,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -103,6 +104,7 @@ and the derived files intcalc-test4.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{intcalc.ins}{\from{intcalc.dtx}{install}}% @@ -124,6 +126,10 @@ and the derived files \Msg{*} \Msg{* intcalc.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `intcalc.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -141,7 +147,7 @@ and the derived files \ProvidesFile{intcalc.drv}% [2007/09/27 v1.1 Expandable integer calculations (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{wasysym} \let\iint\relax \let\iiint\relax @@ -182,7 +188,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{3045} +% \CheckSum{3135} % % \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 @@ -619,6 +625,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -635,6 +644,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -643,6 +653,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -664,10 +676,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname InCa@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InCa@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\InCa@AtEnd{% \InCa@AtEnd @@ -3058,7 +3082,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -3067,7 +3123,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -3075,7 +3131,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx index e7b9e0a0f57..5e42e7bbe0c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx @@ -79,6 +79,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -105,6 +106,7 @@ and the derived files kvoptions-test1.tex, kvoptions-test2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{kvoptions.ins}{\from{kvoptions.dtx}{install}}% @@ -127,6 +129,10 @@ and the derived files \Msg{*} \Msg{* kvoptions.sty, kvoptions-patch.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `kvoptions.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -144,14 +150,14 @@ and the derived files \ProvidesFile{kvoptions.drv}% [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{kvoptions.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1866} +% \CheckSum{1978} % % \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 @@ -974,6 +980,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -990,6 +999,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -998,6 +1008,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -1019,10 +1031,22 @@ and the derived files % \paragraph{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd @@ -1834,10 +1858,22 @@ and the derived files % \begin{macrocode} %<*patch> \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd @@ -2382,7 +2418,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -2391,7 +2459,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -2399,7 +2467,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx index 6874e793d32..931d33b1527 100644 --- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx @@ -78,6 +78,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -103,6 +104,7 @@ and the derived files kvsetkeys-test2.tex, kvsetkeys-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{kvsetkeys.ins}{\from{kvsetkeys.dtx}{install}}% @@ -125,6 +127,10 @@ and the derived files \Msg{*} \Msg{* kvsetkeys.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `kvsetkeys.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -142,14 +148,14 @@ and the derived files \ProvidesFile{kvsetkeys.drv}% [2007/09/29 v1.3 Key value parser with default handler support (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{kvsetkeys.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1010} +% \CheckSum{1100} % % \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 @@ -477,6 +483,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -493,6 +502,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -501,6 +511,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -520,10 +532,22 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -\expandafter\edef\csname KVS@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVS@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVS@AtEnd{% \KVS@AtEnd @@ -1018,7 +1042,39 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1027,7 +1083,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1035,7 +1091,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx index a576c700e48..e4338e54cb1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx @@ -74,12 +74,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: listingsutf8 2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)} +\Msg{* Package: listingsutf8 2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -106,6 +107,7 @@ and the derived files listingsutf8-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{listingsutf8.ins}{\from{listingsutf8.dtx}{install}}% @@ -128,6 +130,10 @@ and the derived files \Msg{*} \Msg{* listingsutf8.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `listingsutf8.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -143,16 +149,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{listingsutf8.drv}% - [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)]% + [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{listingsutf8.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{230} +% \CheckSum{253} % % \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 @@ -173,7 +179,7 @@ and the derived files % \GetFileInfo{listingsutf8.drv} % % \title{The \xpackage{listingsutf8} package} -% \date{2007/10/22 v1.0} +% \date{2007/11/11 v1.1} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -243,10 +249,22 @@ and the derived files % \subsection{Catcodes and identification} % % \begin{macrocode} -\expandafter\edef\csname lstU@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname lstU@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\lstU@AtEnd{% \lstU@AtEnd @@ -283,7 +301,7 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% - [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)] + [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] % \end{macrocode} % % \subsection{Package options} @@ -313,6 +331,10 @@ and the derived files % \subsection{Check prerequisites} % % \begin{macrocode} +\RequirePackage{pdftexcmds}[2007/11/11] +% \end{macrocode} +% +% \begin{macrocode} \def\lstU@temp#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -325,9 +347,9 @@ and the derived files \fi } \lstU@temp{scantokens}{It is provided by e-TeX} -\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30} % \end{macrocode} % % \begin{macrocode} @@ -376,8 +398,8 @@ and the derived files \def\lstU@input#1{% \iflstU@utfviii \edef\lstU@text{% - \pdfunescapehex{% - \pdffiledump length\pdffilesize{#1}{#1}% + \pdf@unescapehex{% + \pdf@filedump{0}{\pdf@filesize{#1}}{#1}% }% }% \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc @@ -457,7 +479,7 @@ and the derived files \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \RequirePackage{listingsutf8}[2007/10/22]\relax + \RequirePackage{listingsutf8}[2007/11/11]\relax \RestoreCatcodes } \Test @@ -495,7 +517,7 @@ public class ExampleUTF8 { } } \end{filecontents*} -\usepackage{listingsutf8}[2007/10/22] +\usepackage{listingsutf8}[2007/11/11] \def\Text{% Umlauts: % ^^c3^^84^^c3^^96^^c3^^9c^^c3^^a4^^c3^^b6^^c3^^bc^^c3^^9f% @@ -721,6 +743,10 @@ public class ExampleUTF8 { % \item % First version. % \end{Version} +% \begin{Version}{2007/11/11 v1.1} +% \item +% Use of package \xpackage{pdftexcmds}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx index f8de9a5af37..27f0da47725 100644 --- a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files makerobust-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{makerobust.ins}{\from{makerobust.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* makerobust.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `makerobust.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{makerobust.drv}% [2006/03/18 v1.0 Making a macro robust (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{makerobust.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index d6789f4cbb6..88e46551331 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 -% 2007/10/29 +% 2007/11/15 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -74,6 +74,7 @@ \batchinput{pdfcrypt.dtx} \batchinput{pdfescape.dtx} \batchinput{pdflscape.dtx} +\batchinput{pdftexcmds.dtx} \batchinput{picture.dtx} \batchinput{pmboxdraw.dtx} \batchinput{refcount.dtx} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 159189695e1..0a290589999 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}{2007/10/29} +\newcommand*{\Date}{2007/11/15} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -78,6 +78,9 @@ \providecommand*{\plainTeX}{plain-\TeX} \providecommand*{\VTeX}{V\TeX} \providecommand*{\eTeX}{$\csname m@th\endcsname\varepsilon$-\TeX} +\providecommand*{\LuaTeX}{% + L\textsc{ua}\TeX +} \newcommand*{\xpackage}[1]{\textsf{#1}} \newcommand*{\xfile}[1]{\textsf{#1}} \newcommand*{\xoption}[1]{\textsf{#1}} @@ -156,7 +159,7 @@ \section{Overview} \begin{overview} -\entry{accsupp}{2007/03/21}{0.1}{Accessibility support by marked content}% +\entry{accsupp}{2007/11/14}{0.2}{Accessibility support by marked content}% [\entrysep] \entry{aliascnt}{2006/09/25}{1.2}{Alias counter}% [\entrysep] @@ -172,15 +175,15 @@ [\entrysep] \entry{auxhook}{2007/04/06}{1.1}{Hooks for auxiliary files}% [\entrysep] -\entry{bigintcalc}{2007/09/27}{1.0}{Expandable big integer calculations}% +\entry{bigintcalc}{2007/11/11}{1.1}{Expandable big integer calculations}% [\entrysep] \entry{bitset}{2007/09/28}{1.0}{Data type bit set}% [\entrysep] -\entry{bmpsize}{2007/05/01}{1.3}{Extract size and resolution data from bitmap files}% +\entry{bmpsize}{2007/11/11}{1.4}{Extract size and resolution data from bitmap files}% [\entrysep] \entry{bookmark}{2007/09/25}{1.2}{PDF bookmarks}% [\entrysep] -\entry{catchfile}{2007/09/09}{1.1}{Catches the contents of a file}% +\entry{catchfile}{2007/11/11}{1.2}{Catches the contents of a file}% [\entrysep] \entry{centernot}{2007/05/31}{1.1}{Centers the not symbol horizontally}% [\entrysep] @@ -192,11 +195,11 @@ [\entrysep] \entry{dvipscol}{2006/02/20}{1.1}{Fix for dvips.def}% [\entrysep] -\entry{embedfile}{2007/10/29}{2.1}{embed files into PDF}% +\entry{embedfile}{2007/11/11}{2.2}{embed files into PDF}% [\entrysep] \entry{engord}{2007/09/20}{1.6}{Provides English ordinal numbers}% [\entrysep] -\entry{epstopdf}{2007/10/02}{1.5}{Conversion with epstopdf on the fly}% +\entry{epstopdf}{2007/11/11}{1.6}{Conversion with epstopdf on the fly}% [\entrysep] \entry{etexcmds}{2007/09/09}{1.1}{Prefix for e-TeX command names}% [\entrysep] @@ -204,9 +207,9 @@ [\entrysep] \entry{grfext}{2007/09/30}{1.0}{Managing graphics extensions}% [\entrysep] -\entry{grffile}{2007/08/16}{1.5}{Extended file name support for graphics}% +\entry{grffile}{2007/11/11}{1.6}{Extended file name support for graphics}% [\entrysep] -\entry{holtxdoc}{2007/10/21}{0.8}{Private additional ltxdoc support}% +\entry{holtxdoc}{2007/11/11}{0.9}{Private additional ltxdoc support}% [\entrysep] \entry{hycolor}{2007/04/11}{1.1}{Code for color options of hyperref/bookmark}% [\entrysep] @@ -214,15 +217,15 @@ [\entrysep] \entry{hypcap}{2007/04/09}{1.7}{Adjusting anchors of captions}% [\entrysep] -\entry{hypdestopt}{2006/06/01}{2.0}{Hyperref destination optimizer}% +\entry{hypdestopt}{2007/11/11}{2.1}{Hyperref destination optimizer}% [\entrysep] -\entry{hypdoc}{2007/04/11}{1.5}{Hyper extensions for doc.sty}% +\entry{hypdoc}{2007/11/12}{1.6}{Hyper extensions for doc.sty}% [\entrysep] \entry{hypgotoe}{2007/10/30}{0.1}{Experimental links to embedded files}% [\entrysep] \entry{ifdraft}{2006/02/20}{1.2}{Switch for option draft}% [\entrysep] -\entry{iflang}{2007/09/09}{1.4}{Language checks}% +\entry{iflang}{2007/11/11}{1.5}{Language checks}% [\entrysep] \entry{ifpdf}{2007/09/09}{1.5}{Provides the ifpdf switch}% [\entrysep] @@ -238,7 +241,7 @@ [\entrysep] \entry{kvsetkeys}{2007/09/29}{1.3}{Key value parser with default handler support}% [\entrysep] -\entry{listingsutf8}{2007/10/22}{1.0}{Adding support for UTF-8 to listings}% +\entry{listingsutf8}{2007/11/11}{1.1}{Adding support for UTF-8 to listings}% [\entrysep] \entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}% [\entrysep] @@ -256,10 +259,12 @@ [\entrysep] \entry{pdfcrypt}{2007/04/26}{1.0}{Setting pdf encryption}% [\entrysep] -\entry{pdfescape}{2007/10/27}{1.7}{Provides hex, PDF name and string conversions}% +\entry{pdfescape}{2007/11/11}{1.8}{Provides hex, PDF name and string conversions}% [\entrysep] \entry{pdflscape}{2007/10/21}{0.9}{Landscape pages in PDF}% [\entrysep] +\entry{pdftexcmds}{2007/11/12}{0.2}{LuaTeX support for pdfTeX utility functions}% +[\entrysep] \entry{picture}{2007/04/11}{1.1}{Dimens for picture macros}% [\entrysep] \entry{pmboxdraw}{2006/05/03}{1.0}{Poor man's box drawing characters}% @@ -274,9 +279,9 @@ [\entrysep] \entry{soulutf8}{2007/09/09}{1.0}{Adding support for UTF-8 to soul}% [\entrysep] -\entry{stackrel}{2007/05/06}{1.1}{Adding subscript option to stackrel}% +\entry{stackrel}{2007/11/11}{1.2}{Adding subscript option to stackrel}% [\entrysep] -\entry{stringenc}{2007/10/22}{1.3}{Converts strings between encodings}% +\entry{stringenc}{2007/11/11}{1.4}{Converts strings between encodings}% [\entrysep] \entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}% [\entrysep] @@ -827,6 +832,16 @@ by setting the PDF page attribute \texttt{/Rotate}. \tocinclude{pdflscape} \newpage +\subsection{\pkgsectformat{pdftexcmds}} +\label{pdftexcmds} +\begin{abstract} +\LuaTeX\ provides most of the commands of \pdfTeX\ 1.40. However +a number of utility functions are removed. This package tries to fill +the gap and implements some of the missing primitive using Lua. +\end{abstract} +\tocinclude{pdftexcmds} + +\newpage \subsection{\pkgsectformat{picture}} \label{picture} \begin{abstract} diff --git a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx index 8a150b9832e..7e54817c113 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files pagesel.sty, pagesel.pdf, pagesel.ins, pagesel.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pagesel.ins}{\from{pagesel.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* pagesel.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pagesel.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{pagesel.drv}% [2007/04/12 v1.7 Selecting shipout output pages (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pagesel.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx index d69476b87fd..8075613a722 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx @@ -76,6 +76,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files pdfcol-test1.tex, pdfcol-test2.tex, pdfcol-test3.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcol.ins}{\from{pdfcol.dtx}{install}}% @@ -120,6 +122,10 @@ and the derived files \Msg{*} \Msg{* pdfcol.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcol.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -137,14 +143,14 @@ and the derived files \ProvidesFile{pdfcol.drv}% [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcol.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{499} +% \CheckSum{589} % % \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 @@ -288,6 +294,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -304,6 +313,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -312,6 +322,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -333,10 +345,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname PDFCOL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname PDFCOL@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\PDFCOL@AtEnd{% \PDFCOL@AtEnd @@ -653,7 +677,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -662,7 +718,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -670,7 +726,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx index ac48a468900..7d7f332b472 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files pdfcolfoot-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcolfoot.ins}{\from{pdfcolfoot.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* pdfcolfoot.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcolfoot.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{pdfcolfoot.drv}% [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcolfoot.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx index ebead70a6e9..a952ccdbcd8 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files pdfcolmk.sty, pdfcolmk.pdf, pdfcolmk.ins, pdfcolmk.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcolmk.ins}{\from{pdfcolmk.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* pdfcolmk.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcolmk.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{pdfcolmk.drv}% [2007/04/11 v1.1 PDFtex COLor MarK (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcolmk.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx index 0d8218248df..cf9201e3292 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files pdfcolparallel-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcolparallel.ins}{\from{pdfcolparallel.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* pdfcolparallel.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcolparallel.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{pdfcolparallel.drv}% [2007/09/09 v1.0 Color stacks support for parallel (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcolparallel.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx index adba2682e21..0bd3a895643 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files pdfcolparcolumns-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcolparcolumns.ins}{\from{pdfcolparcolumns.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* pdfcolparcolumns.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcolparcolumns.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{pdfcolparcolumns.drv}% [2007/09/09 v1.1 Color stacks support for parcolumns (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcolparcolumns.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx index 79eb8647984..f870907ef94 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files pdfcrypt.sty, pdfcrypt.pdf, pdfcrypt.ins, pdfcrypt.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfcrypt.ins}{\from{pdfcrypt.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* pdfcrypt.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfcrypt.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{pdfcrypt.drv}% [2007/04/26 v1.0 Setting pdf encryption (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfcrypt.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx index 73a528de4bb..7e44032655b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx @@ -18,7 +18,8 @@ % and the derived files % pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, % pdfescape-test1.tex, pdfescape-test2.tex, -% pdfescape-test3.tex, pdfescape-test4.tex. +% pdfescape-test3.tex, pdfescape-test4.tex, +% pdfescape-test5.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/pdfescape.dtx @@ -57,6 +58,7 @@ % TDS:doc/latex/oberdiek/test/pdfescape-test2.tex % TDS:doc/latex/oberdiek/test/pdfescape-test3.tex % TDS:doc/latex/oberdiek/test/pdfescape-test4.tex +% TDS:doc/latex/oberdiek/test/pdfescape-test5.tex % TDS:source/latex/oberdiek/pdfescape.dtx % %<*ignore> @@ -72,12 +74,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfescape 2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)} +\Msg{* Package: pdfescape 2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,9 +103,11 @@ This work consists of the main source file pdfescape.dtx and the derived files pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, pdfescape-test1.tex, pdfescape-test2.tex, - pdfescape-test3.tex, pdfescape-test4.tex. + pdfescape-test3.tex, pdfescape-test4.tex, + pdfescape-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfescape.ins}{\from{pdfescape.dtx}{install}}% @@ -114,6 +119,7 @@ and the derived files \file{pdfescape-test2.tex}{\from{pdfescape.dtx}{test2}}% \file{pdfescape-test3.tex}{\from{pdfescape.dtx}{test3}}% \file{pdfescape-test4.tex}{\from{pdfescape.dtx}{test4}}% + \file{pdfescape-test5.tex}{\from{pdfescape.dtx}{test5}}% } \obeyspaces @@ -124,6 +130,10 @@ and the derived files \Msg{*} \Msg{* pdfescape.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfescape.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -139,16 +149,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfescape.drv}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)]% + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfescape.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1890} +% \CheckSum{1979} % % \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 @@ -169,7 +179,7 @@ and the derived files % \GetFileInfo{pdfescape.drv} % % \title{The \xpackage{pdfescape} package} -% \date{2007/10/27 v1.7} +% \date{2007/11/11 v1.8} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -267,6 +277,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -283,6 +296,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -291,6 +305,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -306,7 +322,7 @@ and the derived files \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)] + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -329,6 +345,7 @@ and the derived files \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - \TMP@EnsureCode\catcode{46}{12}% . +\TMP@EnsureCode\catcode{47}{12}% / \TMP@EnsureCode\catcode{60}{12}% < \TMP@EnsureCode\catcode{61}{12}% = \TMP@EnsureCode\catcode{62}{12}% > @@ -744,7 +761,16 @@ and the derived files % % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +% \end{macrocode} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax % \end{macrocode} % % \begin{macro}{\EdefEscapeHex} @@ -804,28 +830,28 @@ and the derived files % \begin{macro}{\EdefEscapeHex} % \begin{macrocode} \long\def\EdefEscapeHex#1#2{% - \PE@edefbabel#1\pdfescapehex{#2}% + \PE@edefbabel#1\pdf@escapehex{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefUnescapeHex} % \begin{macrocode} \def\EdefUnescapeHex#1#2{% - \PE@edefbabel#1\pdfunescapehex{#2}% + \PE@edefbabel#1\pdf@unescapehex{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefEscapeName} % \begin{macrocode} \long\def\EdefEscapeName#1#2{% - \PE@edefbabel#1\pdfescapename{#2}% + \PE@edefbabel#1\pdf@escapename{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefEscapeString} % \begin{macrocode} \long\def\EdefEscapeString#1#2{% - \PE@edefbabel#1\pdfescapestring{#2}% + \PE@edefbabel#1\pdf@escapestring{#2}% }% % \end{macrocode} % \end{macro} @@ -1183,7 +1209,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1192,7 +1250,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1200,7 +1258,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -1232,7 +1290,7 @@ and the derived files % \subsection{Macro tests} % % \begin{macrocode} -%<*test2|test3|test4> +%<*test2|test3|test4|test5> \NeedsTeXFormat{LaTeX2e} \makeatletter % \end{macrocode} @@ -1241,8 +1299,8 @@ and the derived files % % \begin{macrocode} %<*test2> -\ProvidesFile{pdfescape-test1.tex}% - [2007/10/27 v1.7 Test with \string\pdfescape... commands]% +\ProvidesFile{pdfescape-test2.tex}% + [2007/11/11 v1.8 Test with \string\pdfescape... commands]% %</test2> % \end{macrocode} % @@ -1250,8 +1308,8 @@ and the derived files % % \begin{macrocode} %<*test3> -\ProvidesFile{pdfescape-test2.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape..., with e-TeX]% +\ProvidesFile{pdfescape-test3.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape..., with e-TeX]% %</test3> % \end{macrocode} % @@ -1259,11 +1317,20 @@ and the derived files % % \begin{macrocode} %<*test4> -\ProvidesFile{pdfescape-test3.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape... and e-TeX]% +\ProvidesFile{pdfescape-test4.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape... and e-TeX]% %</test4> % \end{macrocode} % +% \subsection{Test with \LuaTeX} +% +% \begin{macrocode} +%<*test5> +\ProvidesFile{pdfescape-test5.tex}% + [2007/11/11 v1.8 Test with LuaTeX]% +%</test5> +% \end{macrocode} +% % \subsection{Check/ensure test preconditions} % % \subsubsection{Check \cs{pdfescape...}} @@ -1271,7 +1338,7 @@ and the derived files % \begin{macrocode} %<*test2> \@ifundefined{pdfescapehex}{% - \PackageError{pdfescape-test1}{% + \PackageError{pdfescape-test2}{% Missing \string\pdfescape... commands% }{Test aborted.}% \stop @@ -1292,7 +1359,7 @@ and the derived files % \begin{macrocode} %<*test3> \@ifundefined{numexpr}{% - \PackageError{pdfescape-test2}{% + \PackageError{pdfescape-test3}{% Missing \eTeX }{Test aborted.}% \stop @@ -1302,6 +1369,19 @@ and the derived files % Package \xpackage{qstest} uses \eTeX, thus \eTeX's features % can only be disabled later during loading of package \xpackage{pdfescape}. % +% \subsubsection{Check \LuaTeX} +% +% \begin{macrocode} +%<*test5> +\@ifundefined{directlua}{% + \PackageError{pdfescape-test5}{% + Missing LuaTeX% + }{Test aborted.}% + \stop +}{} +%</test5> +% \end{macrocode} +% % \subsection{Common part} % % The files for testing uses the framework, provided by the @@ -1666,7 +1746,7 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -%</test2|test3|test4> +%</test2|test3|test4|test5> % \end{macrocode} % % \section{Installation} @@ -1734,6 +1814,7 @@ and the derived files % test/pdfescape-test2.tex & doc/latex/oberdiek/test/pdfescape-test2.tex\\ % test/pdfescape-test3.tex & doc/latex/oberdiek/test/pdfescape-test3.tex\\ % test/pdfescape-test4.tex & doc/latex/oberdiek/test/pdfescape-test4.tex\\ +% test/pdfescape-test5.tex & doc/latex/oberdiek/test/pdfescape-test5.tex\\ % pdfescape.dtx & source/latex/oberdiek/pdfescape.dtx\\ % \end{tabular}^^A % }^^A @@ -1901,6 +1982,10 @@ and the derived files % \item % More efficient \cs{EdefSanitize}. % \end{Version} +% \begin{Version}{2007/11/11 v1.8} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx index df1dfd2abf3..86b6ea77bbb 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx @@ -85,6 +85,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -113,6 +114,7 @@ and the derived files pdflscape-test6.txt, ExtractRotate.java. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdflscape.ins}{\from{pdflscape.dtx}{install}}% @@ -140,6 +142,10 @@ and the derived files \Msg{*} \Msg{* pdflscape.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdflscape.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -157,7 +163,7 @@ and the derived files \ProvidesFile{pdflscape.drv}% [2007/10/21 v0.9 Landscape pages in PDF (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{graphics} \begin{document} \DocInput{pdflscape.dtx}% diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx new file mode 100644 index 00000000000..fef4d00deaa --- /dev/null +++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx @@ -0,0 +1,1318 @@ +% \iffalse meta-comment +% +% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3 of this license or (at your option) any later +% version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of +% LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% This Current Maintainer of this work is Heiko Oberdiek. +% +% This work consists of the main source file pdftexcmds.dtx +% and the derived files +% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv. +% +% Distribution: +% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.dtx +% CTAN:macros/latex/contrib/oberdiek/pdftexcmds.pdf +% +% Unpacking: +% (a) If pdftexcmds.ins is present: +% tex pdftexcmds.ins +% (b) Without pdftexcmds.ins: +% tex pdftexcmds.dtx +% (c) If you insist on using LaTeX +% latex \let\install=y\input{pdftexcmds.dtx} +% (quote the arguments according to the demands of your shell) +% +% Documentation: +% (a) If pdftexcmds.drv is present: +% latex pdftexcmds.drv +% (b) Without pdftexcmds.drv: +% latex pdftexcmds.dtx; ... +% The class ltxdoc loads the configuration file ltxdoc.cfg +% if available. Here you can specify further options, e.g. +% use A4 as paper format: +% \PassOptionsToClass{a4paper}{article} +% +% Programm calls to get the documentation (example): +% pdflatex pdftexcmds.dtx +% makeindex -s gind.ist pdftexcmds.idx +% pdflatex pdftexcmds.dtx +% makeindex -s gind.ist pdftexcmds.idx +% pdflatex pdftexcmds.dtx +% +% Installation: +% TDS:tex/generic/oberdiek/pdftexcmds.sty +% TDS:doc/latex/oberdiek/pdftexcmds.pdf +% TDS:source/latex/oberdiek/pdftexcmds.dtx +% +%<*ignore> +\begingroup + \def\x{LaTeX2e}% +\expandafter\endgroup +\ifcase 0\ifx\install y1\fi\expandafter + \ifx\csname processbatchFile\endcsname\relax\else1\fi + \ifx\fmtname\x\else 1\fi\relax +\else\csname fi\endcsname +%</ignore> +%<*install> +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation} +\Msg{* Package: pdftexcmds 2007/11/12 v0.2 LuaTeX support for pdfTeX utility functions (HO)} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\let\MetaPrefix\relax +\preamble + +This is a generated file. + +Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3 of this license or (at your option) any later +version. The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +This Current Maintainer of this work is Heiko Oberdiek. + +This work consists of the main source file pdftexcmds.dtx +and the derived files + pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv. + +\endpreamble +\let\MetaPrefix\DoubleperCent + +\generate{% + \file{pdftexcmds.ins}{\from{pdftexcmds.dtx}{install}}% + \file{pdftexcmds.drv}{\from{pdftexcmds.dtx}{driver}}% + \usedir{tex/generic/oberdiek}% + \file{pdftexcmds.sty}{\from{pdftexcmds.dtx}{package}}% +} + +\obeyspaces +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* pdftexcmds.sty} +\Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} +\Msg{* To produce the documentation run the file `pdftexcmds.drv'} +\Msg{* through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +%</install> +%<*ignore> +\fi +%</ignore> +%<*driver> +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{pdftexcmds.drv}% + [2007/11/12 v0.2 LuaTeX support for pdfTeX utility functions (HO)]% +\documentclass{ltxdoc} +\usepackage{holtxdoc}[2007/11/11] +\usepackage{paralist} +\begin{document} + \DocInput{pdftexcmds.dtx}% +\end{document} +%</driver> +% \fi +% +% \CheckSum{561} +% +% \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 +% Lower-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 +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \GetFileInfo{pdftexcmds.drv} +% +% \title{The \xpackage{pdftexcmds} package} +% \date{2007/11/12 v0.2} +% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} +% +% \maketitle +% +% \begin{abstract} +% \LuaTeX\ provides most of the commands of \pdfTeX\ 1.40. However +% a number of utility functions are removed. This package tries to fill +% the gap and implements some of the missing primitive using Lua. +% \end{abstract} +% +% \tableofcontents +% +% \section{Documentation} +% +% Some primitives of \pdfTeX\ are not defined by \LuaTeX. +% This package implements macro based solutions using Lua code +% for the following missing \pdfTeX\ primitives; +% \begin{compactitem} +% \item \cs{pdfstrcmp} +% \item \cs{pdfunescapehex} +% \item \cs{pdfescapehex} +% \item \cs{pdfescapename} +% \item \cs{pdfescapestring} +% \item \cs{pdffilesize} +% \item \cs{pdffilemoddate} +% \item \cs{pdffiledump} +% \item \cs{pdfmdfivesum} +% \item |\immediate\write18| +% \end{compactitem} +% The original names of the primitives cannot be used: +% \begin{itemize} +% \item +% The syntax for their arguments cannot easily +% simulated by macros. The primitives using key words +% such as |file| (\cs{pdfmdfivesum}) or |offset| and |length| +% (\cs{pdffiledump}) and uses \meta{general text} for the other +% arguments. Using token registers assignments, \meta{general text} could +% be catched. However, the simulated primitives are expandable +% and register assignments would destroy this important property. +% (\meta{general text} allows something like |\expandafter\bgroup ...}|.) +% \item +% The original primitives can be expanded using one expansion step. +% The new macros need two expansion steps because of the additional +% macro expansion. Example: +% \begin{quote} +% |\expandafter\foo\pdffilemoddate{file}|\\ +% vs. +% |\expandafter\expandafter\expandafter\foo\pdf@filemoddate{file}|. +% \end{quote} +% \end{itemize} +% +% \LuaTeX\ isn't stable yet and thus the status of this package is +% \emph{experimental}. Feedback is welcome. +% +% \subsection{General principles} +% +% \begin{description} +% \item[Naming convention:] +% Usually this package defines a macro |\pdf@|\meta{cmd} if +% \pdfTeX\ provides |\pdf|\meta{cmd}. +% \item[Arguments:] The order of arguments in |\pdf@|\meta{cmd} +% is the same as for the corresponding primitive of \pdfTeX. +% The arguments are ordinary undelimited \TeX\ arguments, +% no \meta{general text} and without additional keywords. +% \item[Expandibility:] +% The macro |\pdf@|\meta{cmd} is expandable if the +% corresponding \pdfTeX\ primitive has this property. +% Exact two expansion steps are necessary (first is the macro +% expansion). +% \item[Without \LuaTeX:] +% The macros |\pdf@|\meta{cmd} are mapped to the commands +% of \pdfTeX\ if they are available. Otherwise they are undefined. +% \end{description} +% +% \subsection{Macros} +% +% \begin{declcs}{pdf@strcmp} \M{stringA} \M{stringB} +% \end{declcs} +% Same as |\pdfstrcmp{|\meta{stringA}|}{|\meta{stringB}|}|. +% +% \begin{declcs}{pdf@unescapehex} \M{string} +% \end{declcs} +% Same as |\pdfunescapehex{|\meta{string}|}|. +% The argument is a byte string given in hexadecimal notation. +% The result are character tokens from 0 until 255 with +% catcode 12 and the space with catcode 10. +% +% \begin{declcs}{pdf@escapehex} \M{string}\\ +% \cs{pdf@escapestring} \M{string}\\ +% \cs{pdf@escapename} \M{string} +% \end{declcs} +% Same as the primitives of \pdfTeX. However \pdfTeX\ does not +% know about characters with codes 256 and larger. Thus the +% string is treated as byte string, characters with more than +% eight bits are ignored. +% +% \begin{declcs}{pdf@filesize} \M{filename} +% \end{declcs} +% Same as |\pdffilesize{|\meta{filename}|}|. +% +% \begin{declcs}{pdf@filemoddate} \M{filename} +% \end{declcs} +% Same as |\pdffilemoddate{|\meta{filename}|}|. +% +% \begin{declcs}{pdf@filedump} \M{offset} \M{length} \M{filename} +% \end{declcs} +% Same as |\pdffiledump offset| \meta{offset} |length| \meta{length} +% |{|\meta{filename}|}|. Both \meta{offset} and \meta{length} must +% not be empty, but must be a valid \TeX\ number. +% +% \begin{declcs}{pdf@mdfivesum} \M{string} +% \end{declcs} +% Same as |\pdfmdfivesum{|\meta{string}|}|. Keyword |file| is supported +% by macro \cs{pdf@filemdfivesum}. +% +% \begin{declcs}{pdf@filemdfivesum} \M{filename} +% \end{declcs} +% Same as |\pdfmdfivesum file{|\meta{filename}|}|. +% +% \begin{declcs}{pdf@shellescape} +% \end{declcs} +% Same as |\pdfshellescape|. It expands to |1| if external +% commands can be executed and |0| otherwise. In \pdfTeX\ external +% commands must be enabled first by command line option or +% configuration option. In \LuaTeX\ option |--safer| disables +% the execution of external commands. +% +% \begin{declcs}{pdf@system} \M{cmdline} +% \end{declcs} +% It is a wrapper for |\immediate\write18| in \pdfTeX\ or +% |os.execute| in \LuaTeX. +% +% In theory |os.execute| +% returns a status number. But its meaning is quite +% undefined. Are there some reliable properties? +% Does it make sense to provide an user interface to +% this status exit code? +% +% \subsubsection{Experimental} +% +% \begin{declcs}{pdf@unescapehexnative} \M{string}\\ +% \cs{pdf@escapehexnative} \M{string}\\ +% \cs{pdf@escapenamenative} \M{string}\\ +% \cs{pdf@mdfivesumnative} \M{string} +% \end{declcs} +% The variants without |native| in the macro name are supposed to +% be compatible with \pdfTeX. However characters with more than +% eight bits are not supported and are ignored. If \LuaTeX\ is +% running, then its UTF-8 coded strings are used. Thus the full +% unicode character range is supported. However the result +% differs from \pdfTeX\ for characters with eight or more bits. +% +% \begin{declcs}{pdf@pipe} \M{cmdline} +% \end{declcs} +% It calls \meta{cmdline} and returns the output of the external +% program in the usual manner as byte string (catcode 12, space with +% catcode 10). The Lua documentation says, that the used |io.popen| +% may not be available on all platforms. Then macro \cs{pdf@pipe} +% is undefined. +% +% \StopEventually{ +% } +% +% \section{Implementation} +% +% \begin{macrocode} +%<*package> +% \end{macrocode} +% +% \subsection{Reload check and package identification} +% Reload check, especially if the package is not used with \LaTeX. +% \begin{macrocode} +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname + \ifcase 0% + \ifx\x\relax % plain + \else + \ifx\x\empty % LaTeX + \else + 1% + \fi + \fi + \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pdftexcmds}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +% \end{macrocode} +% Package identification: +% \begin{macrocode} +\begingroup + \catcode35 6 % # + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode47 12 % / + \catcode58 12 % : + \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pdftexcmds.sty\endcsname +\ProvidesPackage{pdftexcmds}% + [2007/11/12 v0.2 LuaTeX support for pdfTeX utility functions (HO)] +% \end{macrocode} +% +% \subsection{Catcodes} +% +% \begin{macrocode} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname pdftexcmds@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\pdftexcmds@AtEnd{% + \pdftexcmds@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{95}{12}% _ (other) +\TMP@EnsureCode{126}{12}% ~ (other) +% \end{macrocode} +% +% \subsection{Load package \xpackage{infwarerr}} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax +\else + \RequirePackage{infwarerr}[2007/09/09]% +\fi +% \end{macrocode} +% +% \subsection{Without \LuaTeX} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname directlua\endcsname\relax + \@PackageInfo{pdftexcmds}{LuaTeX not detected}% + \def\pdftexcmds@nopdftex{% + \@PackageInfoNoLine{pdftexcmds}{pdfTeX >= 1.30 not detected}% + \let\pdftexcmds@nopdftex\relax + }% + \def\pdftexcmds@temp#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf#1\endcsname\relax + \pdftexcmds@nopdftex + \else + \expandafter\def\csname pdf@#1\expandafter\endcsname + \expandafter##\expandafter{% + \csname pdf#1\endcsname + }% + \fi + }% + \pdftexcmds@temp{strcmp}% + \pdftexcmds@temp{escapehex}% + \let\pdf@escapehexnative\pdf@escapehex + \pdftexcmds@temp{unescapehex}% + \let\pdf@unescapehexnative\pdf@unescapehex + \pdftexcmds@temp{escapestring}% + \pdftexcmds@temp{escapename}% + \pdftexcmds@temp{filesize}% + \pdftexcmds@temp{filemoddate}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfshellescape\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@shellescape{% + \pdfshellescape + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdffiledump\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@filedump#1#2#3{% + \pdffiledump offset#1 length#2{#3}% + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfmdfivesum\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@mdfivesum#{\pdfmdfivesum}% + \let\pdf@mdfivesumnative\pdf@mdfivesum + \def\pdf@filemdfivesum#{\pdfmdfivesum file}% + \fi + \def\pdf@system#{% + \immediate\write18% + }% + \pdftexcmds@AtEnd + \expandafter\endinput +\fi +% \end{macrocode} +% +% \subsection{Lua functions} +% +% \begin{macro}{\pdftexcmds@luastate} +% \begin{macrocode} +\chardef\pdftexcmds@luastate=0 % +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pdftexcmds@toks} +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newtoks\endcsname\relax + \toksdef\pdftexcmds@toks=0 % +\else + \csname newtoks\endcsname\pdftexcmds@toks +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\begingroup + \escapechar=92 % + \edef\\{\string\\}% + \catcode35=12 % # + \catcode37=12\relax + \directlua\pdftexcmds@luastate{ + pdftexcmds = {} + function pdftexcmds.strcmp(A, B) + if A == B then + tex.write("0") + elseif A < B then + tex.write("-1") + else + tex.write("1") + end + end + function pdftexcmds.utf8_to_byte(str) + local i = 0 + local n = string.len(str) + local t = {} + while i < n do + i = i + 1 + local a = string.byte(str, i) + if a < 128 then + table.insert(t, string.char(a)) + else + if a >= 192 and i < n then + i = i + 1 + local b = string.byte(str, i) + if b < 128 or b >= 192 then + i = i - 1 + elseif a == 194 then + table.insert(t, string.char(b)) + elseif a == 195 then + table.insert(t, string.char(b + 64)) + end + end + end + end + return table.concat(t) + end + function pdftexcmds.escapehex(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + return string.format("%02X", string.byte(ch)) + end + ))) + end +% \end{macrocode} +% See procedure |unescapehex| in file \xfile{utils.c} of \pdfTeX. +% Caution: |tex.write| ignores leading spaces. +% \begin{macrocode} + function pdftexcmds.unescapehex(str, mode) + local a = 0 + local first = true + local result = {} + for i = 1, string.len(str), 1 do + local ch = string.byte(str, i) + if ch >= 48 and ch <= 57 then + ch = ch - 48 + elseif ch >= 65 and ch <= 70 then + ch = ch - 55 + elseif ch >= 97 and ch <= 102 then + ch = ch - 87 + else + ch = nil + end + if ch then + if first then + a = ch * 16 + first = false + else + table.insert(result, a + ch) + first = true + end + end + end + if not first then + table.insert(result, a) + end + if mode == "byte" then + local utf8 = {} + for i, a in ipairs(result) do + if a < 128 then + table.insert(utf8, a) + else + if a < 192 then + table.insert(utf8, 194) + a = a - 128 + else + table.insert(utf8, 195) + a = a - 192 + end + table.insert(utf8, a + 128) + end + end + result = utf8 + end + tex.settoks(pdftexcmds.toks, string.char(unpack(result))) + end +% \end{macrocode} +% See procedure |escapestring| in file \xfile{utils.c} of \pdfTeX. +% \begin{macrocode} + function pdftexcmds.escapestring(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b < 33 or b > 126 then + return string.format("\\%.3o", b) + end + if b == 40 or b == 41 or b == 92 then + return "\\" .. ch + end +% \end{macrocode} +% Lua 5.1 returns the match in case of return value |nil|. +% \begin{macrocode} + return nil + end + ))) + end +% \end{macrocode} +% See procedure |escapename| in file \xfile{utils.c} of \pdfTeX. +% \begin{macrocode} + function pdftexcmds.escapename(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b == 0 then +% \end{macrocode} +% In Lua 5.0 |nil| could be used for the empty string, +% But |nil| returns the match in Lua 5.1, thus we use +% the empty string explicitly. +% \begin{macrocode} + return "" + end + if b <= 32 or b >= 127 + or b == 35 or b == 37 or b == 40 or b == 41 + or b == 47 or b == 60 or b == 62 or b == 91 + or b == 93 or b == 123 or b == 125 then + return string.format("#%.2X", b) + else +% \end{macrocode} +% Lua 5.1 returns the match in case of return value |nil|. +% \begin{macrocode} + return nil + end + end + ))) + end + function pdftexcmds.filesize(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local size = lfs.attributes(foundfile, "size") + if size then + tex.write(size) + end + end + end +% \end{macrocode} +% See procedure |makepdftime| in file \xfile{utils.c} of \pdfTeX. +% \begin{macrocode} + function pdftexcmds.filemoddate(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local date = lfs.attributes(foundfile, "modification") + if date then + local d = os.date("*t", date) + if d.sec >= 60 then + d.sec = 59 + end + local u = os.date("!*t", date) + local off = 60 * (d.hour - u.hour) + d.min - u.min + if d.year ~= u.year then + if d.year > u.year then + off = off + 1440 + else + off = off - 1440 + end + elseif d.yday ~= u.yday then + if d.yday > u.yday then + off = off + 1440 + else + off = off - 1440 + end + end + local timezone + if off == 0 then + timezone = "Z" + else + local hours = math.floor(off / 60) + local mins = math.abs(off - hours * 60) + timezone = string.format("%+03d'%02d'", hours, mins) + end + tex.write(string.format("D:%04d%02d%02d%02d%02d%02d%s", + d.year, d.month, d.day, d.hour, d.min, d.sec, timezone)) + end + end + end + function pdftexcmds.filedump(offset, length, filename) + length = tonumber(length) + if length and length > 0 then + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + offset = tonumber(offset) + if not offset then + offset = 0 + end + local filehandle = io.open(foundfile, "r") + if filehandle then + if offset > 0 then + filehandle:seek("set", offset) + end + local dump = filehandle:read(length) + pdftexcmds.escapehex(dump) + end + end + end + end + function pdftexcmds.mdfivesum(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + pdftexcmds.escapehex(md5.sum(str)) + end + function pdftexcmds.filemdfivesum(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local filehandle = io.open(foundfile, "r") + if filehandle then + local contents = filehandle:read("*a") + pdftexcmds.escapehex(md5.sum(contents)) + end + end + end + function pdftexcmds.shellescape() + if os.execute then + tex.write("1") + else + tex.write("0") + end + end + function pdftexcmds.system(cmdline) + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "system(" .. cmdline .. ") ") + if os.execute then + texio.write("log", "executed.") + pdftexcmds.systemexitstatus = os.execute(cmdline) + else + texio.write("log", "disabled.") + end + end + function pdftexcmds.lastsystemstatus() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + local x = math.floor(result / 256) + tex.write(result - 256 * math.floor(result / 256)) + end + end + function pdftexcmds.lastsystemexit() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + tex.write(math.floor(result / 256)) + end + end + function pdftexcmds.pipe(cmdline) + local result + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "pipe(" .. cmdline ..") ") + if io.popen then + texio.write("log", "executed.") + local handle = io.popen(cmdline, "r") + if handle then + result = handle:read("*a") + handle:close() + end + else + texio.write("log", "disabled.") + end + if result then + tex.settoks(pdftexcmds.toks, result) + else + tex.settoks(pdftexcmds.toks, "") + end + end + } +\endgroup +% \end{macrocode} +% +% \begin{macro}{\pdf@strcmp} +% \begin{macrocode} +\long\def\pdf@strcmp#1#2{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.strcmp("\luaescapestring{#1}",% + "\luaescapestring{#2}")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@escapehex} +% \begin{macrocode} +\long\def\pdf@escapehex#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}", "byte")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@escapehexnative} +% \begin{macrocode} +\long\def\pdf@escapehexnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@unescapehex} +% \begin{macrocode} +\def\pdf@unescapehex#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}", "byte")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@unescapehexnative} +% \begin{macrocode} +\def\pdf@unescapehexnative#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@escapestring} +% \begin{macrocode} +\long\def\pdf@escapestring#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapestring("\luaescapestring{#1}", "byte")% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@escapename} +% \begin{macrocode} +\long\def\pdf@escapename#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}", "byte")% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@escapenamenative} +% \begin{macrocode} +\long\def\pdf@escapenamenative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}")% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@filesize} +% \begin{macrocode} +\def\pdf@filesize#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filesize("\luaescapestring{#1}")% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@filemoddate} +% \begin{macrocode} +\def\pdf@filemoddate#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemoddate("\luaescapestring{#1}")% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@filedump} +% \begin{macrocode} +\def\pdf@filedump#1#2#3{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filedump("\luaescapestring{\number#1}",% + "\luaescapestring{\number#2}",% + "\luaescapestring{#3}")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@mdfivesum} +% \begin{macrocode} +\long\def\pdf@mdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}", "byte")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@mdfivesumnative} +% \begin{macrocode} +\long\def\pdf@mdfivesumnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}")% + }% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@filemdfivesum} +% \begin{macrocode} +\def\pdf@filemdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemdfivesum("\luaescapestring{#1}")% + }% +}% +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pdf@shellescape} +% \begin{macrocode} +\def\pdf@shellescape{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.shellescape()% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pdf@system} +% \begin{macrocode} +\def\pdf@system#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.system("\luaescapestring{#1}")% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pdf@lastsystemstatus} +% \begin{macrocode} +\def\pdf@lastsystemstatus{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemstatus()% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\pdf@lastsystemexit} +% \begin{macrocode} +\def\pdf@lastsystemexit{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemexit()% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pdf@pipe} +% Check availability of |io.popen| first. +% \begin{macrocode} +\ifnum0% + \directlua\pdftexcmds@luastate{% + if io.popen then % + tex.write("1")% + end% + }% + =1 % + \def\pdf@pipe#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.pipe("\luaescapestring{#1}")% + }% + }% +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\pdftexcmds@AtEnd +%</package> +% \end{macrocode} +% +% \section{Test} +% +% \subsection{Catcode checks for loading} +% +% \begin{macrocode} +%<*test1> +% \end{macrocode} +% \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % +\catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% +\def\RestoreCatcodes{} +\count@=0 % +\loop + \edef\RestoreCatcodes{% + \RestoreCatcodes + \catcode\the\count@=\the\catcode\count@\relax + }% +\ifnum\count@<255 % + \advance\count@ 1 % +\repeat + +\def\RangeCatcodeInvalid#1#2{% + \count@=#1\relax + \loop + \catcode\count@=15 % + \ifnum\count@<#2\relax + \advance\count@ 1 % + \repeat +} +\def\Test{% + \RangeCatcodeInvalid{0}{47}% + \RangeCatcodeInvalid{58}{64}% + \RangeCatcodeInvalid{91}{96}% + \RangeCatcodeInvalid{123}{255}% + \catcode`\@=12 % + \catcode`\\=0 % + \catcode`\{=1 % + \catcode`\}=2 % + \catcode`\#=6 % + \catcode`\[=12 % + \catcode`\]=12 % + \catcode`\%=14 % + \catcode`\ =10 % + \catcode13=5 % + \input pdftexcmds.sty\relax + \RestoreCatcodes +} +\Test +\csname @@end\endcsname +\end +% \end{macrocode} +% \begin{macrocode} +%</test1> +% \end{macrocode} +% +% \section{Installation} +% +% \subsection{Download} +% +% \paragraph{Package.} This package is available on +% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}: +% \begin{description} +% \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.dtx}] The source file. +% \item[\CTAN{macros/latex/contrib/oberdiek/pdftexcmds.pdf}] Documentation. +% \end{description} +% +% +% \paragraph{Bundle.} All the packages of the bundle `oberdiek' +% are also available in a TDS compliant ZIP archive. There +% the packages are already unpacked and the documentation files +% are generated. The files and directories obey the TDS standard. +% \begin{description} +% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}] +% \end{description} +% \emph{TDS} refers to the standard ``A Directory Structure +% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories +% with \xfile{texmf} in their name are usually organized this way. +% +% \subsection{Bundle installation} +% +% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the +% TDS tree (also known as \xfile{texmf} tree) of your choice. +% Example (linux): +% \begin{quote} +% |unzip oberdiek-tds.zip -d ~/texmf| +% \end{quote} +% +% \paragraph{Script installation.} +% Check the directory \xfile{TDS:scripts/oberdiek/} for +% scripts that need further installation steps. +% Package \xpackage{attachfile2} comes with the Perl script +% \xfile{pdfatfi.pl} that should be installed in such a way +% that it can be called as \texttt{pdfatfi}. +% Example (linux): +% \begin{quote} +% |chmod +x scripts/oberdiek/pdfatfi.pl|\\ +% |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/| +% \end{quote} +% +% \subsection{Package installation} +% +% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting +% \docstrip\ archive. The files are extracted by running the +% \xfile{.dtx} through \plainTeX: +% \begin{quote} +% \verb|tex pdftexcmds.dtx| +% \end{quote} +% +% \paragraph{TDS.} Now the different files must be moved into +% the different directories in your installation TDS tree +% (also known as \xfile{texmf} tree): +% \begin{quote} +% \def\t{^^A +% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} +% pdftexcmds.sty & tex/generic/oberdiek/pdftexcmds.sty\\ +% pdftexcmds.pdf & doc/latex/oberdiek/pdftexcmds.pdf\\ +% pdftexcmds.dtx & source/latex/oberdiek/pdftexcmds.dtx\\ +% \end{tabular}^^A +% }^^A +% \sbox0{\t}^^A +% \ifdim\wd0>\linewidth +% \begingroup +% \advance\linewidth by\leftmargin +% \advance\linewidth by\rightmargin +% \edef\x{\endgroup +% \def\noexpand\lw{\the\linewidth}^^A +% }\x +% \def\lwbox{^^A +% \leavevmode +% \hbox to \linewidth{^^A +% \kern-\leftmargin\relax +% \hss +% \usebox0 +% \hss +% \kern-\rightmargin\relax +% }^^A +% }^^A +% \ifdim\wd0>\lw +% \sbox0{\small\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\footnotesize\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\scriptsize\t}^^A +% \ifdim\wd0>\linewidth +% \ifdim\wd0>\lw +% \sbox0{\tiny\t}^^A +% \ifdim\wd0>\linewidth +% \lwbox +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \else +% \lwbox +% \fi +% \else +% \usebox0 +% \fi +% \end{quote} +% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's +% TDS installing feature, then some files can already be in the right +% place, see the documentation of \docstrip. +% +% \subsection{Refresh file name databases} +% +% If your \TeX~distribution +% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh +% these. For example, \teTeX\ users run \verb|texhash| or +% \verb|mktexlsr|. +% +% \subsection{Some details for the interested} +% +% \paragraph{Attached source.} +% +% The PDF documentation on CTAN also includes the +% \xfile{.dtx} source file. It can be extracted by +% AcrobatReader 6 or higher. Another option is \textsf{pdftk}, +% e.g. unpack the file into the current directory: +% \begin{quote} +% \verb|pdftk pdftexcmds.pdf unpack_files output .| +% \end{quote} +% +% \paragraph{Unpacking with \LaTeX.} +% The \xfile{.dtx} chooses its action depending on the format: +% \begin{description} +% \item[\plainTeX:] Run \docstrip\ and extract the files. +% \item[\LaTeX:] Generate the documentation. +% \end{description} +% If you insist on using \LaTeX\ for \docstrip\ (really, +% \docstrip\ does not need \LaTeX), then inform the autodetect routine +% about your intention: +% \begin{quote} +% \verb|latex \let\install=y\input{pdftexcmds.dtx}| +% \end{quote} +% Do not forget to quote the argument according to the demands +% of your shell. +% +% \paragraph{Generating the documentation.} +% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate +% the documentation. The process can be configured by the +% configuration file \xfile{ltxdoc.cfg}. For instance, put this +% line into this file, if you want to have A4 as paper format: +% \begin{quote} +% \verb|\PassOptionsToClass{a4paper}{article}| +% \end{quote} +% An example follows how to generate the +% documentation with pdf\LaTeX: +% \begin{quote} +%\begin{verbatim} +%pdflatex pdftexcmds.dtx +%makeindex -s gind.ist pdftexcmds.idx +%pdflatex pdftexcmds.dtx +%makeindex -s gind.ist pdftexcmds.idx +%pdflatex pdftexcmds.dtx +%\end{verbatim} +% \end{quote} +% +% \begin{History} +% \begin{Version}{2007/11/11 v0.1} +% \item +% First version. +% \end{Version} +% \begin{Version}{2007/11/12 v0.2} +% \item +% Short description fixed. +% \end{Version} +% \end{History} +% +% \PrintIndex +% +% \Finale +\endinput diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx index 0f08e628798..05e97b3b438 100644 --- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files picture-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{picture.ins}{\from{picture.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* picture.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `picture.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{picture.drv}% [2007/04/11 v1.1 Dimens for picture macros (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{picture.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx index 61724bfb5a8..59325eee2d7 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files pmboxdrawenc.dfu. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pmboxdraw.ins}{\from{pmboxdraw.dtx}{install}}% @@ -115,6 +117,10 @@ and the derived files \Msg{*} \Msg{* pmboxdraw.sty, pmboxdrawenc.dfu} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pmboxdraw.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -132,7 +138,7 @@ and the derived files \ProvidesFile{pmboxdraw.drv}% [2006/05/03 v1.0 Poor man's box drawing characters (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{color} \usepackage{pmboxdraw} \usepackage{longtable} diff --git a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx index 48a03af9956..1a437473f3a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx @@ -73,6 +73,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -97,6 +98,7 @@ and the derived files refcount.sty, refcount.pdf, refcount.ins, refcount.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{refcount.ins}{\from{refcount.dtx}{install}}% @@ -113,6 +115,10 @@ and the derived files \Msg{*} \Msg{* refcount.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `refcount.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -130,7 +136,7 @@ and the derived files \ProvidesFile{refcount.drv}% [2006/02/20 v3.0 Data extraction from references (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{refcount.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx index ab7cfcc13b6..86257414d27 100644 --- a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx @@ -79,6 +79,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -104,6 +105,7 @@ and the derived files selinput-test4.tex, selinput-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{selinput.ins}{\from{selinput.dtx}{install}}% @@ -126,6 +128,10 @@ and the derived files \Msg{*} \Msg{* selinput.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `selinput.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -143,7 +149,7 @@ and the derived files \ProvidesFile{selinput.drv}% [2007/09/09 v1.2 Select input encoding (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage[T1]{fontenc} \usepackage{textcomp} \usepackage{lmodern} diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx index c2d4316d91b..8ad65cec1fe 100644 --- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx @@ -78,6 +78,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -104,6 +105,7 @@ and the derived files setouterhbox-test2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{setouterhbox.ins}{\from{setouterhbox.dtx}{install}}% @@ -125,6 +127,10 @@ and the derived files \Msg{*} \Msg{* setouterhbox.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `setouterhbox.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -142,14 +148,14 @@ and the derived files \ProvidesFile{setouterhbox.drv}% [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{setouterhbox.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{461} +% \CheckSum{551} % % \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 @@ -369,6 +375,9 @@ by/a/very_long_long_long_path.html}% \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -385,6 +394,7 @@ by/a/very_long_long_long_path.html}% % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -393,6 +403,8 @@ by/a/very_long_long_long_path.html}% \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -412,10 +424,22 @@ by/a/very_long_long_long_path.html}% % \end{macrocode} % % \begin{macrocode} -\expandafter\edef\csname setouterhboxAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname setouterhboxAtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\setouterhboxAtEnd{% \setouterhboxAtEnd @@ -726,7 +750,39 @@ E \egroup %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -735,7 +791,7 @@ E \egroup \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -743,7 +799,7 @@ E \egroup \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx index c9cf4d226e8..158d69672e6 100644 --- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files settobox-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{settobox.ins}{\from{settobox.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* settobox.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `settobox.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,7 +141,7 @@ and the derived files \ProvidesFile{settobox.drv}% [2007/04/11 v1.3 Getting box sizes (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{calc} \usepackage{settobox} \begin{document} @@ -249,6 +255,7 @@ and the derived files % % \begin{macrocode} %<*example> +%<<END \documentclass{article} \usepackage{settobox} @@ -261,18 +268,18 @@ and the derived files \setlength{\parskip}{10pt} \pagestyle{empty} - % \test{#1} - % The macro is called with commands in #1 that manipulates - % the box \mybox. These commands along with the result of - % the manipulation is shown. Thus the essence of the - % macro is: - % - % a) \sbox{\mybox}{The cracy fox.} - % b) #1 % manipulates \mybox - % c) Print #1 commands. - % d) Print box with frame - % - % The implemenation looks more weird: +% \test{#1} +% The macro is called with commands in #1 that manipulates +% the box \mybox. These commands along with the result of +% the manipulation is shown. Thus the essence of the +% macro is: +% +% a) \sbox{\mybox}{The cracy fox.} +% b) #1 % manipulates \mybox +% c) Print #1 commands. +% d) Print box with frame +% +% The implemenation looks more weird: \makeatletter \newcommand*{\test}[1]{% \par @@ -320,6 +327,7 @@ and the derived files } \end{document} +%END %</example> % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx index c55e366e27d..5df48d67b60 100644 --- a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx @@ -79,6 +79,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -104,6 +105,7 @@ and the derived files soulutf8-test4.tex, soulutf8-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{soulutf8.ins}{\from{soulutf8.dtx}{install}}% @@ -126,6 +128,10 @@ and the derived files \Msg{*} \Msg{* soulutf8.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `soulutf8.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -143,14 +149,14 @@ and the derived files \ProvidesFile{soulutf8.drv}% [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{soulutf8.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1821} +% \CheckSum{1911} % % \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 @@ -267,6 +273,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -283,6 +292,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -291,6 +301,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -312,10 +324,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname SOuL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname SOuL@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\SOuL@AtEnd{% \SOuL@AtEnd @@ -1064,7 +1088,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1073,7 +1129,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1081,7 +1137,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx index e6a0943d07c..89760c5933d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx @@ -66,12 +66,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: stackrel 2007/05/06 v1.1 Adding subscript option to stackrel (HO)} +\Msg{* Package: stackrel 2007/11/11 v1.2 Adding subscript option to stackrel (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files stackrel.sty, stackrel.pdf, stackrel.ins, stackrel.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{stackrel.ins}{\from{stackrel.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* stackrel.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `stackrel.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -126,9 +132,9 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{stackrel.drv}% - [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]% + [2007/11/11 v1.2 Adding subscript option to stackrel (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{amsmath} \usepackage{stackrel} \begin{document} @@ -137,7 +143,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{89} +% \CheckSum{90} % % \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 @@ -158,7 +164,7 @@ and the derived files % \GetFileInfo{stackrel.drv} % % \title{The \xpackage{stackrel} package} -% \date{2007/05/06 v1.1} +% \date{2007/11/11 v1.2} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -205,7 +211,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{stackrel} - [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]% + [2007/11/11 v1.2 Adding subscript option to stackrel (HO)]% % \end{macrocode} % % Given the original definition of \cs{stackrel} the addition @@ -220,10 +226,11 @@ and the derived files % define macros with arguments). % \begin{macro}{\stack@relbin} % \begin{macrocode} -\RequirePackage{etexcmds} +\RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded + \RequirePackage{pdftexcmds}[2007/11/11]% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \expandafter\ifx\csname pdf@strcmp\endcsname\relax \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits \edef\reserved@a{\etex@unexpanded{#1}}% @@ -235,8 +242,8 @@ and the derived files \else \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits - \ifcase\pdfstrcmp{\detokenize{#1}}{}\else_{#1}\fi - \ifcase\pdfstrcmp{\detokenize{#2}}{}\else^{#2}\fi + \ifcase\pdf@strcmp{\detokenize{#1}}{}\else_{#1}\fi + \ifcase\pdf@strcmp{\detokenize{#2}}{}\else^{#2}\fi \egroup }% \fi @@ -463,6 +470,10 @@ and the derived files % \item % Uses package \xpackage{etexcmds}. % \end{Version} +% \begin{Version}{2007/11/11 v1.2} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx index fb8ea6bca77..b3b8ae8fe2e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx @@ -119,12 +119,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: stringenc 2007/10/22 v1.3 Converts strings between encodings (HO)} +\Msg{* Package: stringenc 2007/11/11 v1.4 Converts strings between encodings (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -161,6 +162,7 @@ and the derived files stringenc-test2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{stringenc.ins}{\from{stringenc.dtx}{install}}% @@ -229,6 +231,10 @@ and the derived files \Msg{* se-cp855.def, se-cp858.def, se-cp865.def, se-cp866.def,} \Msg{* se-cp1250.def, se-cp1251.def, se-cp1257.def} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `stringenc.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -244,9 +250,9 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{stringenc.drv}% - [2007/10/22 v1.3 Converts strings between encodings (HO)]% + [2007/11/11 v1.4 Converts strings between encodings (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage{longtable} \begin{document} \DocInput{stringenc.dtx}% @@ -254,7 +260,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{5894} +% \CheckSum{5902} % % \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 @@ -275,7 +281,7 @@ and the derived files % \GetFileInfo{stringenc.drv} % % \title{The \xpackage{stringenc} package} -% \date{2007/10/22 v1.3} +% \date{2007/11/11 v1.4} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -428,6 +434,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -444,6 +453,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -452,6 +462,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -467,7 +479,7 @@ and the derived files \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2007/10/22 v1.3 Converts strings between encodings (HO)] + [2007/11/11 v1.4 Converts strings between encodings (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -805,8 +817,9 @@ and the derived files % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\SE@InputIfFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -820,7 +833,7 @@ and the derived files }% \else \def\SE@InputIfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \SE@FileNotFound{#1}% \else \SE@Input{#1}% @@ -1418,8 +1431,8 @@ $ \fi % % \begin{macrocode} %<*utf32> -%<utf32be>\ProvidesFile{se-utf32be.def}[2007/10/22 v1.3 stringenc: UTF-32BE] -%<utf32le>\ProvidesFile{se-utf32le.def}[2007/10/22 v1.3 stringenc: UTF-32LE] +%<utf32be>\ProvidesFile{se-utf32be.def}[2007/11/11 v1.4 stringenc: UTF-32BE] +%<utf32le>\ProvidesFile{se-utf32le.def}[2007/11/11 v1.4 stringenc: UTF-32LE] % \end{macrocode} % % \begin{macrocode} @@ -1577,7 +1590,7 @@ $ \fi % % \begin{macrocode} %<*utf8> -\ProvidesFile{se-utf8.def}[2007/10/22 v1.3 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2007/11/11 v1.4 stringenc: UTF-8] % \end{macrocode} % % \noindent @@ -1917,7 +1930,7 @@ $ \fi % % \begin{macrocode} %<*utf16le> -\ProvidesFile{se-utf16le.def}[2007/10/22 v1.3 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2007/11/11 v1.4 stringenc: UTF-16LE] % \end{macrocode} % % \begin{macrocode} @@ -1957,7 +1970,7 @@ $ \fi % % \begin{macrocode} %<*pdfdoc> -\ProvidesFile{se-pdfdoc.def}[2007/10/22 v1.3 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2007/11/11 v1.4 stringenc: PDFDocEncoding] % \end{macrocode} % % Pass ranges 32..126 and 160..255 through and use @@ -2088,7 +2101,7 @@ $ \fi % % \begin{macrocode} %<*iso-8859-1> -\ProvidesFile{se-iso-8859-1.def}[2007/10/22 v1.3 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2007/11/11 v1.4 stringenc: ISO-8859-1] % \end{macrocode} % % Excluded area: 0x80..0x9F @@ -2158,7 +2171,7 @@ $ \fi % % \begin{macrocode} %<*cp1252> -\ProvidesFile{se-cp1252.def}[2007/10/22 v1.3 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2007/11/11 v1.4 stringenc: cp1252] % \end{macrocode} % % \begin{macrocode} @@ -2259,7 +2272,7 @@ $ \fi % % \begin{macrocode} %<*ascii> -\ProvidesFile{se-ascii.def}[2007/10/22 v1.3 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2007/11/11 v1.4 stringenc: US-ASCII] % \end{macrocode} % % \begin{macrocode} @@ -2308,123 +2321,123 @@ $ \fi % % \begin{macrocode} %<*iso-8859-2> -\ProvidesFile{se-iso-8859-2.def}[2007/10/22 v1.3 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2007/11/11 v1.4 stringenc: ISO-8859-2] \def\SE@this{iso-8859-2} %</iso-8859-2> %<*iso-8859-3> -\ProvidesFile{se-iso-8859-3.def}[2007/10/22 v1.3 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2007/11/11 v1.4 stringenc: ISO-8859-3] \def\SE@this{iso-8859-3} %</iso-8859-3> %<*iso-8859-4> -\ProvidesFile{se-iso-8859-4.def}[2007/10/22 v1.3 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2007/11/11 v1.4 stringenc: ISO-8859-4] \def\SE@this{iso-8859-4} %</iso-8859-4> %<*iso-8859-5> -\ProvidesFile{se-iso-8859-5.def}[2007/10/22 v1.3 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2007/11/11 v1.4 stringenc: ISO-8859-5] \def\SE@this{iso-8859-5} %</iso-8859-5> %<*iso-8859-6> -\ProvidesFile{se-iso-8859-6.def}[2007/10/22 v1.3 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2007/11/11 v1.4 stringenc: ISO-8859-6] \def\SE@this{iso-8859-6} %</iso-8859-6> %<*iso-8859-7> -\ProvidesFile{se-iso-8859-7.def}[2007/10/22 v1.3 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2007/11/11 v1.4 stringenc: ISO-8859-7] \def\SE@this{iso-8859-7} %</iso-8859-7> %<*iso-8859-8> -\ProvidesFile{se-iso-8859-8.def}[2007/10/22 v1.3 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2007/11/11 v1.4 stringenc: ISO-8859-8] \def\SE@this{iso-8859-8} %</iso-8859-8> %<*iso-8859-9> -\ProvidesFile{se-iso-8859-9.def}[2007/10/22 v1.3 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2007/11/11 v1.4 stringenc: ISO-8859-9] \def\SE@this{iso-8859-9} %</iso-8859-9> %<*iso-8859-10> -\ProvidesFile{se-iso-8859-10.def}[2007/10/22 v1.3 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2007/11/11 v1.4 stringenc: ISO-8859-10] \def\SE@this{iso-8859-10} %</iso-8859-10> %<*iso-8859-11> -\ProvidesFile{se-iso-8859-11.def}[2007/10/22 v1.3 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2007/11/11 v1.4 stringenc: ISO-8859-11] \def\SE@this{iso-8859-11} %</iso-8859-11> %<*iso-8859-13> -\ProvidesFile{se-iso-8859-13.def}[2007/10/22 v1.3 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2007/11/11 v1.4 stringenc: ISO-8859-13] \def\SE@this{iso-8859-13} %</iso-8859-13> %<*iso-8859-14> -\ProvidesFile{se-iso-8859-14.def}[2007/10/22 v1.3 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2007/11/11 v1.4 stringenc: ISO-8859-14] \def\SE@this{iso-8859-14} %</iso-8859-14> %<*iso-8859-15> -\ProvidesFile{se-iso-8859-15.def}[2007/10/22 v1.3 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2007/11/11 v1.4 stringenc: ISO-8859-15] \def\SE@this{iso-8859-15} %</iso-8859-15> %<*iso-8859-16> -\ProvidesFile{se-iso-8859-16.def}[2007/10/22 v1.3 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2007/11/11 v1.4 stringenc: ISO-8859-16] \def\SE@this{iso-8859-16} %</iso-8859-16> %<*koi8-r> -\ProvidesFile{se-koi8-r.def}[2007/10/22 v1.3 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2007/11/11 v1.4 stringenc: KOI8-R] \def\SE@this{koi8-r} %</koi8-r> %<*nextstep> -\ProvidesFile{se-nextstep.def}[2007/10/22 v1.3 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2007/11/11 v1.4 stringenc: NextStep] \def\SE@this{nextstep} %</nextstep> %<*mac-centeuro> -\ProvidesFile{se-mac-centeuro.def}[2007/10/22 v1.3 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2007/11/11 v1.4 stringenc: Mac OS Central European] \def\SE@this{mac-centeuro} %</mac-centeuro> %<*mac-cyrillic> -\ProvidesFile{se-mac-cyrillic.def}[2007/10/22 v1.3 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2007/11/11 v1.4 stringenc: Mac OS Cyrillic] \def\SE@this{mac-cyrillic} %</mac-cyrillic> %<*mac-roman> -\ProvidesFile{se-mac-roman.def}[2007/10/22 v1.3 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2007/11/11 v1.4 stringenc: Mac OS Roman] \def\SE@this{mac-roman} %</mac-roman> %<*dec-mcs> -\ProvidesFile{se-dec-mcs.def}[2007/10/22 v1.3 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2007/11/11 v1.4 stringenc: DEC-MCS] \def\SE@this{dec-mcs} %</dec-mcs> %<*cp437> -\ProvidesFile{se-cp437.def}[2007/10/22 v1.3 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2007/11/11 v1.4 stringenc: cp437] \def\SE@this{cp437} %</cp437> %<*cp850> -\ProvidesFile{se-cp850.def}[2007/10/22 v1.3 stringenc: cp850] +\ProvidesFile{se-cp850.def}[2007/11/11 v1.4 stringenc: cp850] \def\SE@this{cp850} %</cp850> %<*cp852> -\ProvidesFile{se-cp852.def}[2007/10/22 v1.3 stringenc: cp852] +\ProvidesFile{se-cp852.def}[2007/11/11 v1.4 stringenc: cp852] \def\SE@this{cp852} %</cp852> %<*cp855> -\ProvidesFile{se-cp855.def}[2007/10/22 v1.3 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2007/11/11 v1.4 stringenc: cp855] \def\SE@this{cp855} %</cp855> %<*cp858> -\ProvidesFile{se-cp858.def}[2007/10/22 v1.3 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2007/11/11 v1.4 stringenc: cp858] \def\SE@this{cp858} %</cp858> %<*cp865> -\ProvidesFile{se-cp865.def}[2007/10/22 v1.3 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2007/11/11 v1.4 stringenc: cp865] \def\SE@this{cp865} %</cp865> %<*cp866> -\ProvidesFile{se-cp866.def}[2007/10/22 v1.3 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2007/11/11 v1.4 stringenc: cp866] \def\SE@this{cp866} %</cp866> %<*cp1250> -\ProvidesFile{se-cp1250.def}[2007/10/22 v1.3 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2007/11/11 v1.4 stringenc: cp1250] \def\SE@this{cp1250} %</cp1250> %<*cp1251> -\ProvidesFile{se-cp1251.def}[2007/10/22 v1.3 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2007/11/11 v1.4 stringenc: cp1251] \def\SE@this{cp1251} %</cp1251> %<*cp1257> -\ProvidesFile{se-cp1257.def}[2007/10/22 v1.3 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2007/11/11 v1.4 stringenc: cp1257] \def\SE@this{cp1257} %</cp1257> % \end{macrocode} @@ -5912,7 +5925,7 @@ $ \fi \catcode`\%=14 % \catcode`\ =10 % \catcode13=5 % - \usepackage{stringenc}[2007/10/22]% + \usepackage{stringenc}[2007/11/11]% \RestoreCatcodes } \Test @@ -5963,7 +5976,7 @@ $ \fi \let\SavedNumexpr\numexpr \let\numexpr\relax \fi -\usepackage{stringenc}[2007/10/22] +\usepackage{stringenc}[2007/11/11] \ifx\plainmode Y \let\numexpr\SavedNumexpr \fi @@ -6569,6 +6582,10 @@ $ \fi % \item % Safer encoding file loading by ensuring all used catcodes. % \end{Version} +% \begin{Version}{2007/11/11 v1.4} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx index 3dcdd52f5b5..03dcbf51d57 100644 --- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx @@ -76,6 +76,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -101,6 +102,7 @@ and the derived files tabularht-example1.tex, tabularht-example2.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{tabularht.ins}{\from{tabularht.dtx}{install}}% @@ -120,6 +122,10 @@ and the derived files \Msg{*} \Msg{* tabularht.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `tabularht.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -137,7 +143,7 @@ and the derived files \ProvidesFile{tabularht.drv}% [2007/04/11 v2.5 Tabular with height specification (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{tabularht.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx index d555412de81..7737b493dbf 100644 --- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files tabularkv-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{tabularkv.ins}{\from{tabularkv.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* tabularkv.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `tabularkv.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{tabularkv.drv}% [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{tabularkv.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx index b6d8ea642d4..3c2bdf0c2bd 100644 --- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx @@ -75,6 +75,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,6 +101,7 @@ and the derived files telprint-test1.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{telprint.ins}{\from{telprint.dtx}{install}}% @@ -118,6 +120,10 @@ and the derived files \Msg{*} \Msg{* telprint.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `telprint.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -135,7 +141,7 @@ and the derived files \ProvidesFile{telprint.drv}% [2007/09/09 v1.9 Formatting of German phone numbers (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \usepackage[ngerman,english]{babel} \begin{document} \DocInput{telprint.dtx}% @@ -143,7 +149,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{422} +% \CheckSum{512} % % \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 @@ -330,6 +336,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -346,6 +355,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -354,6 +364,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -375,10 +387,22 @@ and the derived files % \subsection{Catcodes} % % \begin{macrocode} -\expandafter\edef\csname TELAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname TELAtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\TELAtEnd{% \TELAtEnd @@ -566,7 +590,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -575,7 +631,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -583,7 +639,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% diff --git a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx index 9e063029efa..e675ec1255d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx @@ -74,6 +74,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -98,6 +99,7 @@ and the derived files transparent-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{transparent.ins}{\from{transparent.dtx}{install}}% @@ -116,6 +118,10 @@ and the derived files \Msg{*} \Msg{* transparent.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `transparent.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -133,7 +139,7 @@ and the derived files \ProvidesFile{transparent.drv}% [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{transparent.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx index f242bf8f3dc..7555874c538 100644 --- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx @@ -72,6 +72,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -95,6 +96,7 @@ and the derived files twoopt.sty, twoopt.pdf, twoopt.ins, twoopt.drv. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{twoopt.ins}{\from{twoopt.dtx}{install}}% @@ -111,6 +113,10 @@ and the derived files \Msg{*} \Msg{* twoopt.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `twoopt.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -128,7 +134,7 @@ and the derived files \ProvidesFile{twoopt.drv}% [2006/02/20 v1.4 Definitions with two optional arguments (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{twoopt.dtx}% \end{document} diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index a91ef3dcf88..22047722a98 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -90,6 +90,7 @@ \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -118,6 +119,7 @@ and the derived files zref-example.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{zref.ins}{\from{zref.dtx}{install}}% @@ -151,6 +153,10 @@ and the derived files \Msg{* zref-perpage.sty, zref-savepos.sty, zref-titleref.sty,} \Msg{* zref-totpages.sty, zref-user.sty, zref-xr.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `zref.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -168,7 +174,7 @@ and the derived files \ProvidesFile{zref.drv}% [2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{zref.dtx}% \end{document} diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index e40fda0fc14..e75b5796f3d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@alphalph.sty\endcsname \ProvidesPackage{alphalph}% [2007/09/09 v2.0 Converting numbers to letters (HO)] -\expandafter\edef\csname AlPh@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AlPh@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AlPh@AtEnd{% \AlPh@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 3ff4abf7d23..22323890b13 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% [2007/09/09 v1.6 At begin shipout hook (HO)] -\expandafter\edef\csname AtBegShi@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AtBegShi@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AtBegShi@AtEnd{% \AtBegShi@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty index 664b8e46a12..16927659a5c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bigintcalc.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@bigintcalc.sty\endcsname \ProvidesPackage{bigintcalc}% - [2007/09/27 v1.0 Expandable big integer calculations (HO)] -\expandafter\edef\csname BIC@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.1 Expandable big integer calculations (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BIC@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\BIC@AtEnd{% \BIC@AtEnd @@ -100,6 +118,7 @@ \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{43}{12}% + \TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . \TMP@EnsureCode{47}{12}% / \TMP@EnsureCode{58}{11}% : (letter!) \TMP@EnsureCode{60}{12}% < @@ -128,7 +147,13 @@ }% \x{ } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \def\BIC@Expand#1{% \romannumeral0% \BIC@@Expand#1!\@nil{}% @@ -160,8 +185,10 @@ \fi \else \def\BIC@Expand#1{% - \pdfunescapehex{% - \expandafter\BIC@StripHexSpace\pdfescapehex{#1}20\@nil + \romannumeral0\expandafter\expandafter\expandafter\BIC@Space + \pdf@unescapehex{% + \expandafter\expandafter\expandafter + \BIC@StripHexSpace\pdf@escapehex{#1}20\@nil }% }% \def\BIC@StripHexSpace#120#2\@nil{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty index 4536394a322..8acfd4d4bb8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/bitset.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/bitset.sty @@ -43,6 +43,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@bitset.sty\endcsname \ProvidesPackage{bitset}% [2007/09/28 v1.0 Data type bit set (HO)] -\expandafter\edef\csname BitSet@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname BitSet@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\BitSet@AtEnd{% \BitSet@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index 20b21707ce4..4ee5e898fd6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2007/09/09 v1.1 Catches the contents of a file (HO)] -\expandafter\edef\csname CatchFile@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.2 Catches the contents of a file (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname CatchFile@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\CatchFile@AtEnd{% \CatchFile@AtEnd @@ -145,8 +163,9 @@ \endgroup \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\CatchFile@CheckFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -161,7 +180,8 @@ }% \else \def\CatchFile@CheckFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\expandafter\expandafter\ifx + \expandafter\expandafter\expandafter\relax\pdf@filesize{#1}\relax \let\CatchFile@File\relax \else \def\CatchFile@File{#1}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty index 334a7c4bc17..0063472ef1b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@engord.sty\endcsname \ProvidesPackage{engord}% [2007/09/20 v1.6 Provides English ordinal numbers (HO)] -\expandafter\edef\csname EO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname EO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\EO@AtEnd{% \EO@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty index 1d0c163fa55..0389fbc2ccb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/etexcmds.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@etexcmds.sty\endcsname \ProvidesPackage{etexcmds}% [2007/09/09 v1.1 Prefix for e-TeX command names (HO)] -\expandafter\edef\csname etexcmds@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname etexcmds@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\etexcmds@AtEnd{% \etexcmds@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index 3823e4329ea..91519efa6f8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/09/09 v1.4 Language checks (HO)] -\expandafter\edef\csname IfLang@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.5 Language checks (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname IfLang@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\IfLang@AtEnd{% \IfLang@AtEnd @@ -141,8 +159,10 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input pdftexcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{pdftexcmds}[2007/11/11]% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname uselanguage\endcsname\relax @@ -199,7 +219,7 @@ \fi } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfstrcmp\endcsname\relax +\expandafter\ifx\csname pdf@strcmp\endcsname\relax \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -249,7 +269,7 @@ }{% \def\IfLanguageName#1{% \ifnum\IfLang@IfDefined{languagename}{% - \pdfstrcmp{#1}{\languagename}% + \pdf@strcmp{#1}{\languagename}% }{1}=0 % \expandafter\@firstoftwo \else diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index e8fc6a89aa6..0631342265c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@ifpdf.sty\endcsname \ProvidesPackage{ifpdf}% [2007/09/09 v1.5 Provides the ifpdf switch (HO)] -\expandafter\edef\csname ifpdf@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifpdf@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ifpdf@AtEnd{% \ifpdf@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index 08cfc14c54a..a883c678e14 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@ifvtex.sty\endcsname \ProvidesPackage{ifvtex}% [2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO)] -\expandafter\edef\csname ifvtex@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ifvtex@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ifvtex@AtEnd{% \ifvtex@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty index 7458694f251..43ff35f4409 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@infwarerr.sty\endcsname \ProvidesPackage{infwarerr}% [2007/09/09 v1.2 Providing info/warning/message (HO)] -\expandafter\edef\csname InfWarErr@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InfWarErr@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\InfWarErr@AtEnd{% \InfWarErr@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty index 8e1e5d1e860..ce7154b6d26 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/intcalc.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@intcalc.sty\endcsname \ProvidesPackage{intcalc}% [2007/09/27 v1.1 Expandable integer calculations (HO)] -\expandafter\edef\csname InCa@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname InCa@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\InCa@AtEnd{% \InCa@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index a6b3ae92413..46278fdfc6a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@kvsetkeys.sty\endcsname \ProvidesPackage{kvsetkeys}% [2007/09/29 v1.3 Key value parser with default handler support (HO)] -\expandafter\edef\csname KVS@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVS@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVS@AtEnd{% \KVS@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty index 22de5ac04b1..ef9e7c5fda6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcol.sty @@ -43,6 +43,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@pdfcol.sty\endcsname \ProvidesPackage{pdfcol}% [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)] -\expandafter\edef\csname PDFCOL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname PDFCOL@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\PDFCOL@AtEnd{% \PDFCOL@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index f4ffe6090aa..e897304c64e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -26,7 +26,8 @@ %% and the derived files %% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, %% pdfescape-test1.tex, pdfescape-test2.tex, -%% pdfescape-test3.tex, pdfescape-test4.tex. +%% pdfescape-test3.tex, pdfescape-test4.tex, +%% pdfescape-test5.tex. %% \begingroup \catcode44 12 % , @@ -44,6 +45,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +61,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +70,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,7 +87,7 @@ \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)] + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)] \expandafter\edef\csname PE@AtEnd\endcsname{% \catcode64 \the\catcode64\relax } @@ -98,6 +105,7 @@ \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - \TMP@EnsureCode\catcode{46}{12}% . +\TMP@EnsureCode\catcode{47}{12}% / \TMP@EnsureCode\catcode{60}{12}% < \TMP@EnsureCode\catcode{61}{12}% = \TMP@EnsureCode\catcode{62}{12}% > @@ -391,7 +399,13 @@ \PE@DeString } \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \long\def\EdefEscapeHex#1#2{% \EdefSanitize#1{#2}% \PE@SanitizeSpaceOther#1% @@ -420,16 +434,16 @@ \expandafter\def\expandafter#1\expandafter{#1}% }% \long\def\EdefEscapeHex#1#2{% - \PE@edefbabel#1\pdfescapehex{#2}% + \PE@edefbabel#1\pdf@escapehex{#2}% }% \def\EdefUnescapeHex#1#2{% - \PE@edefbabel#1\pdfunescapehex{#2}% + \PE@edefbabel#1\pdf@unescapehex{#2}% }% \long\def\EdefEscapeName#1#2{% - \PE@edefbabel#1\pdfescapename{#2}% + \PE@edefbabel#1\pdf@escapename{#2}% }% \long\def\EdefEscapeString#1#2{% - \PE@edefbabel#1\pdfescapestring{#2}% + \PE@edefbabel#1\pdf@escapestring{#2}% }% \PE@AtEnd \expandafter\endinput diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty new file mode 100644 index 00000000000..f9a16b5bc2e --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -0,0 +1,584 @@ +%% +%% This is file `pdftexcmds.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdftexcmds.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% This work consists of the main source file pdftexcmds.dtx +%% and the derived files +%% pdftexcmds.sty, pdftexcmds.pdf, pdftexcmds.ins, pdftexcmds.drv. +%% +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@pdftexcmds.sty\endcsname + \ifcase 0% + \ifx\x\relax % plain + \else + \ifx\x\empty % LaTeX + \else + 1% + \fi + \fi + \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pdftexcmds}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \catcode35 6 % # + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode47 12 % / + \catcode58 12 % : + \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@pdftexcmds.sty\endcsname +\ProvidesPackage{pdftexcmds}% + [2007/11/12 v0.2 LuaTeX support for pdfTeX utility functions (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname pdftexcmds@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\pdftexcmds@AtEnd{% + \pdftexcmds@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{34}{12}% " +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{95}{12}% _ (other) +\TMP@EnsureCode{126}{12}% ~ (other) +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax +\else + \RequirePackage{infwarerr}[2007/09/09]% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname directlua\endcsname\relax + \@PackageInfo{pdftexcmds}{LuaTeX not detected}% + \def\pdftexcmds@nopdftex{% + \@PackageInfoNoLine{pdftexcmds}{pdfTeX >= 1.30 not detected}% + \let\pdftexcmds@nopdftex\relax + }% + \def\pdftexcmds@temp#1{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdf#1\endcsname\relax + \pdftexcmds@nopdftex + \else + \expandafter\def\csname pdf@#1\expandafter\endcsname + \expandafter##\expandafter{% + \csname pdf#1\endcsname + }% + \fi + }% + \pdftexcmds@temp{strcmp}% + \pdftexcmds@temp{escapehex}% + \let\pdf@escapehexnative\pdf@escapehex + \pdftexcmds@temp{unescapehex}% + \let\pdf@unescapehexnative\pdf@unescapehex + \pdftexcmds@temp{escapestring}% + \pdftexcmds@temp{escapename}% + \pdftexcmds@temp{filesize}% + \pdftexcmds@temp{filemoddate}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfshellescape\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@shellescape{% + \pdfshellescape + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdffiledump\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@filedump#1#2#3{% + \pdffiledump offset#1 length#2{#3}% + }% + \fi + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfmdfivesum\endcsname\relax + \pdftexcmds@nopdftex + \else + \def\pdf@mdfivesum#{\pdfmdfivesum}% + \let\pdf@mdfivesumnative\pdf@mdfivesum + \def\pdf@filemdfivesum#{\pdfmdfivesum file}% + \fi + \def\pdf@system#{% + \immediate\write18% + }% + \pdftexcmds@AtEnd + \expandafter\endinput +\fi +\chardef\pdftexcmds@luastate=0 % +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname newtoks\endcsname\relax + \toksdef\pdftexcmds@toks=0 % +\else + \csname newtoks\endcsname\pdftexcmds@toks +\fi +\begingroup + \escapechar=92 % + \edef\\{\string\\}% + \catcode35=12 % # + \catcode37=12\relax + \directlua\pdftexcmds@luastate{ + pdftexcmds = {} + function pdftexcmds.strcmp(A, B) + if A == B then + tex.write("0") + elseif A < B then + tex.write("-1") + else + tex.write("1") + end + end + function pdftexcmds.utf8_to_byte(str) + local i = 0 + local n = string.len(str) + local t = {} + while i < n do + i = i + 1 + local a = string.byte(str, i) + if a < 128 then + table.insert(t, string.char(a)) + else + if a >= 192 and i < n then + i = i + 1 + local b = string.byte(str, i) + if b < 128 or b >= 192 then + i = i - 1 + elseif a == 194 then + table.insert(t, string.char(b)) + elseif a == 195 then + table.insert(t, string.char(b + 64)) + end + end + end + end + return table.concat(t) + end + function pdftexcmds.escapehex(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + return string.format("%02X", string.byte(ch)) + end + ))) + end + function pdftexcmds.unescapehex(str, mode) + local a = 0 + local first = true + local result = {} + for i = 1, string.len(str), 1 do + local ch = string.byte(str, i) + if ch >= 48 and ch <= 57 then + ch = ch - 48 + elseif ch >= 65 and ch <= 70 then + ch = ch - 55 + elseif ch >= 97 and ch <= 102 then + ch = ch - 87 + else + ch = nil + end + if ch then + if first then + a = ch * 16 + first = false + else + table.insert(result, a + ch) + first = true + end + end + end + if not first then + table.insert(result, a) + end + if mode == "byte" then + local utf8 = {} + for i, a in ipairs(result) do + if a < 128 then + table.insert(utf8, a) + else + if a < 192 then + table.insert(utf8, 194) + a = a - 128 + else + table.insert(utf8, 195) + a = a - 192 + end + table.insert(utf8, a + 128) + end + end + result = utf8 + end + tex.settoks(pdftexcmds.toks, string.char(unpack(result))) + end + function pdftexcmds.escapestring(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b < 33 or b > 126 then + return string.format("\\%.3o", b) + end + if b == 40 or b == 41 or b == 92 then + return "\\" .. ch + end + return nil + end + ))) + end + function pdftexcmds.escapename(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + tex.write((string.gsub(str, ".", + function (ch) + local b = string.byte(ch) + if b == 0 then + return "" + end + if b <= 32 or b >= 127 + or b == 35 or b == 37 or b == 40 or b == 41 + or b == 47 or b == 60 or b == 62 or b == 91 + or b == 93 or b == 123 or b == 125 then + return string.format("#%.2X", b) + else + return nil + end + end + ))) + end + function pdftexcmds.filesize(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local size = lfs.attributes(foundfile, "size") + if size then + tex.write(size) + end + end + end + function pdftexcmds.filemoddate(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local date = lfs.attributes(foundfile, "modification") + if date then + local d = os.date("*t", date) + if d.sec >= 60 then + d.sec = 59 + end + local u = os.date("!*t", date) + local off = 60 * (d.hour - u.hour) + d.min - u.min + if d.year ~= u.year then + if d.year > u.year then + off = off + 1440 + else + off = off - 1440 + end + elseif d.yday ~= u.yday then + if d.yday > u.yday then + off = off + 1440 + else + off = off - 1440 + end + end + local timezone + if off == 0 then + timezone = "Z" + else + local hours = math.floor(off / 60) + local mins = math.abs(off - hours * 60) + timezone = string.format("%+03d'%02d'", hours, mins) + end + tex.write(string.format("D:%04d%02d%02d%02d%02d%02d%s", + d.year, d.month, d.day, d.hour, d.min, d.sec, timezone)) + end + end + end + function pdftexcmds.filedump(offset, length, filename) + length = tonumber(length) + if length and length > 0 then + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + offset = tonumber(offset) + if not offset then + offset = 0 + end + local filehandle = io.open(foundfile, "r") + if filehandle then + if offset > 0 then + filehandle:seek("set", offset) + end + local dump = filehandle:read(length) + pdftexcmds.escapehex(dump) + end + end + end + end + function pdftexcmds.mdfivesum(str, mode) + if mode == "byte" then + str = pdftexcmds.utf8_to_byte(str) + end + pdftexcmds.escapehex(md5.sum(str)) + end + function pdftexcmds.filemdfivesum(filename) + local foundfile = kpse.find_file(filename, "tex", true) + if foundfile then + local filehandle = io.open(foundfile, "r") + if filehandle then + local contents = filehandle:read("*a") + pdftexcmds.escapehex(md5.sum(contents)) + end + end + end + function pdftexcmds.shellescape() + if os.execute then + tex.write("1") + else + tex.write("0") + end + end + function pdftexcmds.system(cmdline) + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "system(" .. cmdline .. ") ") + if os.execute then + texio.write("log", "executed.") + pdftexcmds.systemexitstatus = os.execute(cmdline) + else + texio.write("log", "disabled.") + end + end + function pdftexcmds.lastsystemstatus() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + local x = math.floor(result / 256) + tex.write(result - 256 * math.floor(result / 256)) + end + end + function pdftexcmds.lastsystemexit() + local result = tonumber(pdftexcmds.systemexitstatus) + if result then + tex.write(math.floor(result / 256)) + end + end + function pdftexcmds.pipe(cmdline) + local result + pdftexcmds.systemexitstatus = nil + texio.write_nl("log", "pipe(" .. cmdline ..") ") + if io.popen then + texio.write("log", "executed.") + local handle = io.popen(cmdline, "r") + if handle then + result = handle:read("*a") + handle:close() + end + else + texio.write("log", "disabled.") + end + if result then + tex.settoks(pdftexcmds.toks, result) + else + tex.settoks(pdftexcmds.toks, "") + end + end + } +\endgroup +\long\def\pdf@strcmp#1#2{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.strcmp("\luaescapestring{#1}",% + "\luaescapestring{#2}")% + }% +}% +\long\def\pdf@escapehex#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@escapehexnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapehex("\luaescapestring{#1}")% + }% +}% +\def\pdf@unescapehex#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}", "byte")% + }% +}% +\def\pdf@unescapehexnative#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.unescapehex("\luaescapestring{#1}")% + }% +}% +\long\def\pdf@escapestring#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapestring("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapename#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}", "byte")% + }% +} +\long\def\pdf@escapenamenative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.escapename("\luaescapestring{#1}")% + }% +} +\def\pdf@filesize#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filesize("\luaescapestring{#1}")% + }% +} +\def\pdf@filemoddate#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemoddate("\luaescapestring{#1}")% + }% +} +\def\pdf@filedump#1#2#3{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filedump("\luaescapestring{\number#1}",% + "\luaescapestring{\number#2}",% + "\luaescapestring{#3}")% + }% +}% +\long\def\pdf@mdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}", "byte")% + }% +}% +\long\def\pdf@mdfivesumnative#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.mdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@filemdfivesum#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.filemdfivesum("\luaescapestring{#1}")% + }% +}% +\def\pdf@shellescape{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.shellescape()% + }% +} +\def\pdf@system#1{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.system("\luaescapestring{#1}")% + }% +} +\def\pdf@lastsystemstatus{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemstatus()% + }% +} +\def\pdf@lastsystemexit{% + \directlua\pdftexcmds@luastate{% + pdftexcmds.lastsystemexit()% + }% +} +\ifnum0% + \directlua\pdftexcmds@luastate{% + if io.popen then % + tex.write("1")% + end% + }% + =1 % + \def\pdf@pipe#1{% + \the\expandafter\pdftexcmds@toks + \directlua\pdftexcmds@luastate{% + pdftexcmds.toks="pdftexcmds@toks"% + pdftexcmds.pipe("\luaescapestring{#1}")% + }% + }% +\fi +\pdftexcmds@AtEnd +\endinput +%% +%% End of file `pdftexcmds.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def index 6fe9f49c520..b34923a96a9 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-ascii.def}[2007/10/22 v1.3 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2007/11/11 v1.4 stringenc: US-ASCII] \expandafter\gdef\csname\SE@PrefixTo ascii\endcsname#1#2#3#4{% \ifnum"#1#2#3<8 % \SE@ResultAdd{#3#4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def index b54a3ff5ec3..004f7d1709f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1250.def}[2007/10/22 v1.3 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2007/11/11 v1.4 stringenc: cp1250] \def\SE@this{cp1250} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def index dfc70e3d945..6a9a5ddce0e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1251.def}[2007/10/22 v1.3 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2007/11/11 v1.4 stringenc: cp1251] \def\SE@this{cp1251} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def index bcd8af69776..32430be935e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1252.def}[2007/10/22 v1.3 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2007/11/11 v1.4 stringenc: cp1252] \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def index 848ce5a212e..71a35740f19 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1257.def}[2007/10/22 v1.3 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2007/11/11 v1.4 stringenc: cp1257] \def\SE@this{cp1257} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def index e71b0ce77a4..5ad15379866 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp437.def}[2007/10/22 v1.3 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2007/11/11 v1.4 stringenc: cp437] \def\SE@this{cp437} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def index 976c8188f9b..d0a33851607 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp850.def}[2007/10/22 v1.3 stringenc: cp850] +\ProvidesFile{se-cp850.def}[2007/11/11 v1.4 stringenc: cp850] \def\SE@this{cp850} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def index 860e12b0faf..474a5fef12c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp852.def}[2007/10/22 v1.3 stringenc: cp852] +\ProvidesFile{se-cp852.def}[2007/11/11 v1.4 stringenc: cp852] \def\SE@this{cp852} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def index ba6e972954e..033cff18b4d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp855.def}[2007/10/22 v1.3 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2007/11/11 v1.4 stringenc: cp855] \def\SE@this{cp855} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def index feeaecdbd47..7f8cb6b2237 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp858.def}[2007/10/22 v1.3 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2007/11/11 v1.4 stringenc: cp858] \def\SE@this{cp858} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def index 563c807b71a..90bd85576e6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp865.def}[2007/10/22 v1.3 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2007/11/11 v1.4 stringenc: cp865] \def\SE@this{cp865} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def index 2ae2a2c923a..7dbb3fe58a0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp866.def}[2007/10/22 v1.3 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2007/11/11 v1.4 stringenc: cp866] \def\SE@this{cp866} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def index db79bfe2e53..5d58100536b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-dec-mcs.def}[2007/10/22 v1.3 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2007/11/11 v1.4 stringenc: DEC-MCS] \def\SE@this{dec-mcs} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def index b25eefa571a..7285e3fb0d9 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-1.def}[2007/10/22 v1.3 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2007/11/11 v1.4 stringenc: ISO-8859-1] \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def index 3ed1c16a025..b8c22566a33 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-10.def}[2007/10/22 v1.3 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2007/11/11 v1.4 stringenc: ISO-8859-10] \def\SE@this{iso-8859-10} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def index cc807529d2d..9943219b431 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-11.def}[2007/10/22 v1.3 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2007/11/11 v1.4 stringenc: ISO-8859-11] \def\SE@this{iso-8859-11} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def index 9e9e7a8b4d6..f650e8ebddd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-13.def}[2007/10/22 v1.3 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2007/11/11 v1.4 stringenc: ISO-8859-13] \def\SE@this{iso-8859-13} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def index 517fa311d7e..c8d1215b86c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-14.def}[2007/10/22 v1.3 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2007/11/11 v1.4 stringenc: ISO-8859-14] \def\SE@this{iso-8859-14} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def index 949c276970f..3f51f9eb9f5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-15.def}[2007/10/22 v1.3 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2007/11/11 v1.4 stringenc: ISO-8859-15] \def\SE@this{iso-8859-15} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def index a4d781f8a71..2eeb96a35d0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-16.def}[2007/10/22 v1.3 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2007/11/11 v1.4 stringenc: ISO-8859-16] \def\SE@this{iso-8859-16} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def index 78dc10833f2..daf21912e92 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-2.def}[2007/10/22 v1.3 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2007/11/11 v1.4 stringenc: ISO-8859-2] \def\SE@this{iso-8859-2} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def index 1fdb0372d62..f6f2f6ef08f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-3.def}[2007/10/22 v1.3 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2007/11/11 v1.4 stringenc: ISO-8859-3] \def\SE@this{iso-8859-3} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def index e7fb67a64d0..3649f8b8116 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-4.def}[2007/10/22 v1.3 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2007/11/11 v1.4 stringenc: ISO-8859-4] \def\SE@this{iso-8859-4} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def index 59a0550bacb..21ea1febfe8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-5.def}[2007/10/22 v1.3 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2007/11/11 v1.4 stringenc: ISO-8859-5] \def\SE@this{iso-8859-5} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def index 0d77d513e1a..640e62cd50e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-6.def}[2007/10/22 v1.3 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2007/11/11 v1.4 stringenc: ISO-8859-6] \def\SE@this{iso-8859-6} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def index c4cae2337e7..1df21620e2e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-7.def}[2007/10/22 v1.3 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2007/11/11 v1.4 stringenc: ISO-8859-7] \def\SE@this{iso-8859-7} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def index 54ca4ad1753..6a6a322f771 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-8.def}[2007/10/22 v1.3 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2007/11/11 v1.4 stringenc: ISO-8859-8] \def\SE@this{iso-8859-8} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def index b3c85342a90..c0fabd170cd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-9.def}[2007/10/22 v1.3 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2007/11/11 v1.4 stringenc: ISO-8859-9] \def\SE@this{iso-8859-9} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def index 2e840b42010..68c68e0eb59 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-koi8-r.def}[2007/10/22 v1.3 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2007/11/11 v1.4 stringenc: KOI8-R] \def\SE@this{koi8-r} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def index dd998f6cc57..75940d74ebe 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-centeuro.def}[2007/10/22 v1.3 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2007/11/11 v1.4 stringenc: Mac OS Central European] \def\SE@this{mac-centeuro} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def index d2eb680f429..e02d138a99e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-cyrillic.def}[2007/10/22 v1.3 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2007/11/11 v1.4 stringenc: Mac OS Cyrillic] \def\SE@this{mac-cyrillic} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def index 9e7102f25d6..1a46d2cb3ec 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-roman.def}[2007/10/22 v1.3 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2007/11/11 v1.4 stringenc: Mac OS Roman] \def\SE@this{mac-roman} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def index b48938aad48..6373f8c5de5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-nextstep.def}[2007/10/22 v1.3 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2007/11/11 v1.4 stringenc: NextStep] \def\SE@this{nextstep} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def index 5be53592648..5249bb38349 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-pdfdoc.def}[2007/10/22 v1.3 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2007/11/11 v1.4 stringenc: PDFDocEncoding] \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2#3#4<256 % \ifnum"#1#2#3#4>160 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def index 41cf377f2a0..a57c759a7d0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf16le.def}[2007/10/22 v1.3 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2007/11/11 v1.4 stringenc: UTF-16LE] \expandafter\gdef\csname\SE@PrefixTo utf16le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#2}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def index 31f987c65c2..51dc5500b5b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32be.def}[2007/10/22 v1.3 stringenc: UTF-32BE] +\ProvidesFile{se-utf32be.def}[2007/11/11 v1.4 stringenc: UTF-32BE] \expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{% \SE@ResultAdd{0000#1#2#3#4}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def index 8323f09e622..4f2b26970ca 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32le.def}[2007/10/22 v1.3 stringenc: UTF-32LE] +\ProvidesFile{se-utf32le.def}[2007/11/11 v1.4 stringenc: UTF-32LE] \expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#20000}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def index c7bd217bf74..c3c1a6c3318 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf8.def}[2007/10/22 v1.3 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2007/11/11 v1.4 stringenc: UTF-8] \expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{% \ifnum"#1#2#3#4<"80 % \SE@ResultAdd{#3#4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index 99c3bc51b24..c74c8dff879 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty @@ -45,6 +45,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -58,6 +61,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -66,6 +70,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -82,10 +88,22 @@ \expandafter\x\csname ver@setouterhbox.sty\endcsname \ProvidesPackage{setouterhbox}% [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)] -\expandafter\edef\csname setouterhboxAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname setouterhboxAtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\setouterhboxAtEnd{% \setouterhboxAtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty index 8f0941c541d..835bb6c5ca7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/soulutf8.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@soulutf8.sty\endcsname \ProvidesPackage{soulutf8}% [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)] -\expandafter\edef\csname SOuL@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname SOuL@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\SOuL@AtEnd{% \SOuL@AtEnd diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index 8b034b61690..daf59076e33 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -55,6 +55,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -68,6 +71,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -76,6 +80,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -91,7 +97,7 @@ \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2007/10/22 v1.3 Converts strings between encodings (HO)] + [2007/11/11 v1.4 Converts strings between encodings (HO)] \expandafter\edef\csname SE@AtEnd\endcsname{% \catcode64 \the\catcode64\relax } @@ -295,8 +301,9 @@ } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname IfFileExists\endcsname\relax + \input pdftexcmds.sty\relax \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdffilesize\endcsname\relax + \expandafter\ifx\csname pdf@filesize\endcsname\relax \def\SE@InputIfFileExists#1{% \expandafter\ifx\csname @inputcheck\endcsname\relax \csname newread\endcsname\@inputcheck @@ -310,7 +317,7 @@ }% \else \def\SE@InputIfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \SE@FileNotFound{#1}% \else \SE@Input{#1}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index 34f66343644..ab869f46d2c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,10 +87,22 @@ \expandafter\x\csname ver@telprint.sty\endcsname \ProvidesPackage{telprint}% [2007/09/09 v1.9 Formatting of German phone numbers (HO)] -\expandafter\edef\csname TELAtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname TELAtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\TELAtEnd{% \TELAtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def index 5a42a35f271..b38b507b534 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvipdfm.def @@ -26,11 +26,12 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvipdfm.def}% - [2007/03/21 v0.1 accsupp driver for dvipdfm (HO)]% + [2007/11/14 v0.2 accsupp driver for dvipdfm (HO)]% \def\ACCSUPP@bdc{% \special{pdf:content \ACCSUPP@span BDC}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def index 1e4dbde3444..9553f5bf209 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-dvips.def @@ -26,12 +26,13 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-dvips.def}% - [2007/03/21 v0.1 accsupp driver for dvips (HO)]% -\def\ACCSUPP@bdc#1{% + [2007/11/14 v0.2 accsupp driver for dvips (HO)]% +\def\ACCSUPP@bdc{% \special{ps:[\ACCSUPP@span/BDC pdfmark}% } \def\ACCSUPP@emc{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def index b1b1456aa90..38f90911ce9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp-pdftex.def @@ -26,11 +26,12 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{accsupp-pdftex.def}% - [2007/03/21 v0.1 accsupp driver for pdfTeX (HO)]% + [2007/11/14 v0.2 accsupp driver for pdfTeX (HO)]% \def\ACCSUPP@bdc{% \pdfliteral\ACCSUPP@pdfliteral{\ACCSUPP@span BDC}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty index 14d38a33f10..a26caed005b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/accsupp.sty @@ -26,33 +26,54 @@ %% and the derived files %% accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv, %% accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def, -%% accsupp-example.tex. +%% accsupp-example1.tex, accsupp-example2.tex, +%% accsupp-test1.tex. %% +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ACCSUPP@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # +\catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } +\def\TMP@EnsureCode#1#2{% + \edef\ACCSUPP@AtEnd{% + \ACCSUPP@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{10}{12}% ^^J +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{96}{12}% ` +\TMP@EnsureCode{254}{12}% ^^fe +\TMP@EnsureCode{255}{12}% ^^ff +\g@addto@macro\ACCSUPP@AtEnd{\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{accsupp}% - [2007/03/21 v0.1 Accessibility support by marked content (HO)]% -\edef\ACCSUPP@end{% - \catcode39 \the\catcode39 % ' - \catcode40 \the\catcode40 % ( - \catcode41 \the\catcode41 % ) - \catcode60 \the\catcode60 % < - \catcode61 \the\catcode61 % = - \catcode62 \the\catcode62 % > - \catcode94 \the\catcode94 % ^ - \catcode96 \the\catcode96 % ` - \catcode254 \the\catcode254 % ^^FE - \catcode255 \the\catcode255 % ^^FF -} -\@makeother\( -\@makeother\) -\@makeother\' -\@makeother\< -\@makeother\= -\@makeother\> -\catcode94 = 7 % -\@makeother\` -\@makeother\^^fe -\@makeother\^^ff + [2007/11/14 v0.2 Accessibility support by marked content (HO)] \RequirePackage{pdfescape}[2007/02/25] \RequirePackage{ifpdf} \RequirePackage{ifxetex} @@ -65,11 +86,11 @@ \@dblarg\ACCSUPP@@DefineDriverKey } \def\ACCSUPP@@DefineDriverKey[#1]#2{% - \define@key{ActTxt}{#2}[]{% + \define@key{ACCSUPP}{#2}[]{% \def\ACCSUPP@driver{#1}% }% \g@addto@macro\ACCSUPP@DisableOptions{% - \DisableKeyvalOption{ActTxt}{#2}% + \DisableKeyvalOption{ACCSUPP}{#2}% }% } \let\ACCSUPP@DisableOptions\@empty @@ -79,6 +100,7 @@ \ACCSUPP@DefineDriverKey{dvipdfm} \ACCSUPP@DefineDriverKey[dvipdfm]{dvipdfmx} \ACCSUPP@DefineDriverKey[dvipdfm]{xetex} +\let\ACCSUPP@driver\relax \InputIfFileExists{accsupp.cfg}{}{} \providecommand*{\ActualTextDriverDefault}{dvips} \ifpdf @@ -87,7 +109,9 @@ \ifxetex \def\ACCSUPP@driver{dvipdfm}% \else - \let\ACCSUPP@driver\BookmarkDriverDefault + \ifx\ACCSUPP@driver\relax + \let\ACCSUPP@driver\ActualTextDriverDefault + \fi \fi \fi \ProcessKeyvalOptions* @@ -107,7 +131,7 @@ Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak Package loading is aborted% }\@ehc - \expandafter\expandafter\expandafter\endinput + \expandafter\expandafter\expandafter\ACCSUPP@AtEnd \fi \def\ACCSUPP@temp{dvipdfm}% \ifxetex @@ -121,12 +145,19 @@ \fi \fi \fi +\ifx\ACCSUPP@driver\relax + \PackageError{accsupp}{% + Missing driver option.\MessageBreak + Package loading is aborted% + }\@ehc + \expandafter\ACCSUPP@AtEnd +\fi \InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{% \PackageError{accsupp}{% Unsupported driver `\ACCSUPP@driver'.\MessageBreak Package loading is aborted% }\@ehc - \endinput + \ACCSUPP@AtEnd } \DeclareBoolOption{unicode} \DeclareStringOption[page]{pdfliteral} @@ -223,7 +254,7 @@ }% } \def\ACCSUPP@method@pdfstringdef#1{% - \ifActText@unicode + \ifACCSUPP@unicode \@ifundefined{hypersetup}{}{% \hypersetup{unicode}% }% @@ -234,11 +265,16 @@ }\@ehc \let\ACCSUPP@temp\@empty }{% - \pdfstringdef\ACCSUPP@temp#1% + \begingroup + \setbox0=\hbox{% + \pdfstringdef\ACCSUPP@temp#1% + \global\let\ACCSUPP@temp\ACCSUPP@temp + }% + \endgroup }% \edef#1{(\ACCSUPP@temp)}% } -\ACCSUPP@end +\ACCSUPP@AtEnd \endinput %% %% End of file `accsupp.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty index 47ce9af4d6d..11ec911e0c4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/askinclude.sty @@ -41,10 +41,22 @@ %% askinclude-test23.tex, askinclude-test24.tex. %% \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname AskInc@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname AskInc@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\AskInc@AtEnd{% \AskInc@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty index 4dbc977a358..e7287fe1901 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize-base}% - [2007/05/01 v1.3 Basic part of bmpsize (HO)]% + [2007/11/11 v1.4 Basic part of bmpsize (HO)]% \RequirePackage{fp-basic} \RequirePackage{fp-snap} \long\def\@bmpsize@plain@loop#1\repeat{% @@ -40,6 +40,7 @@ \iterate \let\iterate\relax } +\RequirePackage{pdftexcmds}[2007/11/11] \newif\ifbmpsize@ok \let\@bmpsize@ok\bmpsize@oktrue @@ -74,7 +75,7 @@ \def\@bmpsize@break#1\@bmpsize@loop#2{} \def\@bmpsize@size#1#2#3{% - \edef#3{\pdffilesize{#1}}% + \edef#3{\pdf@filesize{#1}}% \ifx#3\@empty \expandafter\@bmpsize@stop \fi @@ -84,7 +85,7 @@ } \def\@bmpsize@read#1#2#3{% - \edef\@bmpsize@buf{\pdffiledump offset#3length#2{#1}}% + \edef\@bmpsize@buf{\pdf@filedump{#3}{#2}{#1}}% \edef\@bmpsize@temp{% \noexpand\@bmpsize@check@byte{#2}\@bmpsize@buf{}{}\noexpand\\% }% @@ -98,8 +99,7 @@ \fi {% \edef\@bmpsize@buf{% - \pdffiledump offset\bmpsize@offset - length\bmpsize@fillbuflength{#1}% + \pdf@filedump{\bmpsize@offset}{\bmpsize@fillbuflength}{#1}% }% \ifx\@bmpsize@buf\@empty \expandafter\@bmpsize@stop @@ -117,13 +117,13 @@ } \def\@bmpsize@iswhite#1{% - \ifnum\pdfstrcmp{#1}{09}=\z@ + \ifnum\pdf@strcmp{#1}{09}=\z@ \else - \ifnum\pdfstrcmp{#1}{0A}=\z@ + \ifnum\pdf@strcmp{#1}{0A}=\z@ \else - \ifnum\pdfstrcmp{#1}{0D}=\z@ + \ifnum\pdf@strcmp{#1}{0D}=\z@ \else - \ifnum\pdfstrcmp{#1}{20}=\z@ + \ifnum\pdf@strcmp{#1}{20}=\z@ \else 1% \fi @@ -133,10 +133,10 @@ \space } \def\@bmpsize@isdigit#1{% - \ifnum\pdfstrcmp{#1}{30}<\z@ + \ifnum\pdf@strcmp{#1}{30}<\z@ 1% \else - \ifnum\pdfstrcmp{#1}{39}>\z@ + \ifnum\pdf@strcmp{#1}{39}>\z@ 1% \fi \fi @@ -199,7 +199,7 @@ \if@bmpsize@absnum \ifnum"\expandafter\@car#1\@nil>7 % \edef#1{\expandafter\@bmpsize@abs@byte#1\relax}% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}=\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}=\z@ \let\@bmpsize@temp\@bmpsize@stop \else \def\@bmpsize@temp{\edef#1{\the\numexpr#1+1}}% @@ -237,7 +237,7 @@ \@bmpsize@grab#14% \@bmpsize@swap@maybe#1% \@bmpsize@abs@maybe#1% - \ifnum\pdfstrcmp{#1}{7FFFFFFF}>\z@ + \ifnum\pdf@strcmp{#1}{7FFFFFFF}>\z@ \expandafter\@bmpsize@stop \fi \edef#1{\number"#1}% @@ -434,14 +434,14 @@ \@bmpsize@grab\bmpsize@temp{8}% \@bmpsize@skip@four \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{89504E470D0A1A0A}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49484452}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -454,7 +454,7 @@ \@bmpsize@num@four\bmpsize@length \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{49444154}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{49444154}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -462,7 +462,7 @@ {% \@bmpsize@stop }% - \ifnum\pdfstrcmp{\bmpsize@temp}{70485973}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{70485973}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -495,7 +495,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FFD8FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FFD8FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -505,7 +505,7 @@ \@bmpsize@read{#1}{4}{\bmpsize@offset}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{FF}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{FF}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -541,7 +541,7 @@ \@bmpsize@grab\bmpsize@temp{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{4A46494600}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4A46494600}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -592,7 +592,7 @@ \@bmpsize@grab\bmpsize@temp{6}% \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{457869660000}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{457869660000}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -601,7 +601,7 @@ \edef\bmpsize@exifoffset{\the\numexpr\bmpsize@offset+10}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -609,7 +609,7 @@ {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -801,7 +801,7 @@ \@bmpsize@read{#1}{26}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{424D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{424D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -854,7 +854,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{474946}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{474946}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -884,7 +884,7 @@ \@bmpsize@read{#1}{8}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{4949}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4949}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -892,7 +892,7 @@ {% \@bmpsize@bigendianfalse }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{4D4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4D4D}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1015,16 +1015,16 @@ \def\bmpsize@offset{3}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50}=\z@ \else \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{31}<\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{31}<\z@ \expandafter\@bmpsize@stop \fi - \ifnum\pdfstrcmp{\bmpsize@temp}{36}>\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{36}>\z@ \expandafter\@bmpsize@stop \fi \@bmpsize@grab\bmpsize@temp{1}% @@ -1047,7 +1047,7 @@ \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1057,7 +1057,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1065,7 +1065,7 @@ {% \@bmpsize@break }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{0D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0D}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1106,7 +1106,7 @@ }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% @@ -1146,7 +1146,7 @@ }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -1160,7 +1160,7 @@ \@bmpsize@grab\bmpsize@temp{3}% \@bmpsize@skip@two \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{50370A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{50370A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1176,7 +1176,7 @@ {% \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% }{% - \ifnum\pdfstrcmp{\bmpsize@temp}{23}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{23}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1188,7 +1188,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1203,7 +1203,7 @@ \@bmpsize@grab\bmpsize@head{5}% \@bmpsize@skip@four \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@head}{5749445448}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{5749445448}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1258,7 +1258,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1267,12 +1267,12 @@ \@bmpsize@break }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \@bmpsize@append\bmpsize@head\bmpsize@head\bmpsize@temp - \ifnum\pdfstrcmp{\bmpsize@head}{454E44484452}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{454E44484452}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1281,7 +1281,7 @@ \@bmpsize@ok \@bmpsize@stop }{% - \ifnum\pdfstrcmp{\bmpsize@head}{484549474854}=\z@ + \ifnum\pdf@strcmp{\bmpsize@head}{484549474854}=\z@ \expandafter\@firstoftwo \else \expandafter\@secondoftwo @@ -1336,7 +1336,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1345,7 +1345,7 @@ \@bmpsize@break }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% }{% \@bmpsize@pushback\bmpsize@head \@bmpsize@loop{% @@ -1353,7 +1353,7 @@ \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one \edef\bmpsize@off{\the\numexpr\bmpsize@off+1}% - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1380,7 +1380,7 @@ \@bmpsize@skip@four \@bmpsize@skip@one \def\bmpsize@offset{9}% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F2A2058504D202A2F}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1388,7 +1388,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{22}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{22}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1396,7 +1396,7 @@ {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1405,7 +1405,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1415,7 +1415,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1425,7 +1425,7 @@ \@bmpsize@fillbuf{#1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1433,7 +1433,7 @@ {% \@bmpsize@break }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2A}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1442,7 +1442,7 @@ \@bmpsize@break }% }% - \ifnum\pdfstrcmp{\bmpsize@temp}{2F}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{2F}=\z@ \expandafter\@firstofone \else \expandafter\@gobble @@ -1503,7 +1503,7 @@ }% }% }% - \edef\bmpsize@pixelwidth{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelwidth{\pdf@unescapehex{\bmpsize@tempnum}}% \def\bmpsize@tempnum{}% \@bmpsize@loop{% \@bmpsize@fillbuf{#1}% @@ -1552,7 +1552,7 @@ }% }% }% - \edef\bmpsize@pixelheight{\pdfunescapehex{\bmpsize@tempnum}}% + \edef\bmpsize@pixelheight{\pdf@unescapehex{\bmpsize@tempnum}}% \@bmpsize@ok \@bmpsize@stop \@nil @@ -1564,13 +1564,13 @@ \@bmpsize@read{#1}{16}{1}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{01}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1594,7 +1594,7 @@ \@bmpsize@skip@four \@bmpsize@skip@four \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{54525545564953494F4E2D5846494C452E00}=\z@ \expandafter\@gobble \else \expandafter\@firstofone @@ -1632,7 +1632,7 @@ \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{1}% \@bmpsize@skip@one - \ifnum\pdfstrcmp{\bmpsize@temp}{0A}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{0A}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1671,13 +1671,13 @@ \@bmpsize@read{#1}{16}{0}% \@bmpsize@grab\bmpsize@temp{4}% \@bmpsize@skip@four - \ifnum\pdfstrcmp{\bmpsize@temp}{44616E4D}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{44616E4D}=\z@ \expandafter\@gobble \else \expandafter\@firstofone \fi {% - \ifnum\pdfstrcmp{\bmpsize@temp}{4C696E53}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{4C696E53}=\z@ \else \expandafter\@bmpsize@stop \fi @@ -1707,7 +1707,7 @@ \@bmpsize@read{#1}{10}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two - \ifnum\pdfstrcmp{\bmpsize@temp}{01DA}=\z@ + \ifnum\pdf@strcmp{\bmpsize@temp}{01DA}=\z@ \else \expandafter\@bmpsize@stop \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def index 042cd5f363c..e53ba4c1329 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfm.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfm (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . @@ -51,10 +51,10 @@ \@bmpsize@count=\z@ }{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \def\@bmpsize@pdfescapestring#1{#1}% \else - \let\@bmpsize@pdfescapestring\pdfescapestring + \let\@bmpsize@pdfescapestring\pdf@escapestring \fi \def\bmpsize@dvipdfm@factor{.99626} \def\Ginclude@bmp#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def index cf88f50f985..3737f24033b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfmx.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvipdfmx (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . @@ -51,10 +51,10 @@ \@bmpsize@count=\z@ }{} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapestring\endcsname\relax +\expandafter\ifx\csname pdf@escapestring\endcsname\relax \def\@bmpsize@pdfescapestring#1{#1}% \else - \let\@bmpsize@pdfescapestring\pdfescapestring + \let\@bmpsize@pdfescapestring\pdf@escapestring \fi \def\bmpsize@dvipdfmx@factor{1.3837} \def\Ginclude@bmp#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def index 1582bec1cb2..41e6f77d692 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvips.def}% - [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]% + [2007/11/11 v1.4 Graphics bitmap driver for dvips (HO)]% \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode58 \the\catcode58 % : diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex index 2639a1be762..001a8c7bc26 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \expandafter\ifx\csname NeedsTeXFormat\endcsname\relax -\input miniltx + \input miniltx\relax \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfoutput\endcsname\relax @@ -60,7 +60,7 @@ \csname @@end\endcsname \end }{% - \ifnum\pdfstrcmp{\imagename}{opt}=\z@ + \ifnum\pdf@strcmp{\imagename}{opt}=\z@ \expandafter\optionmenu \else \startimg @@ -130,7 +130,7 @@ \fi }% \ifx\@found\@empty - \edef\@file@date{\pdffilemoddate{\imagename}}% + \edef\@file@date{\pdf@filemoddate{\imagename}}% \ifx\@file@date\@empty \msg{\space\space --> File not found <--}% \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index bc7be80416f..24140816d40 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -29,24 +29,33 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]% + [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% \expandafter\endinput \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffiledump\endcsname\relax +\expandafter\ifx\csname pdf@filedump\endcsname\relax \PackageError{bmpsize}{% You need pdfTeX 1.30.0 or newer% }{Package loading is aborted.}% \expandafter\endinput \fi +\RequirePackage{infwarerr}[2007/09/09] \RequirePackage{graphics} -\RequirePackage{keyval} +\RequirePackage{keyval}\relax +\expandafter\ifx\csname KV@errx\endcsname\relax + \def\KV@errx#1{% + \@PackageError{keyval}{#1}\@ehc + }% +\fi +\expandafter\ifx\csname KV@err\endcsname\relax + \let\KV@err\KV@errx +\fi \RequirePackage{bmpsize-base} -\RequirePackage{infwarerr} \InputIfFileExists{bmpsize-\Gin@driver}{}{} @@ -72,18 +81,18 @@ \x{ } \def\@bmpsize@read@resolution#1#2 #3 #4\@nil{% \ifcase 0\ifx\\#2\\1\fi - \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@ \ifx\\#3\\1\fi - \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@ 1% \fi \fi - \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax \let\bmpsize@pixelx@default\Gin@exclamation \else \edef\bmpsize@pixelx@default{#2}% \fi - \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax \let\bmpsize@pixely@default\Gin@exclamation \else \ifx\\#3\\% @@ -105,7 +114,7 @@ \let\@bmpsize@org@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% - \ifcase\pdfstrcmp{#1}{bmp}\relax + \ifcase\pdf@strcmp{#1}{bmp}\relax \expandafter\@firstofone \else \expandafter\@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index 1027a683717..ae71aad18a0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -31,8 +31,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2007/10/29 v2.1 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2007/10/29] + [2007/11/11 v2.2 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2007/11/11] \embedfile[% stringmethod=escape,% mimetype=plain/text,% diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty index 833c0c2215f..25e7b2c9ef2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty @@ -45,6 +45,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -58,6 +61,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -66,6 +70,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -81,11 +87,23 @@ \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2007/10/29 v2.1 embed files into PDF (HO)] -\expandafter\edef\csname EmFi@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v2.2 embed files into PDF (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname EmFi@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\EmFi@AtEnd{% \EmFi@AtEnd @@ -130,8 +148,9 @@ \EmFi@AtEnd \expandafter\endinput \fi +\EmFi@RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax +\expandafter\ifx\csname pdf@filesize\endcsname\relax \EmFi@Error{% Unsupported pdfTeX version% }{% @@ -140,7 +159,7 @@ \EmFi@AtEnd \expandafter\endinput \fi -\EmFi@RequirePackage{pdfescape}[2007/10/27] +\EmFi@RequirePackage{pdfescape}[2007/11/11] \def\EmFi@temp#1{% \expandafter\EdefSanitize\csname EmFi@S@#1\endcsname{#1}% } @@ -369,7 +388,7 @@ \EmFi@convert\EmFi@title\EmFi@title \xdef\EmFi@schema{% \EmFi@schema - /\pdfescapename{\EmFi@key}<<% + /\pdf@escapename{\EmFi@key}<<% /Subtype/% \ifx\EmFi@type\EmFi@S@date D% \else\ifx\EmFi@type\EmFi@S@number N% @@ -448,7 +467,7 @@ \else \xdef\EmFi@sortkeys{% \EmFi@sortkeys - /\pdfescapename{#1}% + /\pdf@escapename{#1}% }% \ifx\EmFi@sortorders\empty \global\let\EmFi@sortorders\EmFi@temp @@ -544,7 +563,7 @@ \global\EmFi@initialfiletrue \fi \setkeys{EmFi}{#1}% - \expandafter\ifx\expandafter\\\pdffilesize{\EmFi@file}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{\EmFi@file}\\% \EmFi@Error{% File `\EmFi@file' not found% }{% @@ -570,12 +589,12 @@ /Type/EmbeddedFile% \ifx\EmFi@mimetype\empty \else - /Subtype/\pdfescapename{\EmFi@mimetype}% + /Subtype/\pdf@escapename{\EmFi@mimetype}% \fi /Params<<% - /ModDate(\pdffilemoddate{\EmFi@file})% - /Size \pdffilesize{\EmFi@file}% - /CheckSum<\pdfmdfivesum file{\EmFi@file}>% + /ModDate(\pdf@filemoddate{\EmFi@file})% + /Size \pdf@filesize{\EmFi@file}% + /CheckSum<\pdf@filemdfivesum{\EmFi@file}>% >>% }file{\EmFi@file}\relax \EmFi@defobj{EmbeddedFile}% @@ -584,7 +603,7 @@ /Type/Filespec% \ifx\EmFi@filesystem\empty \else - /FS/\pdfescapename{\EmFi@filesystem}% + /FS/\pdf@escapename{\EmFi@filesystem}% \fi /F(\EmFi@@filespec)% \ifx\EmFi@@desc\empty @@ -611,10 +630,10 @@ \expandafter\ifx\csname EmFi@P@#1\endcsname\relax \expandafter\ifx\csname EmFi@V@#1\endcsname\relax \else - /\pdfescapename{#1}\csname EmFi@V@#1\endcsname + /\pdf@escapename{#1}\csname EmFi@V@#1\endcsname \fi \else - /\pdfescapename{#1}<<% + /\pdf@escapename{#1}<<% \expandafter\ifx\csname EmFi@V@#1\endcsname\relax \else /D\csname EmFi@V@#1\endcsname @@ -624,22 +643,22 @@ \fi } \def\EmFi@convert#1#2{% - \ifnum\pdfstrcmp{\EmFi@stringmethod}{psd}=0 % + \ifnum\pdf@strcmp{\EmFi@stringmethod}{psd}=0 % \pdfstringdef\EmFi@temp{#1}% \let#2\EmFi@temp \else - \edef#2{\pdfescapestring{#1}}% + \edef#2{\pdf@escapestring{#1}}% \fi } \global\let\EmFi@list\empty \def\EmFi@add#1#2{% \begingroup - \edef\key{\pdfescapehex{#1}}% + \edef\key{\pdf@escapehex{#1}}% \ifx\EmFi@list\empty \xdef\EmFi@list{\noexpand\do{\key}{#2}}% \else \def\do##1##2{% - \ifnum\pdfstrcmp{##1}{\key}>0 % + \ifnum\pdf@strcmp{##1}{\key}>0 % \edef\x{% \toks@{% \the\toks@% diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index 096b22d4abd..41800a8805d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -44,6 +44,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -57,6 +60,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -65,6 +69,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,11 +86,23 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)] -\expandafter\edef\csname ETE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} + [2007/11/11 v1.6 Conversion with epstopdf on the fly (HO)] +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname ETE@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\ETE@AtEnd{% \ETE@AtEnd @@ -107,6 +125,7 @@ \RequirePackage{infwarerr}[2007/09/09] \RequirePackage{grfext}\relax \RequirePackage{kvoptions}[2007/10/02] +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname Gin@setfile\endcsname\relax \@PackageWarningNoLine{epstopdf}{% @@ -130,9 +149,9 @@ \fi \endgroup \begingroup - \expandafter\ifx\csname pdfshellescape\endcsname\relax + \expandafter\ifx\csname pdf@shellescape\endcsname\relax \else - \ifnum\pdfshellescape>0 % + \ifnum\pdf@shellescape>0 % \else \@PackageWarningNoLine{epstopdf}{% Shell escape feature is not enabled% @@ -150,7 +169,7 @@ \ProcessKeyvalOptions* \newcommand*{\epstopdfsetup}{\setkeys{ETE}} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilemoddate\endcsname\relax +\expandafter\ifx\csname pdf@filemoddate\endcsname\relax \def\ETE@Make#1#2{% \ifETE@update \ETE@WarnModDate @@ -168,7 +187,7 @@ \else \def\ETE@Make#1#2{% \ifETE@update - \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 % + \ifnum\pdf@strcmp{\pdf@filemoddate{#1}}{\pdf@filemoddate{#2}}>0 % \expandafter\expandafter\expandafter\@firstofone \else \@PackageInfoNoLine{epstopdf}{% @@ -182,8 +201,10 @@ }% \def\ETE@FileInfo#1#2{% #1 file: <#2>% - \expandafter\ETE@Date\pdffilemoddate{#2}\@nil - \expandafter\ETE@Size\pdffilesize{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Date\pdf@filemoddate{#2}\@nil + \expandafter\expandafter\expandafter + \ETE@Size\pdf@filesize{#2}\@nil }% \def\ETE@Date#1\@nil{% \ifx\\#1\\% @@ -254,7 +275,7 @@ }% \fi \ETE@Make\SourceFile\OutputFile{% - \immediate\write18{\CommandLine}% + \pdf@system{\CommandLine}% \ifETE@verbose \@PackageInfoNoLine{epstopdf}{% \ETE@FileInfo{Result}\OutputFile diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty index 41817c91c0c..9aed33045ad 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -43,6 +43,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -56,6 +59,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -64,6 +68,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -80,10 +86,22 @@ \expandafter\x\csname ver@grfext.sty\endcsname \ProvidesPackage{grfext}% [2007/09/30 v1.0 Managing graphics extensions (HO)] -\expandafter\edef\csname grfext@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname grfext@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\grfext@AtEnd{% \grfext@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index da9cb1d01d1..f7a91e1ceae 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2007/08/16 v1.5 Extended file name support for graphics (HO)]% + [2007/11/11 v1.6 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -67,8 +67,9 @@ \DeclareDefaultOption{% \PassOptionsToPackage\CurrentOption{graphics}% } +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffilesize\endcsname\relax +\expandafter\ifx\csname pdf@filesize\endcsname\relax \grffile@spacefalse \let\grffile@space@disabled\@empty \def\grffile@spacetrue{% @@ -98,7 +99,8 @@ \else \ifx\grffile@inputencoding\@empty \expandafter\ifx\csname inputencodingname\endcsname\relax - \expandafter\ifx\csname CurrentInputEncodingOption\endcsname\relax + \expandafter\ifx\csname + CurrentInputEncodingOption\endcsname\relax \else \let\grffile@inputencoding\CurrentInputEncodingOption \fi @@ -187,13 +189,13 @@ }% } \def\grffile@IfFileExists#1{% - \expandafter\ifx\expandafter\\\pdffilesize{#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{#1}\\% \let\reserved@a\@secondoftwo \ifx\input@path\@undefined \else \expandafter\@tfor\expandafter\reserved@b\expandafter :\expandafter=\input@path\do{% - \expandafter\ifx\expandafter\\\pdffilesize{\reserved@b#1}\\% + \expandafter\ifx\expandafter\\\pdf@filesize{\reserved@b#1}\\% \else \edef\grffile@file@found{\reserved@b#1}% \let\reserved@a\@firstoftwo diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty index 75ab3f2dd14..b8acb55ee3e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{holtxdoc}% - [2007/10/21 v0.8 Private additional ltxdoc support (HO)] + [2007/11/11 v0.9 Private additional ltxdoc support (HO)] \RequirePackage[numbered]{hypdoc} \RequirePackage{array} \def\hld@info#1{% @@ -137,6 +137,7 @@ \providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}} \providecommand*{\pdfTeX}{pdf\TeX} \providecommand*{\pdfLaTeX}{pdf\LaTeX} +\providecommand*{\LuaTeX}{L\textsc{ua}\TeX} \def\@temp#1#2{% \providecommand*{#1}{% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty index dec536d7d7f..54abda022f2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdestopt.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2006/06/01 v2.0 Hyperref destination optimizer (HO)]% + [2007/11/11 v2.1 Hyperref destination optimizer (HO)]% \newif\ifHypDest@Verbose \DeclareOption{verbose}{\HypDest@Verbosetrue} \def\HypDest@VerboseInfo#1{% @@ -40,7 +40,8 @@ \DeclareOption{num}{\HypDest@namefalse} \DeclareOption{name}{\HypDest@nametrue} \ProcessOptions*\relax -\RequirePackage{ifpdf} +\RequirePackage{ifpdf}[2007/09/09] +\RequirePackage{pdftexcmds}[2007/11/11] \ifpdf \else \PackageError{hypdestopt}{% @@ -49,7 +50,7 @@ \expandafter\endinput \fi \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname pdf@escapehex\endcsname\relax \PackageError{hypdestopt}{% This pdfTeX is too old, at least 1.30.0 is required% }\@ehc @@ -116,7 +117,7 @@ }% \newalphalph\HypDest@HexString\HypDest@HexChar{250}% \renewcommand*{\theHypDest}{% - \pdfunescapehex{\HypDest@HexString{\value{HypDest}}}% + \pdf@unescapehex{\HypDest@HexString{\value{HypDest}}}% }% \else \renewcommand*{\theHypDest}{% @@ -128,7 +129,7 @@ \begingroup \edef\x{% \expandafter\noexpand - \csname\HypDest@Prefix\pdfunescapehex{#1}\endcsname + \csname\HypDest@Prefix\pdf@unescapehex{#1}\endcsname }% \expandafter\ifx\x\relax \stepcounter{HypDest}% @@ -136,12 +137,12 @@ \let\on@line\@empty \ifHypDest@name \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> % - 0x\pdfescapehex{\x} (\number\value{HypDest})% + Use: (\pdf@unescapehex{#1}) -\string> % + 0x\pdf@escapehex{\x} (\number\value{HypDest})% }% \else \HypDest@VerboseInfo{% - Use: (\pdfunescapehex{#1}) -\string> num \x + Use: (\pdf@unescapehex{#1}) -\string> num \x }% \fi \fi @@ -156,7 +157,7 @@ }% \if@filesw \immediate\write\@auxout{% - \string\HypDest@Use{\pdfescapehex{#1}}% + \string\HypDest@Use{\pdf@escapehex{#1}}% }% \fi }% @@ -177,7 +178,7 @@ \HypDest@Org@DestName{\csname\HypDest@Prefix#1\endcsname}{#2}% \HypDest@VerboseInfo{% DestName: (#1) % - 0x\pdfescapehex{\csname\HypDest@Prefix#1\endcsname}% + 0x\pdf@escapehex{\csname\HypDest@Prefix#1\endcsname}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 63e25908eb0..bbd9ce68e6a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -29,13 +29,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]% + [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax - \RequirePackage{doc} - \ifx\numexpr\@undefined \RequirePackage{calc}% \fi @@ -55,12 +53,10 @@ }},% } \RequirePackage{thumbpdf} - \newcounter{HD@unique} \renewcommand{\theHD@unique}{% \number\value{HD@unique}% } - \g@addto@macro\Hy@UseMaketitleInfos{% \@ifundefined{fileinfo}{}{% \ifx\@pdfsubject\@empty @@ -68,7 +64,6 @@ \fi }% } - \pdfstringdefDisableCommands{% \let\thanks\@gobble \let\footnote\@gobble @@ -77,9 +72,6 @@ \let\scshape\@empty \def\and{and }% } - -%%% Bookmarks - \def\HD@sectionpatch{% \ifHD@numbered \HD@@sectionpatch{section}% @@ -96,7 +88,6 @@ }% } \def\HD@disable@writebookmark#1#2#3#4#5{} - \def\HD@guesstoclevel#1{% \expandafter\HD@@guesstoclevel#1\section\HD@end } @@ -107,12 +98,8 @@ \@nameuse{toclevel@\expandafter\@gobble\string#1\@empty}% }% } - \let\HDorg@tableofcontents\tableofcontents \def\tableofcontents{% - % As first section the table of contents shouldn't - % go into the toc itself. Also a number looks too funny then. - % Just a bookmark is enough in this case. \begingroup \@ifundefined{c@section}{% \def\c@section{0}% @@ -136,21 +123,19 @@ \endgroup \fi } - \let\HDorg@listoffigures\listoffigures \def\listoffigures{% \ifHD@numbered \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHd@unique}% + {\contentsname}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch \HDorg@listoffigures \endgroup } - \let\HDorg@listoftables\listoftables \def\listoftables{% \ifHD@numbered @@ -164,7 +149,6 @@ \HDorg@listoftables \endgroup } - \let\HDorg@thebibliography\thebibliography \def\thebibliography{% \ifHD@numbered @@ -176,7 +160,6 @@ \HD@sectionpatch \HDorg@thebibliography } - \let\HDorg@theindex\theindex \def\theindex{% \let\HDorg@index@prologue\index@prologue @@ -216,7 +199,7 @@ \ifx\HD@hfil\hfil \expandafter\HD@@@bfseries \fi -}% +} \def\HD@@@bfseries\hfil#1\hfil{% \ifx\\#1\\% \else @@ -229,7 +212,6 @@ \hfil#1\hfil }% \def\HD@margin{1mm} - \let\HDorg@theglossary\theglossary \def\theglossary{% \let\HDorg@glossary@prologue\glossary@prologue @@ -250,9 +232,6 @@ \HDorg@theglossary } \providecommand*{\glossaryname}{Change History} - -%%% Index stuff - \newcounter{HD@hypercount} \newlength{\HD@helplength} \newif\ifHD@savedest @@ -287,10 +266,8 @@ \def\HD@savedest@add#1{% \immediate\write\HD@savedest@out{\string~#1}% } - \newif\ifHD@targetraise \HD@targetraisetrue - \def\HD@target{% \ifHD@targetraise \ifhmode @@ -319,14 +296,12 @@ \fi \HD@next } - \g@addto@macro\CodelineIndex{% \let\special@index\HD@codeline@wrindex } \g@addto@macro\PageIndex{% \let\special@index\HD@page@wrindex } - \def\HD@codeline@wrindex#1{% \begingroup \let\HDorg@encapchar\encapchar @@ -349,7 +324,6 @@ \HDorg@index{#1\encapchar\encapchar\@nil}% \endgroup } - \def\hdclindex#1#2#3{% \csname\ifx\\#2\\relax\else#2\fi\endcsname{% \hyperlink{HD.#1}{#3}% @@ -361,7 +335,6 @@ \hyperpage{#2}% }% } - \let\HDorg@PrintDescribeMacro\PrintDescribeMacro \renewcommand\PrintDescribeMacro[1]{% \begingroup @@ -373,7 +346,6 @@ \HDorg@PrintDescribeMacro{#1}% \endgroup } - \let\HDorg@PrintMacroName\PrintMacroName \renewcommand\PrintMacroName[1]{% \begingroup @@ -385,7 +357,6 @@ \HDorg@PrintMacroName{#1}% \endgroup } - \let\HDorg@theCodelineNo\theCodelineNo \renewcommand*\theCodelineNo{% \settowidth{\HD@helplength}{\HDorg@theCodelineNo\ }% @@ -400,11 +371,9 @@ \fi \HDorg@theCodelineNo } - \AtBeginDocument{% \let\HDorg@index\index } - \let\HDorg@SpecialUsageIndex\SpecialUsageIndex \renewcommand*\SpecialUsageIndex[1]{% \@bsphack @@ -419,7 +388,6 @@ \endgroup \@esphack } - \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname autoindex\endcsname\relax \else @@ -438,7 +406,6 @@ \@esphack }% \fi - \let\HDorg@SpecialEnvIndex\SpecialEnvIndex \renewcommand*\SpecialEnvIndex[1]{% \@bsphack @@ -452,7 +419,6 @@ \endgroup \@esphack } - \let\HDorg@SortIndex\SortIndex \renewcommand*{\SortIndex}[2]{% \@bsphack @@ -462,9 +428,6 @@ \endgroup \@esphack } - -%%% glossary stuff - \let\HDorg@wrglossary\@wrglossary \def\@wrglossary#1{% \let\HDorg@encapchar\encapchar @@ -474,9 +437,6 @@ }% \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } - -%%% \MacroIndent automatically calculated - \AtEndDocument{% \if@filesw \immediate\write\@auxout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty index 975343b7574..121ec0bd309 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty @@ -33,10 +33,22 @@ %% With color support option 'emphcolor' will dynamically %% change the color of \emph statements. \NeedsTeXFormat{LaTeX2e} -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 329903bff66..80c1a7565cb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -48,6 +48,9 @@ \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -61,6 +64,7 @@ \fi \endgroup \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -69,6 +73,8 @@ \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -85,10 +91,22 @@ \expandafter\x\csname ver@kvoptions.sty\endcsname \ProvidesPackage{kvoptions}% [2007/10/18 v3.0 Keyval support for LaTeX options (HO)] -\expandafter\edef\csname KVO@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname KVO@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\KVO@AtEnd{% \KVO@AtEnd diff --git a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty index 8df07faa148..2436cadbf2d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/listingsutf8.sty @@ -29,10 +29,22 @@ %% listingsutf8-test3.tex, listingsutf8-test4.tex, %% listingsutf8-test5.tex. %% -\expandafter\edef\csname lstU@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax -} +\begingroup + \catcode123 1 % { + \catcode125 2 % } + \def\x{\endgroup + \expandafter\edef\csname lstU@AtEnd\endcsname{% + \catcode35 \the\catcode35\relax + \catcode64 \the\catcode64\relax + \catcode123 \the\catcode123\relax + \catcode125 \the\catcode125\relax + }% + }% +\x +\catcode35 6 % # \catcode64 11 % @ +\catcode123 1 % { +\catcode125 2 % } \def\TMP@EnsureCode#1#2{% \edef\lstU@AtEnd{% \lstU@AtEnd @@ -65,7 +77,7 @@ \g@addto@macro\lstU@AtEnd{\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{listingsutf8}% - [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)] + [2007/11/11 v1.1 Adding support for UTF-8 to listings (HO)] \DeclareOption*{% \PassOptionsToPackage\CurrentOption{listings}% } @@ -76,6 +88,7 @@ \RequirePackage{inputenc}% }{}% } +\RequirePackage{pdftexcmds}[2007/11/11] \def\lstU@temp#1#2{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax @@ -88,9 +101,9 @@ \fi } \lstU@temp{scantokens}{It is provided by e-TeX} -\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30} -\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@unescapehex}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filedump}{It is provided by pdfTeX >= 1.30} +\lstU@temp{pdf@filesize}{It is provided by pdfTeX >= 1.30} \RequirePackage{stringenc}[2007/10/22] \newif\iflstU@utfviii \def\lstU@inputenc#1{% @@ -111,8 +124,8 @@ \def\lstU@input#1{% \iflstU@utfviii \edef\lstU@text{% - \pdfunescapehex{% - \pdffiledump length\pdffilesize{#1}{#1}% + \pdf@unescapehex{% + \pdf@filedump{0}{\pdf@filesize{#1}}{#1}% }% }% \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc diff --git a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty index a6cf3ac5131..d5fde1b2825 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/stackrel.sty @@ -28,11 +28,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{stackrel} - [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]% -\RequirePackage{etexcmds} + [2007/11/11 v1.2 Adding subscript option to stackrel (HO)]% +\RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded + \RequirePackage{pdftexcmds}[2007/11/11]% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfstrcmp\endcsname\relax + \expandafter\ifx\csname pdf@strcmp\endcsname\relax \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits \edef\reserved@a{\etex@unexpanded{#1}}% @@ -44,8 +45,8 @@ \else \newcommand*{\stack@relbin}[3][]{% \mathop{#3}\limits - \ifcase\pdfstrcmp{\detokenize{#1}}{}\else_{#1}\fi - \ifcase\pdfstrcmp{\detokenize{#2}}{}\else^{#2}\fi + \ifcase\pdf@strcmp{\detokenize{#1}}{}\else_{#1}\fi + \ifcase\pdf@strcmp{\detokenize{#2}}{}\else^{#2}\fi \egroup }% \fi |