diff options
| author | Karl Berry <karl@freefriends.org> | 2007-02-25 23:34:35 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2007-02-25 23:34:35 +0000 |
| commit | 4a0068129d6635fb71e1d030ac322a3ab55c45e1 (patch) | |
| tree | db1111fa73bc46d164667d86a57e7f4bdde16a5b /Master/texmf-dist | |
| parent | 31589ad96e2e5acc5f1d7e6bdaa92e4d56365497 (diff) | |
oberdiek
git-svn-id: svn://tug.org/texlive/trunk@3989 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
61 files changed, 2434 insertions, 224 deletions
diff --git a/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf b/Master/texmf-dist/doc/latex/oberdiek/aliascnt.pdf Binary files differindex 19999c30507..0ea76b6395f 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 7d763b3c26a..e6a144d003c 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/attachfile2.pdf b/Master/texmf-dist/doc/latex/oberdiek/attachfile2.pdf Binary files differindex b8cc198bb1c..e16edb6c456 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 370dc83a2e0..ccdf858bf00 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/bmpsize.pdf b/Master/texmf-dist/doc/latex/oberdiek/bmpsize.pdf Binary files differindex 6a8e4a7fa4d..67b1f849d0b 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 57a2761de9c..287e4511095 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/centernot.pdf b/Master/texmf-dist/doc/latex/oberdiek/centernot.pdf Binary files differindex f50fdc8c12e..305b4a8c9ea 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 7188984044f..eb2225e5958 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 2c09ca9ca51..e148a62ec19 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 ff476740d5a..c384426b7b7 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 4add92d76a0..7b5c7766a61 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/dvipscol.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf b/Master/texmf-dist/doc/latex/oberdiek/embedfile.pdf Binary files differindex 88902df977c..9176a9e73a4 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 3037809b295..f8fb7952d1c 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 14eb1da06f4..3ae1d6cedaf 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/flags.pdf b/Master/texmf-dist/doc/latex/oberdiek/flags.pdf Binary files differindex e5e831329f8..531f07ab683 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/grffile.pdf b/Master/texmf-dist/doc/latex/oberdiek/grffile.pdf Binary files differindex c9be0c392e3..5bfcf4a5ab0 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 374e0be680d..0bbd7650f4f 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/hypbmsec.pdf b/Master/texmf-dist/doc/latex/oberdiek/hypbmsec.pdf Binary files differindex b51bb44e11f..d5796eb5e6c 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 cd891df5774..bc775de8cda 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 a691c719aab..3857fd05e8a 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 18e2c8fc8bc..b853547f293 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/ifdraft.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifdraft.pdf Binary files differindex a37c7a1653c..58b274c5c72 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/ifpdf.pdf b/Master/texmf-dist/doc/latex/oberdiek/ifpdf.pdf Binary files differindex aab42fa722b..ab1302041cc 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 fe672f97293..b44c23ce24d 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/inputenx.pdf b/Master/texmf-dist/doc/latex/oberdiek/inputenx.pdf Binary files differindex 427f8685a56..27798dcfd82 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/kvoptions.pdf b/Master/texmf-dist/doc/latex/oberdiek/kvoptions.pdf Binary files differindex f50974273a6..8c3c4bd7bdb 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 c18a10b2839..e06dca73792 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/makerobust.pdf b/Master/texmf-dist/doc/latex/oberdiek/makerobust.pdf Binary files differindex 273e5f1ab51..ae23980600a 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 04c25d236cd..132e0ed7bae 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 909e9f990d2..f0de9f35dd6 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/pdfcolfoot.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf Binary files differindex b1c06cec3d2..eb391e6a001 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 547f8c39273..673103698eb 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/pdfcrypt.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf Binary files differindex d28d9190f03..b428ad5f43b 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-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex new file mode 100644 index 00000000000..d4244df4b69 --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex @@ -0,0 +1,199 @@ +%% +%% This is file `pdfescape-test1.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfescape.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 pdfescape.dtx +%% and the derived files +%% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, +%% pdfescape-test1.tex, pdfescape-test2.tex, +%% pdfescape-test3.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\makeatletter +\ProvidesFile{pdfescape-test1.tex}% + [2006/02/25 v1.1 Test with \string\pdfescape... commands] +\@ifundefined{pdfescapehex}{% + \PackageError{pdfescape-test1}{% + Missing \string\pdfescape... commands% + }{Test aborted.}% + \stop +}{} +\RequirePackage{qstest} +\IncludeTests{*} +\LogTests{lgout}{*}{*} + +\newcommand*{\ExpectVar}[2]{% + \Expect*{\ifx#1#2true\else false\fi}{true}% +} + +\makeatletter + +\begingroup + \makeatletter + \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}{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} + +\stop +\endinput +%% +%% End of file `pdfescape-test1.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex new file mode 100644 index 00000000000..631e832f6ce --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex @@ -0,0 +1,203 @@ +%% +%% This is file `pdfescape-test2.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfescape.dtx (with options: `test2') +%% +%% 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. +%% +\NeedsTeXFormat{LaTeX2e} +\makeatletter +\ProvidesFile{pdfescape-test2.tex}% + [2006/02/25 v1.1 Test without \string\pdfescape..., with e-TeX] +\let\pdfescapehex\@undefined +\let\pdfunescapehex\@undefined +\let\pdfescapename\@undefined +\let\pdfescapestring\@undefined +\@ifundefined{numexpr}{% + \PackageError{pdfescape-test2}{% + Missing \eTeX + }{Test aborted.}% + \stop +}{} +\RequirePackage{qstest} +\IncludeTests{*} +\LogTests{lgout}{*}{*} + +\newcommand*{\ExpectVar}[2]{% + \Expect*{\ifx#1#2true\else false\fi}{true}% +} + +\makeatletter + +\begingroup + \makeatletter + \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}{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} + +\stop +\endinput +%% +%% End of file `pdfescape-test2.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex new file mode 100644 index 00000000000..d2911c01dbf --- /dev/null +++ b/Master/texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex @@ -0,0 +1,203 @@ +%% +%% This is file `pdfescape-test3.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfescape.dtx (with options: `test3') +%% +%% 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. +%% +\NeedsTeXFormat{LaTeX2e} +\makeatletter +\ProvidesFile{pdfescape-test3.tex}% + [2006/02/25 v1.1 Test without \string\pdfescape... and e-TeX] +\let\pdfescapehex\@undefined +\let\pdfunescapehex\@undefined +\let\pdfescapename\@undefined +\let\pdfescapestring\@undefined +\RequirePackage{qstest} +\IncludeTests{*} +\LogTests{lgout}{*}{*} + +\newcommand*{\ExpectVar}[2]{% + \Expect*{\ifx#1#2true\else false\fi}{true}% +} + +\makeatletter + +\begingroup + \makeatletter + \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 + +\let\org@detokenize\detokenize +\let\detokenize\@undefined +\let\org@numexpr\numexpr +\let\numexpr\@undefined +\RequirePackage{pdfescape} +\let\detokenize\org@detokenize +\let\numexpr\org@numexpr + +\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}{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} + +\stop +\endinput +%% +%% End of file `pdfescape-test3.tex'. diff --git a/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf b/Master/texmf-dist/doc/latex/oberdiek/pdfescape.pdf Binary files differnew file mode 100644 index 00000000000..c02cff90a21 --- /dev/null +++ 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 83c15d9f3c0..02fc73cbdff 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/picture.pdf b/Master/texmf-dist/doc/latex/oberdiek/picture.pdf Binary files differindex 89e369d97c4..532a4825ed2 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 bacf4a234d9..546e0afc99f 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 f840c4b9ff9..4a8c77bdffe 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/setouterhbox.pdf b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf Binary files differindex 715f69b3cba..6e13e1639fb 100644 --- a/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf +++ b/Master/texmf-dist/doc/latex/oberdiek/setouterhbox.pdf diff --git a/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf b/Master/texmf-dist/doc/latex/oberdiek/settobox.pdf Binary files differindex c792c2536c5..bc1c55d42be 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/stackrel.pdf b/Master/texmf-dist/doc/latex/oberdiek/stackrel.pdf Binary files differindex 5caeee51dc3..5940fbc8aa4 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/tabularht.pdf b/Master/texmf-dist/doc/latex/oberdiek/tabularht.pdf Binary files differindex 366161e2d58..5c95f5ed022 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 76b2d662fd2..a34f660e4ba 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 63c40b86983..8865972be27 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/transparent.pdf b/Master/texmf-dist/doc/latex/oberdiek/transparent.pdf Binary files differindex a3fcc4acf7c..f83974f4873 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 7c909de6496..aa02b4a4466 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 2488d1ae33d..8cd913659f5 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/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx index 4b754fb8c24..379880c333a 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx @@ -72,7 +72,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bookmark 2007/02/20 v0.2 PDF bookmarks (HO)} +\Msg{* Package: bookmark 2007/02/22 v0.4 PDF bookmarks (HO)} \Msg{************************************************************************} \keepsilent @@ -140,7 +140,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bookmark.drv}% - [2007/02/20 v0.2 PDF bookmarks (HO)] + [2007/02/22 v0.4 PDF bookmarks (HO)] \documentclass{ltxdoc} \usepackage{holtxdoc} \begin{document} @@ -170,7 +170,7 @@ and the derived files % \GetFileInfo{bookmark.drv} % % \title{The \xpackage{bookmark} package} -% \date{2007/02/20 v0.2} +% \date{2007/02/22 v0.4} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -335,7 +335,7 @@ and the derived files % \item[\xoption{startatroot}:] % At this time the bookmark tree starts at the top level again. % The next bookmark entry is not sorted as child to a previous entry. -% Example szenario: A document uses part. However there are +% Example scenario: A document uses part. However there are % last chapters that should not be put below the last part: % \begin{quote} %\begin{verbatim} @@ -393,9 +393,6 @@ and the derived files % \begin{itemize} % \item Support for missing drivers (V\TeX, \dots). % \item Support for missing actions (Launch, \dots). -% \item Replacements for \cs{pdfescapehex}, \cs{pdfescapestring}, -% \dots\ for other \TeX\ engines than pdf\TeX. -% \item \xpackage{hyperref}'s \xoption{bookmarkstype}. % \item Adding bookmarks at the end of the document % is difficult for \xoption{dvipdfm}, because the \cs{special} % must go into a page. The problem can be solved by two runs @@ -512,30 +509,34 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2007/02/20 v0.2 PDF bookmarks (HO)] + [2007/02/22 v0.4 PDF bookmarks (HO)] % \end{macrocode} % % \subsubsection{Requirements} % % \begin{macrocode} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax - \PackageWarningNoLine{bookmark}{% - Some features of pdfTeX 1.30 are missing that\MessageBreak - protect some arguments. Replacements for these\MessageBreak - features are not implemented. Thus the pdf file\MessageBreak - can become invalid or the .aux file breaks% - }% - \let\BKM@escapename\@firstofone - \let\BKM@escapestring\@firstofone - \let\BKM@escapehex\@firstofone - \let\BKM@unescapehex\@firstofone -\else - \let\BKM@escapename\pdfescapename - \let\BKM@escapestring\pdfescapestring - \let\BKM@escapehex\pdfescapehex - \let\BKM@unescapehex\pdfunescapehex -\fi +\RequirePackage{pdfescape}% +\def\BKM@EscapeName#1{% + \ifx#1\@empty + \else + \EdefEscapeName#1#1% + \fi +}% +\def\BKM@EscapeString#1{% + \ifx#1\@empty + \else + \EdefEscapeString#1#1% + \fi +}% +\def\BKM@EscapeHex#1{% + \ifx#1\@empty + \else + \EdefEscapeHex#1#1% + \fi +}% +\def\BKM@UnescapeHex#1{% + \EdefUnescapeHex#1#1% +}% % \end{macrocode} % % \paragraph{Packages.} @@ -915,18 +916,21 @@ and the derived files \renewcommand*{\Hy@writebookmark}[5]{% \ifnum#4>\Hy@bookmarksdepth\relax \else - \begingroup - \ifHy@bookmarksnumbered - \let\numberline\Hy@numberline - \let\partnumberline\Hy@numberline - \let\chapternumberline\Hy@numberline - \else - \let\numberline\@gobble - \let\partnumberline\@gobble - \let\chapternumberline\@gobble - \fi - \bookmark[level=#4,dest={#3}]{#2}% - \endgroup + \def\BKM@type{#5}% + \ifx\BKM@type\Hy@bookmarkstype + \begingroup + \ifHy@bookmarksnumbered + \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline + \else + \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble + \fi + \bookmark[level=#4,dest={#3}]{#2}% + \endgroup + \fi \fi } % \end{macrocode} @@ -945,7 +949,7 @@ and the derived files %<*dvipdfm> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2007/02/20 v0.2 bookmark driver for dvipdfm (HO)] + [2007/02/22 v0.4 bookmark driver for dvipdfm (HO)] % \end{macrocode} % % \begin{macrocode} @@ -1012,10 +1016,11 @@ and the derived files \edef\BKM@action{/Dest[@page\BKM@page/\BKM@view]}% \fi \else + \BKM@EscapeString\BKM@uri \edef\BKM@action{% /A<<% /S/URI% - /URI(\BKM@escapestring{\BKM@uri})% + /URI(\BKM@uri)% >>% }% \fi @@ -1023,15 +1028,17 @@ and the derived files \edef\BKM@action{/A<<\BKM@rawaction>>}% \fi \else + \BKM@EscapeName\BKM@named \edef\BKM@action{% - /A<</S/Named/N/\BKM@escapename{\BKM@named}>>% + /A<</S/Named/N/\BKM@named>>% }% \fi \else + \BKM@EscapeString\BKM@dest \edef\BKM@action{% /A<<% /S/GoTo% - /D(\BKM@escapestring{\BKM@dest})% + /D(\BKM@dest)% >>% }% \fi @@ -1047,12 +1054,14 @@ and the derived files \fi \edef\BKM@action{/D[\BKM@page/\BKM@view]}% \else - \edef\BKM@action{/D(\BKM@escapestring{\BKM@dest})}% + \BKM@EscapeString\BKM@dest + \edef\BKM@action{/D(\BKM@dest)}% \fi + \BKM@EscapeString\BKM@gotor \edef\BKM@action{% /A<<% /S/GoToR% - /F(\BKM@escapestring{\BKM@gotor})% + /F(\BKM@gotor)% \BKM@action >>% }% @@ -1093,14 +1102,15 @@ and the derived files %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2007/02/20 v0.2 bookmark driver for pdftex (HO)] + [2007/02/22 v0.4 bookmark driver for pdftex (HO)] % \end{macrocode} % % \begin{macrocode} \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% - \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \def\BKM@DO@title{#2}% + \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty \let\BKM@attr\@empty @@ -1132,24 +1142,29 @@ and the derived files \edef\BKM@action{goto page\BKM@DO@page{/\BKM@DO@view}}% \fi \else - \edef\BKM@action{user{<</S/URI/URI(% - \BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})>>}}% + \BKM@UnescapeHex\BKM@DO@uri + \BKM@EscapeString\BKM@DO@uri + \edef\BKM@action{user{<</S/URI/URI(\BKM@DO@uri)>>}}% \fi \else + \BKM@UnescapeHex\BKM@DO@rawaction \edef\BKM@action{% user{% <<% - \BKM@unescapehex{\BKM@DO@rawaction}% + \BKM@DO@rawaction >>% }% }% \fi \else + \BKM@EscapeName\BKM@DO@named \edef\BKM@action{% - user{<</S/Named/N/\BKM@escapename{\BKM@DO@named}>>}% + user{<</S/Named/N/\BKM@DO@named>>}% }% \fi \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{goto name{\BKM@DO@dest}}% \fi \else @@ -1164,13 +1179,17 @@ and the derived files \fi \edef\BKM@action{/D[\BKM@DO@page/\BKM@DO@view]}% \else - \edef\BKM@action{/D(\BKM@escapestring{\BKM@DO@dest})}% + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest + \edef\BKM@action{/D(\BKM@DO@dest)}% \fi + \BKM@UnescapeHex\BKM@DO@gotor + \BKM@EscapeString\BKM@DO@gotor \edef\BKM@action{% user{% <<% /S/GoToR% - /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + /F(\BKM@DO@gotor)% \BKM@action >>% }% @@ -1193,7 +1212,7 @@ and the derived files %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2007/02/20 v0.2 bookmark driver for dvips (HO)] + [2007/02/22 v0.4 bookmark driver for dvips (HO)] % \end{macrocode} % % \begin{macrocode} @@ -1231,7 +1250,8 @@ and the derived files \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% - \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \def\BKM@DO@title{#2}% + \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty \let\BKM@attr\@empty @@ -1267,32 +1287,38 @@ and the derived files }% \fi \else + \BKM@UnescapeHex\BKM@DO@uri + \BKM@EscapeString\BKM@DO@uri \edef\BKM@action{% /Action<<% /Subtype/URI% - /URI(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})% + /URI(\BKM@DO@uri)% >>% }% \fi \else + \BKM@UnescapeHex\BKM@DO@rawaction \edef\BKM@action{% /Action<<% - \BKM@unescapehex{\BKM@DO@rawaction}% + \BKM@DO@rawaction >>% }% \fi \else + \BKM@EscapeName\BKM@DO@named \edef\BKM@action{% /Action<<% /Subtype/Named% - /N/\BKM@escapename{\BKM@DO@named}% + /N/\BKM@DO@named >>% }% \fi \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{% /Action/GoTo% - /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + /Dest(\BKM@DO@dest)cvn% }% \fi \else @@ -1308,13 +1334,17 @@ and the derived files /View[/\BKM@DO@view]% }% \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{% - /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + /Dest(\BKM@DO@dest)cvn% }% \fi + \BKM@UnescapeHex\BKM@DO@gotor + \BKM@EscapeString\BKM@DO@gotor \edef\BKM@action{% /Action/GoToR% - /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + /F(\BKM@DO@gotor)% \BKM@action }% \fi @@ -1406,6 +1436,11 @@ and the derived files }% \pdfstringdef\BKM@title{#2}% \edef\BKM@FLAGS{\printflags{BKM@style}}% + \BKM@EscapeHex\BKM@dest + \BKM@EscapeHex\BKM@uri + \BKM@EscapeHex\BKM@gotor + \BKM@EscapeHex\BKM@rawaction + \BKM@EscapeHex\BKM@title \immediate\write\@mainaux{% \string\BKM@entry{% id=\number\BKM@id @@ -1414,42 +1449,18 @@ and the derived files ,open% \fi \fi - \ifx\BKM@dest\@empty - \else - ,dest={\BKM@dest}% - \fi - \ifx\BKM@named\@empty - \else - ,named={\BKM@named}% - \fi - \ifx\BKM@uri\@empty - \else - ,uri={\BKM@escapehex{\BKM@uri}}% - \fi - \ifx\BKM@gotor\@empty - \else - ,gotor={\BKM@escapehex{\BKM@gotor}}% - \fi - \ifx\BKM@page\@empty - \else - ,page=\BKM@page - \fi - \ifx\BKM@view\@empty - \else - ,view={\BKM@view}% - \fi - \ifx\BKM@rawaction\@empty - \else - ,rawaction={\BKM@escapehex{\BKM@rawaction}}% - \fi + \BKM@auxentry{dest}% + \BKM@auxentry{named}% + \BKM@auxentry{uri}% + \BKM@auxentry{gotor}% + \BKM@auxentry{page}% + \BKM@auxentry{view}% + \BKM@auxentry{rawaction}% + \BKM@auxentry{color}% \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi - \ifx\BKM@color\@empty - \else - ,color={\BKM@color}% - \fi - }{\BKM@escapehex{\BKM@title}}% + }{\BKM@title}% }% \endgroup \fi @@ -1462,6 +1473,14 @@ and the derived files \def\BKM@x@childs{#3}% } % \end{macrocode} +% \begin{macrocode} +\def\BKM@auxentry#1{% + \expandafter\ifx\csname BKM@#1\endcsname\@empty + \else + ,#1={\csname BKM@#1\endcsname}% + \fi +} +% \end{macrocode} % % \subsubsection{Read auxiliary data} % @@ -1598,6 +1617,15 @@ and the derived files % Dummies for \cs{pdf(un)escape...} commands added to get % the package basically work for non-pdfTeX users. % \end{Version} +% \begin{Version}{2007/02/21 v0.3} +% \item +% Dependency from \pdfTeX\ 1.30 removed by using package +% \xpackage{pdfescape}. +% \end{Version} +% \begin{Version}{2007/02/22 v0.4} +% \item +% \xpackage{hyperref}'s \xoption{bookmarkstype} respected. +% \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 3b5b50ed0b3..cfe919f8a15 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx @@ -164,11 +164,11 @@ and the derived files % \maketitle % % \begin{abstract} -% This package looks for pdfTeX in pdf mode and +% This package looks for \pdfTeX\ in pdf mode and % implements and sets the switch \cs{ifpdf}. % The detection is based on \cs{pdfoutput} and % the package will not change this value. -% It works with plain or LaTeX formats. +% It works with plain or \LaTeX\ formats. % \end{abstract} % % \tableofcontents diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index ea36f41af75..243421cb946 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/02/20 +% 2007/02/25 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -54,6 +54,7 @@ \batchinput{pdfcolfoot.dtx} \batchinput{pdfcolmk.dtx} \batchinput{pdfcrypt.dtx} +\batchinput{pdfescape.dtx} \batchinput{pdflscape.dtx} \batchinput{picture.dtx} \batchinput{pmboxdraw.dtx} diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 4d3be05b283..f02495aeaaa 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/02/20} +\newcommand*{\Date}{2007/02/25} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -76,6 +76,7 @@ \providecommand*{\pdfTeX}{pdf\TeX} \providecommand*{\VTeX}{V\TeX} +\providecommand*{\eTeX}{$\csname m@th\endcsname\varepsilon$-\TeX} \newcommand*{\xpackage}[1]{\textsf{#1}} \newcommand*{\xfile}[1]{\textsf{#1}} \newcommand*{\xoption}[1]{\textsf{#1}} @@ -164,7 +165,7 @@ [\entrysep] \entry{bmpsize}{2007/02/18}{1.1}{Extract size and resolution data from bitmap files}% [\entrysep] -\entry{bookmark}{2007/02/20}{0.2}{PDF bookmarks}% +\entry{bookmark}{2007/02/22}{0.4}{PDF bookmarks}% [\entrysep] \entry{centernot}{2006/12/02}{1.0}{Centers the not symbol horizontally}% [\entrysep] @@ -218,6 +219,8 @@ [\entrysep] \entry{pdfcrypt}{2006/02/20}{0.8}{Setting pdf encryption}% [\entrysep] +\entry{pdfescape}{2006/02/25}{1.1}{Provides hex, PDF name and string conversions}% +[\entrysep] \entry{pdflscape}{2006/04/24}{0.6}{Landscape pages in PDF}% [\entrysep] \entry{picture}{2006/08/26}{1.0}{Dimens for picture macros}% @@ -486,11 +489,11 @@ on the options \xoption{draft} and \xoption{final}. \subsection{\pkgsectformat{ifpdf}} \label{ifpdf} \begin{abstract} -This package looks for pdfTeX in pdf mode and +This package looks for \pdfTeX\ in pdf mode and implements and sets the switch \cs{ifpdf}. The detection is based on \cs{pdfoutput} and the package will not change this value. -It works with plain or LaTeX formats. +It works with plain or \LaTeX\ formats. \end{abstract} \tocinclude{ifpdf} @@ -582,6 +585,16 @@ for \VTeX\ and some older versions of \pdfTeX. \tocinclude{pdfcrypt} \newpage +\subsection{\pkgsectformat{pdfescape}} +\label{pdfescape} +\begin{abstract} +This package implements \pdfTeX's escape features +(\cs{pdfescapehex}, \cs{pdfunescapehex}, \cs{pdfescapename}, +\cs{pdfescapestring}) using \TeX\ or \eTeX. +\end{abstract} +\tocinclude{pdfescape} + +\newpage \subsection{\pkgsectformat{pdflscape}} \label{pdflscape} \begin{abstract} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx new file mode 100644 index 00000000000..0f4cd5ff633 --- /dev/null +++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx @@ -0,0 +1,1151 @@ +% \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 pdfescape.dtx +% and the derived files +% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, +% pdfescape-test1.tex, pdfescape-test2.tex, +% pdfescape-test3.tex. +% +% Distribution: +% CTAN:macros/latex/contrib/oberdiek/pdfescape.dtx +% CTAN:macros/latex/contrib/oberdiek/pdfescape.pdf +% +% Unpacking: +% (a) If pdfescape.ins is present: +% tex pdfescape.ins +% (b) Without pdfescape.ins: +% tex pdfescape.dtx +% (c) If you insist on using LaTeX +% latex \let\install=y\input{pdfescape.dtx} +% (quote the arguments according to the demands of your shell) +% +% Documentation: +% (a) If pdfescape.drv is present: +% latex pdfescape.drv +% (b) Without pdfescape.drv: +% latex pdfescape.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 pdfescape.dtx +% makeindex -s gind.ist pdfescape.idx +% pdflatex pdfescape.dtx +% makeindex -s gind.ist pdfescape.idx +% pdflatex pdfescape.dtx +% +% Installation: +% TDS:tex/generic/oberdiek/pdfescape.sty +% TDS:doc/latex/oberdiek/pdfescape.pdf +% TDS:doc/latex/oberdiek/pdfescape-test1.tex +% TDS:doc/latex/oberdiek/pdfescape-test2.tex +% TDS:doc/latex/oberdiek/pdfescape-test3.tex +% TDS:source/latex/oberdiek/pdfescape.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: pdfescape 2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\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 pdfescape.dtx +and the derived files + pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, + pdfescape-test1.tex, pdfescape-test2.tex, + pdfescape-test3.tex. + +\endpreamble + +\generate{% + \file{pdfescape.ins}{\from{pdfescape.dtx}{install}}% + \file{pdfescape.drv}{\from{pdfescape.dtx}{driver}}% + \usedir{tex/generic/oberdiek}% + \file{pdfescape.sty}{\from{pdfescape.dtx}{package}}% + \usedir{doc/latex/oberdiek}% + \file{pdfescape-test1.tex}{\from{pdfescape.dtx}{test1}}% + \file{pdfescape-test2.tex}{\from{pdfescape.dtx}{test2}}% + \file{pdfescape-test3.tex}{\from{pdfescape.dtx}{test3}}% +} + +\obeyspaces +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* pdfescape.sty} +\Msg{*} +\Msg{* To produce the documentation run the file `pdfescape.drv'} +\Msg{* through LaTeX.} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +%</install> +%<*ignore> +\fi +%</ignore> +%<*driver> +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{pdfescape.drv}% + [2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)] +\documentclass{ltxdoc} +\usepackage{holtxdoc} +\begin{document} + \DocInput{pdfescape.dtx} +\end{document} +%</driver> +% \fi +% +% \CheckSum{1075} +% +% \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{pdfescape.drv} +% +% \title{The \xpackage{pdfescape} package} +% \date{2006/02/25 v1.1} +% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} +% +% \maketitle +% +% \begin{abstract} +% This package implements \pdfTeX's escape features +% (\cs{pdfescapehex}, \cs{pdfunescapehex}, \cs{pdfescapename}, +% \cs{pdfescapestring}) using \TeX\ or \eTeX. +% \end{abstract} +% +% \tableofcontents +% +% \section{Documentation} +% +% \begin{declcs}{EdefEscapeHex} \M{cmd} \M{string}\\ +% \cs{EdefUnescapeHex} \M{cmd} \M{string}\\ +% \cs{EdefEscapeName} \M{cmd} \M{string}\\ +% \cs{EdefEscapeString} \M{cmd} \M{string} +% \end{declcs} +% These commands converts \meta{string} and stores the result +% in macro \meta{cmd}. The conversion result is the same +% as the conversion of the corresponding \pdfTeX's primitives. +% Note that the argument \meta{string} is expanded before +% the conversion. +% +% For example, if \pdfTeX\ >= 1.30 is present, then \cs{EdefEscapeHex} +% becomes to: +% \begin{quote} +%\begin{verbatim} +%\def\EdefEscapeHex#1#2{% +% \edef#1{\pdfescapehex{#2}}% +%} +%\end{verbatim} +% \end{quote} +% The package provides implementations for the case that \pdfTeX\ is +% not present (or too old). Even \eTeX\ can be missing, however it is +% used if it is detected. +% +% \paragraph{Babel.} +% The input strings may contain shorthand characters of package +% \xpackage{babel}. +% +% \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 + \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname + \ifcase 0% + \ifx\x\relax % plain + \else + \ifx\x\empty % LaTeX + \else + 1% + \fi + \fi + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pdfescape}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +% \end{macrocode} +% Package identification: +% \begin{macrocode} +\begingroup + \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@pdfescape.sty\endcsname +\ProvidesPackage{pdfescape}% + [2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)] +% \end{macrocode} +% +% \subsection{Preparations} +% +% \subsubsection{Catcodes} +% +% \begin{macrocode} +\expandafter\edef\csname PE@AtEnd\endcsname{% + \catcode64 \the\catcode64\relax +} +\catcode64 11 % @ +\def\PE@EnsureCode#1#2#3{% + \edef\PE@AtEnd{% + \PE@AtEnd + #1#2 \the#1#2\relax + }% + #1#2 #3\relax +} +\PE@EnsureCode\catcode{0}{12}% ^^@ +\PE@EnsureCode\catcode{34}{12}% " +\PE@EnsureCode\catcode{42}{12}% * +\PE@EnsureCode\catcode{45}{12}% - +\PE@EnsureCode\catcode{46}{12}% . +\PE@EnsureCode\catcode{60}{12}% < +\PE@EnsureCode\catcode{61}{12}% = +\PE@EnsureCode\catcode{62}{12}% > +\PE@EnsureCode\catcode{94}{7}% ^ +\PE@EnsureCode\catcode{96}{12}% ` +\PE@EnsureCode\uccode{34}{0}% " +\PE@EnsureCode\uccode{48}{0}% 0 +\PE@EnsureCode\uccode{61}{0}% = +% \end{macrocode} +% +% \subsection{User macros} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapehex\endcsname\relax +% \end{macrocode} +% +% \begin{macro}{\EdefEscapeHex} +% \begin{macrocode} + \long\def\EdefEscapeHex#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeHex#1% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefUnescapeHex} +% \begin{macrocode} + \def\EdefUnescapeHex#1#2{% + \PE@sanitize#1{#2}% + \PE@UnescapeHex#1% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefEscapeName} +% \begin{macrocode} + \long\def\EdefEscapeName#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeName#1% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefEscapeString} +% \begin{macrocode} + \long\def\EdefEscapeString#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeString#1% + }% +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\else +% \end{macrocode} +% +% \begin{macro}{\PE@edefbabel} +% Help macro that adds support for \xpackage{babel}'s shorthand +% characters. +% \begin{macrocode} +\long\def\PE@edefbabel#1#2#3{% + \begingroup + \csname @save@activestrue\endcsname + \edef#1{#2{#3}}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\EdefEscapeHex} +% \begin{macrocode} + \long\def\EdefEscapeHex#1#2{% + \PE@edefbabel#1\pdfescapehex{#2}% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefUnescapeHex} +% \begin{macrocode} + \def\EdefUnescapeHex#1#2{% + \PE@edefbabel#1\pdfunescapehex{#2}% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefEscapeName} +% \begin{macrocode} + \long\def\EdefEscapeName#1#2{% + \PE@edefbabel#1\pdfescapename{#2}% + }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\EdefEscapeString} +% \begin{macrocode} + \long\def\EdefEscapeString#1#2{% + \PE@edefbabel#1\pdfescapestring{#2}% + }% +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} + \PE@AtEnd + \expandafter\endinput +\fi +% \end{macrocode} +% +% \subsection{Help macros} +% +% \subsubsection{Characters} +% +% Special characters with catcode 12 (other) are created and +% stored in macros. +% \begin{macro}{\PE@hash} +% \begin{macrocode} +\edef\PE@hash{\string#} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@space@other} +% \begin{macrocode} +\begingroup + \catcode`\ =12\relax% +\def\x{\endgroup\def\PE@space@other{ }}\x\relax +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@space@space} +% \begin{macrocode} +\def\PE@space@space{ } +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@backslash} +% \begin{macrocode} +\begingroup + \long\def\@gobble#1{}% + \escapechar=92 % +\edef\x{\endgroup + \def\noexpand\PE@backslash{\expandafter\@gobble\string\\}% +} +\x +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Switch for \eTeX} +% +% \begin{macrocode} +\newif\ifPE@etex +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\else + \PE@etextrue +\fi +% \end{macrocode} +% +% \subsection{Sanitizing} +% +% \begin{macro}{\PE@sanitize} +% Macro \cs{PE@sanitize} takes |#2|, entirely converts +% it to token with catcode 12 (other) and stores the +% result in macro |#1|. +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\PE@sanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \PE@onelevel@sanitize#1% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @onelevel@sanitize\endcsname\relax + \def\PE@onelevel@sanitize#1{% + \edef#1{\expandafter\PE@strip@prefix\meaning#1}% + }% + \def\PE@strip@prefix#1>{}% + \else + \let\PE@onelevel@sanitize\@onelevel@sanitize + \fi +\else + \long\def\PE@sanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \edef#1{\detokenize\expandafter{#1}}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\PE@SpaceToOther} +% \begin{macrocode} +\def\PE@SpaceToOther#1 #2\relax{% + #1% + \ifx\\#2\\% + \else + \PE@space@other + \@ReturnAfterFi{% + \PE@SpaceToOther#2\relax + }% + \fi +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@ReturnAfterFi} +% \begin{macrocode} +\long\def\@ReturnAfterFi#1\fi{\fi#1} +% \end{macrocode} +% \end{macro} +% +% \subsection{Conversions} +% +% \subsubsection{Conversion to hex string} +% +% \begin{macro}{\PE@EscapeHex} +% \begin{macrocode} +\ifPE@etex + \def\PE@EscapeHex#1{% + \edef#1{\expandafter\PE@ToHex#1\relax}% + }% +\else + \def\PE@EscapeHex#1{% + \def\PE@result{}% + \expandafter\PE@ToHex#1\relax + \let#1\PE@result + }% +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@ToHex} +% \begin{macrocode} +\def\PE@ToHex#1{% + \ifx\relax#1% + \else + \PE@HexChar{#1}% + \expandafter\PE@ToHex + \fi +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@HexChar} +% \begin{macrocode} +\ifPE@etex + \def\PE@HexChar#1{% + \PE@HexDigit{\numexpr\dimexpr.0625\dimexpr`#1sp\relax\relax\relax}% + \PE@HexDigit{% + \numexpr`#1-16*\dimexpr.0625\dimexpr`#1sp\relax\relax\relax + }% + }% +\else + \def\PE@HexChar#1{% + \dimen0=`#1sp% + \dimen2=.0625\dimen0 % + \advance\dimen0-16\dimen2 % + \edef\PE@result{% + \PE@result + \PE@HexDigit{\dimen2 }% + \PE@HexDigit{\dimen0 }% + }% + }% +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@HexDigit} +% \begin{macrocode} +\def\PE@HexDigit#1{% + \expandafter\string + \ifcase#1% + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or + A\or B\or C\or D\or E\or F% + \fi +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Character code to octal number} +% +% \begin{macro}{\PE@OctChar} +% \begin{macrocode} +\ifPE@etex + \def\PE@OctChar#1{% + \expandafter\PE@@OctChar + \the\numexpr\dimexpr.015625\dimexpr`#1sp\relax\relax + \expandafter\relax + \expandafter\relax + \the\numexpr\dimexpr.125\dimexpr`#1sp\relax\relax\relax + \relax + #1% + }% + \def\PE@@OctChar#1\relax#2\relax#3{% + \PE@backslash + #1% + \the\numexpr#2-8*#1\relax + \the\numexpr\dimexpr`#3sp\relax-8*#2\relax + }% +\else + \def\PE@OctChar#1{% + \dimen0=`#1sp% + \dimen2=.125\dimen0 % + \dimen4=.125\dimen2 % + \advance\dimen0-8\dimen2 % + \advance\dimen2-8\dimen4 % + \edef\PE@result{% + \PE@result + \PE@backslash + \number\dimen4 % + \number\dimen2 % + \number\dimen0 % + }% + }% +\fi +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Unpack hex string} +% +% \begin{macro}{\PE@UnescapeHex} +% \begin{macrocode} +\def\PE@UnescapeHex#1{% + \begingroup + \def\PE@result{}% + \expandafter\PE@DeHex#1\relax\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@DeHex} +% \begin{macrocode} +\def\PE@DeHex#1#2{% + \ifx#2\relax + \ifx#1\relax + \else + \PE@DeHex#10\relax\relax + \fi + \else + \uppercase{\lccode0="#1#2}\relax + \ifnum\lccode0=32 % + \edef\PE@result{\PE@result\PE@space@space}% + \else + \lowercase{\def\PE@temp{^^@}}% + \edef\PE@result{\PE@result\PE@temp}% + \fi + \expandafter\PE@DeHex + \fi +} +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Conversion to PDF name} +% +% \begin{macro}{\PE@EscapeName} +% \begin{macrocode} +\ifPE@etex + \def\PE@EscapeName#1{% + \edef#1{\expandafter\PE@EscapeNameTokens#1\relax}% + }% +\else + \def\PE@EscapeName#1{% + \def\PE@result{}% + \expandafter\PE@EscapeNameTokens#1\relax + \let#1\PE@result + }% +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@EscapeNameTokens} +% \begin{macrocode} +\def\PE@EscapeNameTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \ifcase`#1 % + % drop illegal zero + \else + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \fi + \else + \ifnum`#1>126 % + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \else \ifnum`#1=35 \PE@EscapeNameHashChar 23% # + \else\ifnum`#1=37 \PE@EscapeNameHashChar 25% % + \else\ifnum`#1=40 \PE@EscapeNameHashChar 28% ( + \else\ifnum`#1=41 \PE@EscapeNameHashChar 29% ) + \else\ifnum`#1=47 \PE@EscapeNameHashChar 2F% / + \else\ifnum`#1=60 \PE@EscapeNameHashChar 3C% < + \else\ifnum`#1=62 \PE@EscapeNameHashChar 3E% > + \else\ifnum`#1=91 \PE@EscapeNameHashChar 5B% [ + \else\ifnum`#1=93 \PE@EscapeNameHashChar 5D% ] + \else\ifnum`#1=123 \PE@EscapeNameHashChar 7B% { + \else\ifnum`#1=125 \PE@EscapeNameHashChar 7D% } + \else + \PE@EscapeNameAdd{#1}% + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeNameTokens + \fi +}% +\def\PE@EscapeNameHashChar#1#2{% + \PE@EscapeNameAdd{\PE@hash\string#1\string#2}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@EscapeNameAdd} +% \begin{macrocode} +\ifPE@etex + \def\PE@EscapeNameAdd#1{#1}% +\else + \def\PE@EscapeNameAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +% \end{macrocode} +% \end{macro} +% +% \subsubsection{Conversion to PDF string} +% +% \begin{macro}{\PE@EscapeString} +% \begin{macrocode} +\ifPE@etex + \def\PE@EscapeString#1{% + \edef#1{\expandafter\PE@EscapeStringTokens#1\relax}% + }% +\else + \def\PE@EscapeString#1{% + \begingroup + \def\PE@result{}% + \expandafter\PE@EscapeStringTokens#1\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% + }% +\fi +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@EscapeStringTokens} +% \begin{macrocode} +\def\PE@EscapeStringTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \PE@OctChar#1% + \else + \ifnum`#1>126 % + \PE@OctChar#1% + \else \ifnum`#1=40 \PE@EscapeStringAdd{\string\(}% ( + \else\ifnum`#1=41 \PE@EscapeStringAdd{\string\)}% ) + \else\ifnum`#1=92 \PE@EscapeStringAdd{\string\\}% \ + \else + \PE@EscapeStringAdd{#1}% + \fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeStringTokens + \fi +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PE@EscapeStringAdd} +% \begin{macrocode} +\ifPE@etex + \def\PE@EscapeStringAdd#1{#1}% +\else + \def\PE@EscapeStringAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\PE@AtEnd +% \end{macrocode} +% +% \begin{macrocode} +%</package> +% \end{macrocode} +% +% \section{Test} +% +% \begin{macrocode} +%<*test1|test2|test3> +\NeedsTeXFormat{LaTeX2e} +\makeatletter +% \end{macrocode} +% +% \subsection{Test with \cs{pdfescape...} commands} +% +% \begin{macrocode} +%<*test1> +\ProvidesFile{pdfescape-test1.tex}% + [2006/02/25 v1.1 Test with \string\pdfescape... commands] +%</test1> +% \end{macrocode} +% +% \subsection{Test without \cs{pdfescape...}, with \eTeX} +% +% \begin{macrocode} +%<*test2> +\ProvidesFile{pdfescape-test2.tex}% + [2006/02/25 v1.1 Test without \string\pdfescape..., with e-TeX] +%</test2> +% \end{macrocode} +% +% \subsection{Test without \cs{pdfescape...} and \eTeX} +% +% \begin{macrocode} +%<*test3> +\ProvidesFile{pdfescape-test3.tex}% + [2006/02/25 v1.1 Test without \string\pdfescape... and e-TeX] +%</test3> +% \end{macrocode} +% +% \subsection{Check/ensure test preconditions} +% +% \subsubsection{Check \cs{pdfescape...}} +% +% \begin{macrocode} +%<*test1> +\@ifundefined{pdfescapehex}{% + \PackageError{pdfescape-test1}{% + Missing \string\pdfescape... commands% + }{Test aborted.}% + \stop +}{} +%</test1> +% \end{macrocode} +% \begin{macrocode} +%<*test2|test3> +\let\pdfescapehex\@undefined +\let\pdfunescapehex\@undefined +\let\pdfescapename\@undefined +\let\pdfescapestring\@undefined +%</test2|test3> +% \end{macrocode} +% +% \subsubsection{Check \eTeX} +% +% \begin{macrocode} +%<*test2> +\@ifundefined{numexpr}{% + \PackageError{pdfescape-test2}{% + Missing \eTeX + }{Test aborted.}% + \stop +}{} +%</test2> +% \end{macrocode} +% Package \xpackage{qstest} uses \eTeX, thus \eTeX's features +% can only be disabled later during loading of package \xpackage{pdfescape}. +% +% \subsection{Common part} +% +% The files for testing uses the framework, provided by the +% new package \xpackage{qstest} of David Kastrup. +% \begin{macrocode} +\RequirePackage{qstest} +\IncludeTests{*} +\LogTests{lgout}{*}{*} + +\newcommand*{\ExpectVar}[2]{% + \Expect*{\ifx#1#2true\else false\fi}{true}% +} + +\makeatletter + + +\begingroup + \makeatletter + \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 + +%<*test3> +\let\org@detokenize\detokenize +\let\detokenize\@undefined +\let\org@numexpr\numexpr +\let\numexpr\@undefined +%</test3> +\RequirePackage{pdfescape} +%<*test3> +\let\detokenize\org@detokenize +\let\numexpr\org@numexpr +%</test3> + +\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}{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} + +\stop +% \end{macrocode} +% +% \begin{macrocode} +%</test1|test2|test3> +% \end{macrocode} +% \section{Installation} +% +% \paragraph{CTAN.} This package is available on +% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}: +% \begin{description} +% \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.dtx}] The source file. +% \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.pdf}] Documentation. +% \end{description} +% +% \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 pdfescape.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} +% \sbox0{^^A +% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}} +% pdfescape.sty & tex/generic/oberdiek/pdfescape.sty\\ +% pdfescape.pdf & doc/latex/oberdiek/pdfescape.pdf\\ +% pdfescape-test1.tex & doc/latex/oberdiek/pdfescape-test1.tex\\ +% pdfescape-test2.tex & doc/latex/oberdiek/pdfescape-test2.tex\\ +% pdfescape-test3.tex & doc/latex/oberdiek/pdfescape-test3.tex\\ +% pdfescape.dtx & source/latex/oberdiek/pdfescape.dtx\\ +% \end{tabular}^^A +% }% +% \ifdim\wd0>\linewidth +% \mbox{}\nobreak\hskip0pt minus\leftmargin +% \usebox0 +% \nobreak\hskip0pt minus\rightmargin +% \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. +% +% \paragraph{Refresh file databases.} If your \TeX~distribution +% (\teTeX, \mikTeX, \dots) rely on file 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 pdfescape.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{pdfescape.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 pdfescape.dtx +%makeindex -s gind.ist pdfescape.idx +%pdflatex pdfescape.dtx +%makeindex -s gind.ist pdfescape.idx +%pdflatex pdfescape.dtx +%\end{verbatim} +% \end{quote} +% +% \begin{History} +% \begin{Version}{2007/02/21 v1.0} +% \item +% First version. +% \end{Version} +% \begin{Version}{2007/02/25 v1.1} +% \item +% Test files added. +% \item +% \cs{EdefUnescapeHex} supports lowercase letters. +% \item +% Fix: \verb|\EdefEscapeName{^^@}| +% \item +% Fix: \verb|\EdefEscapeName{\string#}| +% \item +% Fix for \cs{EdefUnescapeHex} in case of incomplete hex string. +% \item +% Fix: \cs{EdefUnescapeHex} generates space tokens with catcode +% 10 (space) in all cases. +% \item +% Fix: \cs{EdefEscapeHex} and \cs{EdefEscapeName} now generate +% tokens with catcode 12 (other) only. +% \end{Version} +% \end{History} +% +% \PrintIndex +% +% \Finale +\endinput diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty new file mode 100644 index 00000000000..b573cc7984d --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -0,0 +1,399 @@ +%% +%% This is file `pdfescape.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdfescape.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 pdfescape.dtx +%% and the derived files +%% pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, +%% pdfescape-test1.tex, pdfescape-test2.tex, +%% pdfescape-test3.tex. +%% +\begingroup + \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname + \ifcase 0% + \ifx\x\relax % plain + \else + \ifx\x\empty % LaTeX + \else + 1% + \fi + \fi + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{pdfescape}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \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@pdfescape.sty\endcsname +\ProvidesPackage{pdfescape}% + [2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)] +\expandafter\edef\csname PE@AtEnd\endcsname{% + \catcode64 \the\catcode64\relax +} +\catcode64 11 % @ +\def\PE@EnsureCode#1#2#3{% + \edef\PE@AtEnd{% + \PE@AtEnd + #1#2 \the#1#2\relax + }% + #1#2 #3\relax +} +\PE@EnsureCode\catcode{0}{12}% ^^@ +\PE@EnsureCode\catcode{34}{12}% " +\PE@EnsureCode\catcode{42}{12}% * +\PE@EnsureCode\catcode{45}{12}% - +\PE@EnsureCode\catcode{46}{12}% . +\PE@EnsureCode\catcode{60}{12}% < +\PE@EnsureCode\catcode{61}{12}% = +\PE@EnsureCode\catcode{62}{12}% > +\PE@EnsureCode\catcode{94}{7}% ^ +\PE@EnsureCode\catcode{96}{12}% ` +\PE@EnsureCode\uccode{34}{0}% " +\PE@EnsureCode\uccode{48}{0}% 0 +\PE@EnsureCode\uccode{61}{0}% = +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapehex\endcsname\relax + \long\def\EdefEscapeHex#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeHex#1% + }% + \def\EdefUnescapeHex#1#2{% + \PE@sanitize#1{#2}% + \PE@UnescapeHex#1% + }% + \long\def\EdefEscapeName#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeName#1% + }% + \long\def\EdefEscapeString#1#2{% + \PE@sanitize#1{#2}% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@EscapeString#1% + }% +\else +\long\def\PE@edefbabel#1#2#3{% + \begingroup + \csname @save@activestrue\endcsname + \edef#1{#2{#3}}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% +} + \long\def\EdefEscapeHex#1#2{% + \PE@edefbabel#1\pdfescapehex{#2}% + }% + \def\EdefUnescapeHex#1#2{% + \PE@edefbabel#1\pdfunescapehex{#2}% + }% + \long\def\EdefEscapeName#1#2{% + \PE@edefbabel#1\pdfescapename{#2}% + }% + \long\def\EdefEscapeString#1#2{% + \PE@edefbabel#1\pdfescapestring{#2}% + }% + \PE@AtEnd + \expandafter\endinput +\fi +\edef\PE@hash{\string#} +\begingroup + \catcode`\ =12\relax% +\def\x{\endgroup\def\PE@space@other{ }}\x\relax +\def\PE@space@space{ } +\begingroup + \long\def\@gobble#1{}% + \escapechar=92 % +\edef\x{\endgroup + \def\noexpand\PE@backslash{\expandafter\@gobble\string\\}% +} +\x +\newif\ifPE@etex +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname numexpr\endcsname\relax +\else + \PE@etextrue +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname detokenize\endcsname\relax + \long\def\PE@sanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \PE@onelevel@sanitize#1% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname @onelevel@sanitize\endcsname\relax + \def\PE@onelevel@sanitize#1{% + \edef#1{\expandafter\PE@strip@prefix\meaning#1}% + }% + \def\PE@strip@prefix#1>{}% + \else + \let\PE@onelevel@sanitize\@onelevel@sanitize + \fi +\else + \long\def\PE@sanitize#1#2{% + \begingroup + \csname @safe@activestrue\endcsname + \edef#1{#2}% + \edef#1{\detokenize\expandafter{#1}}% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% +\fi +\def\PE@SpaceToOther#1 #2\relax{% + #1% + \ifx\\#2\\% + \else + \PE@space@other + \@ReturnAfterFi{% + \PE@SpaceToOther#2\relax + }% + \fi +} +\long\def\@ReturnAfterFi#1\fi{\fi#1} +\ifPE@etex + \def\PE@EscapeHex#1{% + \edef#1{\expandafter\PE@ToHex#1\relax}% + }% +\else + \def\PE@EscapeHex#1{% + \def\PE@result{}% + \expandafter\PE@ToHex#1\relax + \let#1\PE@result + }% +\fi +\def\PE@ToHex#1{% + \ifx\relax#1% + \else + \PE@HexChar{#1}% + \expandafter\PE@ToHex + \fi +}% +\ifPE@etex + \def\PE@HexChar#1{% + \PE@HexDigit{\numexpr\dimexpr.0625\dimexpr`#1sp\relax\relax\relax}% + \PE@HexDigit{% + \numexpr`#1-16*\dimexpr.0625\dimexpr`#1sp\relax\relax\relax + }% + }% +\else + \def\PE@HexChar#1{% + \dimen0=`#1sp% + \dimen2=.0625\dimen0 % + \advance\dimen0-16\dimen2 % + \edef\PE@result{% + \PE@result + \PE@HexDigit{\dimen2 }% + \PE@HexDigit{\dimen0 }% + }% + }% +\fi +\def\PE@HexDigit#1{% + \expandafter\string + \ifcase#1% + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or 8\or 9\or + A\or B\or C\or D\or E\or F% + \fi +} +\ifPE@etex + \def\PE@OctChar#1{% + \expandafter\PE@@OctChar + \the\numexpr\dimexpr.015625\dimexpr`#1sp\relax\relax + \expandafter\relax + \expandafter\relax + \the\numexpr\dimexpr.125\dimexpr`#1sp\relax\relax\relax + \relax + #1% + }% + \def\PE@@OctChar#1\relax#2\relax#3{% + \PE@backslash + #1% + \the\numexpr#2-8*#1\relax + \the\numexpr\dimexpr`#3sp\relax-8*#2\relax + }% +\else + \def\PE@OctChar#1{% + \dimen0=`#1sp% + \dimen2=.125\dimen0 % + \dimen4=.125\dimen2 % + \advance\dimen0-8\dimen2 % + \advance\dimen2-8\dimen4 % + \edef\PE@result{% + \PE@result + \PE@backslash + \number\dimen4 % + \number\dimen2 % + \number\dimen0 % + }% + }% +\fi +\def\PE@UnescapeHex#1{% + \begingroup + \def\PE@result{}% + \expandafter\PE@DeHex#1\relax\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% +} +\def\PE@DeHex#1#2{% + \ifx#2\relax + \ifx#1\relax + \else + \PE@DeHex#10\relax\relax + \fi + \else + \uppercase{\lccode0="#1#2}\relax + \ifnum\lccode0=32 % + \edef\PE@result{\PE@result\PE@space@space}% + \else + \lowercase{\def\PE@temp{^^@}}% + \edef\PE@result{\PE@result\PE@temp}% + \fi + \expandafter\PE@DeHex + \fi +} +\ifPE@etex + \def\PE@EscapeName#1{% + \edef#1{\expandafter\PE@EscapeNameTokens#1\relax}% + }% +\else + \def\PE@EscapeName#1{% + \def\PE@result{}% + \expandafter\PE@EscapeNameTokens#1\relax + \let#1\PE@result + }% +\fi +\def\PE@EscapeNameTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \ifcase`#1 % + % drop illegal zero + \else + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \fi + \else + \ifnum`#1>126 % + \PE@EscapeNameAdd\PE@hash + \PE@HexChar#1% + \else \ifnum`#1=35 \PE@EscapeNameHashChar 23% # + \else\ifnum`#1=37 \PE@EscapeNameHashChar 25% % + \else\ifnum`#1=40 \PE@EscapeNameHashChar 28% ( + \else\ifnum`#1=41 \PE@EscapeNameHashChar 29% ) + \else\ifnum`#1=47 \PE@EscapeNameHashChar 2F% / + \else\ifnum`#1=60 \PE@EscapeNameHashChar 3C% < + \else\ifnum`#1=62 \PE@EscapeNameHashChar 3E% > + \else\ifnum`#1=91 \PE@EscapeNameHashChar 5B% [ + \else\ifnum`#1=93 \PE@EscapeNameHashChar 5D% ] + \else\ifnum`#1=123 \PE@EscapeNameHashChar 7B% { + \else\ifnum`#1=125 \PE@EscapeNameHashChar 7D% } + \else + \PE@EscapeNameAdd{#1}% + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeNameTokens + \fi +}% +\def\PE@EscapeNameHashChar#1#2{% + \PE@EscapeNameAdd{\PE@hash\string#1\string#2}% +}% +\ifPE@etex + \def\PE@EscapeNameAdd#1{#1}% +\else + \def\PE@EscapeNameAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +\ifPE@etex + \def\PE@EscapeString#1{% + \edef#1{\expandafter\PE@EscapeStringTokens#1\relax}% + }% +\else + \def\PE@EscapeString#1{% + \begingroup + \def\PE@result{}% + \expandafter\PE@EscapeStringTokens#1\relax + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{\PE@result}% + }% +\fi +\def\PE@EscapeStringTokens#1{% + \ifx\relax#1% + \else + \ifnum`#1<33 % + \PE@OctChar#1% + \else + \ifnum`#1>126 % + \PE@OctChar#1% + \else \ifnum`#1=40 \PE@EscapeStringAdd{\string\(}% ( + \else\ifnum`#1=41 \PE@EscapeStringAdd{\string\)}% ) + \else\ifnum`#1=92 \PE@EscapeStringAdd{\string\\}% \ + \else + \PE@EscapeStringAdd{#1}% + \fi\fi\fi + \fi + \fi + \expandafter\PE@EscapeStringTokens + \fi +}% +\ifPE@etex + \def\PE@EscapeStringAdd#1{#1}% +\else + \def\PE@EscapeStringAdd#1{% + \edef\PE@result{% + \PE@result + #1% + }% + }% +\fi +\PE@AtEnd +\endinput +%% +%% End of file `pdfescape.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index 7097a9b402c..ad3ea1d3260 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2007/02/20 v0.2 bookmark driver for dvipdfm (HO)] + [2007/02/22 v0.4 bookmark driver for dvipdfm (HO)] \newcount\BKM@id \BKM@id=\z@ \def\BKM@0{000} @@ -86,10 +86,11 @@ \edef\BKM@action{/Dest[@page\BKM@page/\BKM@view]}% \fi \else + \BKM@EscapeString\BKM@uri \edef\BKM@action{% /A<<% /S/URI% - /URI(\BKM@escapestring{\BKM@uri})% + /URI(\BKM@uri)% >>% }% \fi @@ -97,15 +98,17 @@ \edef\BKM@action{/A<<\BKM@rawaction>>}% \fi \else + \BKM@EscapeName\BKM@named \edef\BKM@action{% - /A<</S/Named/N/\BKM@escapename{\BKM@named}>>% + /A<</S/Named/N/\BKM@named>>% }% \fi \else + \BKM@EscapeString\BKM@dest \edef\BKM@action{% /A<<% /S/GoTo% - /D(\BKM@escapestring{\BKM@dest})% + /D(\BKM@dest)% >>% }% \fi @@ -121,12 +124,14 @@ \fi \edef\BKM@action{/D[\BKM@page/\BKM@view]}% \else - \edef\BKM@action{/D(\BKM@escapestring{\BKM@dest})}% + \BKM@EscapeString\BKM@dest + \edef\BKM@action{/D(\BKM@dest)}% \fi + \BKM@EscapeString\BKM@gotor \edef\BKM@action{% /A<<% /S/GoToR% - /F(\BKM@escapestring{\BKM@gotor})% + /F(\BKM@gotor)% \BKM@action >>% }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index 1de078f8033..a10ac2f354d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2007/02/20 v0.2 bookmark driver for dvips (HO)] + [2007/02/22 v0.4 bookmark driver for dvips (HO)] \def\BKM@filename{\jobname.out.ps} \special{header=\BKM@filename} \AtEndDocument{\BKM@dvips@out} @@ -53,7 +53,8 @@ \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% - \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \def\BKM@DO@title{#2}% + \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty \let\BKM@attr\@empty @@ -89,32 +90,38 @@ }% \fi \else + \BKM@UnescapeHex\BKM@DO@uri + \BKM@EscapeString\BKM@DO@uri \edef\BKM@action{% /Action<<% /Subtype/URI% - /URI(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})% + /URI(\BKM@DO@uri)% >>% }% \fi \else + \BKM@UnescapeHex\BKM@DO@rawaction \edef\BKM@action{% /Action<<% - \BKM@unescapehex{\BKM@DO@rawaction}% + \BKM@DO@rawaction >>% }% \fi \else + \BKM@EscapeName\BKM@DO@named \edef\BKM@action{% /Action<<% /Subtype/Named% - /N/\BKM@escapename{\BKM@DO@named}% + /N/\BKM@DO@named >>% }% \fi \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{% /Action/GoTo% - /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + /Dest(\BKM@DO@dest)cvn% }% \fi \else @@ -130,13 +137,17 @@ /View[/\BKM@DO@view]% }% \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{% - /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + /Dest(\BKM@DO@dest)cvn% }% \fi + \BKM@UnescapeHex\BKM@DO@gotor + \BKM@EscapeString\BKM@DO@gotor \edef\BKM@action{% /Action/GoToR% - /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + /F(\BKM@DO@gotor)% \BKM@action }% \fi @@ -201,6 +212,11 @@ }% \pdfstringdef\BKM@title{#2}% \edef\BKM@FLAGS{\printflags{BKM@style}}% + \BKM@EscapeHex\BKM@dest + \BKM@EscapeHex\BKM@uri + \BKM@EscapeHex\BKM@gotor + \BKM@EscapeHex\BKM@rawaction + \BKM@EscapeHex\BKM@title \immediate\write\@mainaux{% \string\BKM@entry{% id=\number\BKM@id @@ -209,42 +225,18 @@ ,open% \fi \fi - \ifx\BKM@dest\@empty - \else - ,dest={\BKM@dest}% - \fi - \ifx\BKM@named\@empty - \else - ,named={\BKM@named}% - \fi - \ifx\BKM@uri\@empty - \else - ,uri={\BKM@escapehex{\BKM@uri}}% - \fi - \ifx\BKM@gotor\@empty - \else - ,gotor={\BKM@escapehex{\BKM@gotor}}% - \fi - \ifx\BKM@page\@empty - \else - ,page=\BKM@page - \fi - \ifx\BKM@view\@empty - \else - ,view={\BKM@view}% - \fi - \ifx\BKM@rawaction\@empty - \else - ,rawaction={\BKM@escapehex{\BKM@rawaction}}% - \fi + \BKM@auxentry{dest}% + \BKM@auxentry{named}% + \BKM@auxentry{uri}% + \BKM@auxentry{gotor}% + \BKM@auxentry{page}% + \BKM@auxentry{view}% + \BKM@auxentry{rawaction}% + \BKM@auxentry{color}% \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi - \ifx\BKM@color\@empty - \else - ,color={\BKM@color}% - \fi - }{\BKM@escapehex{\BKM@title}}% + }{\BKM@title}% }% \endgroup \fi @@ -254,6 +246,12 @@ \def\BKM@x@level{#2}% \def\BKM@x@childs{#3}% } +\def\BKM@auxentry#1{% + \expandafter\ifx\csname BKM@#1\endcsname\@empty + \else + ,#1={\csname BKM@#1\endcsname}% + \fi +} \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index 1295407ba63..e8fb50f63d4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -30,11 +30,12 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2007/02/20 v0.2 bookmark driver for pdftex (HO)] + [2007/02/22 v0.4 bookmark driver for pdftex (HO)] \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% - \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \def\BKM@DO@title{#2}% + \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty \let\BKM@attr\@empty @@ -66,24 +67,29 @@ \edef\BKM@action{goto page\BKM@DO@page{/\BKM@DO@view}}% \fi \else - \edef\BKM@action{user{<</S/URI/URI(% - \BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})>>}}% + \BKM@UnescapeHex\BKM@DO@uri + \BKM@EscapeString\BKM@DO@uri + \edef\BKM@action{user{<</S/URI/URI(\BKM@DO@uri)>>}}% \fi \else + \BKM@UnescapeHex\BKM@DO@rawaction \edef\BKM@action{% user{% <<% - \BKM@unescapehex{\BKM@DO@rawaction}% + \BKM@DO@rawaction >>% }% }% \fi \else + \BKM@EscapeName\BKM@DO@named \edef\BKM@action{% - user{<</S/Named/N/\BKM@escapename{\BKM@DO@named}>>}% + user{<</S/Named/N/\BKM@DO@named>>}% }% \fi \else + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest \edef\BKM@action{goto name{\BKM@DO@dest}}% \fi \else @@ -98,13 +104,17 @@ \fi \edef\BKM@action{/D[\BKM@DO@page/\BKM@DO@view]}% \else - \edef\BKM@action{/D(\BKM@escapestring{\BKM@DO@dest})}% + \BKM@UnescapeHex\BKM@DO@dest + \BKM@EscapeString\BKM@DO@dest + \edef\BKM@action{/D(\BKM@DO@dest)}% \fi + \BKM@UnescapeHex\BKM@DO@gotor + \BKM@EscapeString\BKM@DO@gotor \edef\BKM@action{% user{% <<% /S/GoToR% - /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + /F(\BKM@DO@gotor)% \BKM@action >>% }% @@ -163,6 +173,11 @@ }% \pdfstringdef\BKM@title{#2}% \edef\BKM@FLAGS{\printflags{BKM@style}}% + \BKM@EscapeHex\BKM@dest + \BKM@EscapeHex\BKM@uri + \BKM@EscapeHex\BKM@gotor + \BKM@EscapeHex\BKM@rawaction + \BKM@EscapeHex\BKM@title \immediate\write\@mainaux{% \string\BKM@entry{% id=\number\BKM@id @@ -171,42 +186,18 @@ ,open% \fi \fi - \ifx\BKM@dest\@empty - \else - ,dest={\BKM@dest}% - \fi - \ifx\BKM@named\@empty - \else - ,named={\BKM@named}% - \fi - \ifx\BKM@uri\@empty - \else - ,uri={\BKM@escapehex{\BKM@uri}}% - \fi - \ifx\BKM@gotor\@empty - \else - ,gotor={\BKM@escapehex{\BKM@gotor}}% - \fi - \ifx\BKM@page\@empty - \else - ,page=\BKM@page - \fi - \ifx\BKM@view\@empty - \else - ,view={\BKM@view}% - \fi - \ifx\BKM@rawaction\@empty - \else - ,rawaction={\BKM@escapehex{\BKM@rawaction}}% - \fi + \BKM@auxentry{dest}% + \BKM@auxentry{named}% + \BKM@auxentry{uri}% + \BKM@auxentry{gotor}% + \BKM@auxentry{page}% + \BKM@auxentry{view}% + \BKM@auxentry{rawaction}% + \BKM@auxentry{color}% \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi - \ifx\BKM@color\@empty - \else - ,color={\BKM@color}% - \fi - }{\BKM@escapehex{\BKM@title}}% + }{\BKM@title}% }% \endgroup \fi @@ -216,6 +207,12 @@ \def\BKM@x@level{#2}% \def\BKM@x@childs{#3}% } +\def\BKM@auxentry#1{% + \expandafter\ifx\csname BKM@#1\endcsname\@empty + \else + ,#1={\csname BKM@#1\endcsname}% + \fi +} \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index 758cb6a6134..cbf01370757 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -30,25 +30,29 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2007/02/20 v0.2 PDF bookmarks (HO)] -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax - \PackageWarningNoLine{bookmark}{% - Some features of pdfTeX 1.30 are missing that\MessageBreak - protect some arguments. Replacements for these\MessageBreak - features are not implemented. Thus the pdf file\MessageBreak - can become invalid or the .aux file breaks% - }% - \let\BKM@escapename\@firstofone - \let\BKM@escapestring\@firstofone - \let\BKM@escapehex\@firstofone - \let\BKM@unescapehex\@firstofone -\else - \let\BKM@escapename\pdfescapename - \let\BKM@escapestring\pdfescapestring - \let\BKM@escapehex\pdfescapehex - \let\BKM@unescapehex\pdfunescapehex -\fi + [2007/02/22 v0.4 PDF bookmarks (HO)] +\RequirePackage{pdfescape}% +\def\BKM@EscapeName#1{% + \ifx#1\@empty + \else + \EdefEscapeName#1#1% + \fi +}% +\def\BKM@EscapeString#1{% + \ifx#1\@empty + \else + \EdefEscapeString#1#1% + \fi +}% +\def\BKM@EscapeHex#1{% + \ifx#1\@empty + \else + \EdefEscapeHex#1#1% + \fi +}% +\def\BKM@UnescapeHex#1{% + \EdefUnescapeHex#1#1% +}% \RequirePackage{ifpdf} \RequirePackage{ifxetex} \RequirePackage{hyperref} @@ -368,18 +372,21 @@ \renewcommand*{\Hy@writebookmark}[5]{% \ifnum#4>\Hy@bookmarksdepth\relax \else - \begingroup - \ifHy@bookmarksnumbered - \let\numberline\Hy@numberline - \let\partnumberline\Hy@numberline - \let\chapternumberline\Hy@numberline - \else - \let\numberline\@gobble - \let\partnumberline\@gobble - \let\chapternumberline\@gobble - \fi - \bookmark[level=#4,dest={#3}]{#2}% - \endgroup + \def\BKM@type{#5}% + \ifx\BKM@type\Hy@bookmarkstype + \begingroup + \ifHy@bookmarksnumbered + \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline + \else + \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble + \fi + \bookmark[level=#4,dest={#3}]{#2}% + \endgroup + \fi \fi } \let\ReadBookmarks\relax diff --git a/Master/texmf-dist/tpm/oberdiek.tpm b/Master/texmf-dist/tpm/oberdiek.tpm index 064735eb25c..96bff7b8c08 100644 --- a/Master/texmf-dist/tpm/oberdiek.tpm +++ b/Master/texmf-dist/tpm/oberdiek.tpm @@ -3,16 +3,16 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/oberdiek.zip"> <TPM:Name>oberdiek</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2007/02/20 13:19:00</TPM:Date> + <TPM:Date>2007/02/25 12:26:00</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Packages written by Heiko Oberdiek</TPM:Title> <TPM:Description></TPM:Description> <TPM:Author>Heiko Oberdiek</TPM:Author> - <TPM:Size>9195719</TPM:Size> + <TPM:Size>9617043</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="697740"> + <TPM:RunFiles size="707797"> texmf-dist/scripts/oberdiek/pdfatfi.pl texmf-dist/tex/generic/oberdiek/alphalph.sty texmf-dist/tex/generic/oberdiek/engord.sty @@ -20,6 +20,7 @@ texmf-dist/tex/generic/oberdiek/ifpdf.sty texmf-dist/tex/generic/oberdiek/ifvtex.sty texmf-dist/tex/generic/oberdiek/kvsetkeys.sty texmf-dist/tex/generic/oberdiek/pdfcrypt.sty +texmf-dist/tex/generic/oberdiek/pdfescape.sty texmf-dist/tex/generic/oberdiek/setouterhbox.sty texmf-dist/tex/generic/oberdiek/telprint.sty texmf-dist/tex/latex/oberdiek/aliascnt.sty @@ -114,7 +115,7 @@ texmf-dist/tex/latex/oberdiek/zref-xr.sty texmf-dist/tex/latex/oberdiek/zref.sty texmf-dist/tpm/oberdiek.tpm </TPM:RunFiles> - <TPM:DocFiles size="7487533"> + <TPM:DocFiles size="7692650"> texmf-dist/doc/latex/oberdiek/aliascnt.pdf texmf-dist/doc/latex/oberdiek/alphalph.pdf texmf-dist/doc/latex/oberdiek/attachfile2.pdf @@ -156,6 +157,10 @@ texmf-dist/doc/latex/oberdiek/pagesel.pdf texmf-dist/doc/latex/oberdiek/pdfcolfoot.pdf texmf-dist/doc/latex/oberdiek/pdfcolmk.pdf texmf-dist/doc/latex/oberdiek/pdfcrypt.pdf +texmf-dist/doc/latex/oberdiek/pdfescape-test1.tex +texmf-dist/doc/latex/oberdiek/pdfescape-test2.tex +texmf-dist/doc/latex/oberdiek/pdfescape-test3.tex +texmf-dist/doc/latex/oberdiek/pdfescape.pdf texmf-dist/doc/latex/oberdiek/pdflscape.pdf texmf-dist/doc/latex/oberdiek/picture-example.tex texmf-dist/doc/latex/oberdiek/picture.pdf @@ -178,7 +183,7 @@ texmf-dist/doc/latex/oberdiek/twoopt.pdf texmf-dist/doc/latex/oberdiek/zref-example.tex texmf-dist/doc/latex/oberdiek/zref.pdf </TPM:DocFiles> - <TPM:SourceFiles size="1431770"> + <TPM:SourceFiles size="1463146"> texmf-dist/source/latex/oberdiek/aliascnt.dtx texmf-dist/source/latex/oberdiek/alphalph.dtx texmf-dist/source/latex/oberdiek/attachfile2.dtx @@ -213,6 +218,7 @@ texmf-dist/source/latex/oberdiek/pagesel.dtx texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx texmf-dist/source/latex/oberdiek/pdfcolmk.dtx texmf-dist/source/latex/oberdiek/pdfcrypt.dtx +texmf-dist/source/latex/oberdiek/pdfescape.dtx texmf-dist/source/latex/oberdiek/pdflscape.dtx texmf-dist/source/latex/oberdiek/picture.dtx texmf-dist/source/latex/oberdiek/pmboxdraw.dtx |