diff options
author | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-11-16 11:24:40 +0000 |
commit | 55ae6e504d04d806c4c5ac253dedb98196fc1c35 (patch) | |
tree | 5200a08eba158000f26a357a2a54a0923dd189de /Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx | |
parent | a7dfc63af349a5ea5fb37b110f584cc878308ea7 (diff) |
oberdiek update 11/11
git-svn-id: svn://tug.org/texlive/trunk@5458 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx | 135 |
1 files changed, 110 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx index 73a528de4bb..7e44032655b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx @@ -18,7 +18,8 @@ % and the derived files % pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, % pdfescape-test1.tex, pdfescape-test2.tex, -% pdfescape-test3.tex, pdfescape-test4.tex. +% pdfescape-test3.tex, pdfescape-test4.tex, +% pdfescape-test5.tex. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/pdfescape.dtx @@ -57,6 +58,7 @@ % TDS:doc/latex/oberdiek/test/pdfescape-test2.tex % TDS:doc/latex/oberdiek/test/pdfescape-test3.tex % TDS:doc/latex/oberdiek/test/pdfescape-test4.tex +% TDS:doc/latex/oberdiek/test/pdfescape-test5.tex % TDS:source/latex/oberdiek/pdfescape.dtx % %<*ignore> @@ -72,12 +74,13 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdfescape 2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)} +\Msg{* Package: pdfescape 2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)} \Msg{************************************************************************} \keepsilent \askforoverwritefalse +\let\MetaPrefix\relax \preamble This is a generated file. @@ -100,9 +103,11 @@ This work consists of the main source file pdfescape.dtx and the derived files pdfescape.sty, pdfescape.pdf, pdfescape.ins, pdfescape.drv, pdfescape-test1.tex, pdfescape-test2.tex, - pdfescape-test3.tex, pdfescape-test4.tex. + pdfescape-test3.tex, pdfescape-test4.tex, + pdfescape-test5.tex. \endpreamble +\let\MetaPrefix\DoubleperCent \generate{% \file{pdfescape.ins}{\from{pdfescape.dtx}{install}}% @@ -114,6 +119,7 @@ and the derived files \file{pdfescape-test2.tex}{\from{pdfescape.dtx}{test2}}% \file{pdfescape-test3.tex}{\from{pdfescape.dtx}{test3}}% \file{pdfescape-test4.tex}{\from{pdfescape.dtx}{test4}}% + \file{pdfescape-test5.tex}{\from{pdfescape.dtx}{test5}}% } \obeyspaces @@ -124,6 +130,10 @@ and the derived files \Msg{*} \Msg{* pdfescape.sty} \Msg{*} +\Msg{* And install the following script file:} +\Msg{*} +\Msg{* } +\Msg{*} \Msg{* To produce the documentation run the file `pdfescape.drv'} \Msg{* through LaTeX.} \Msg{*} @@ -139,16 +149,16 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdfescape.drv}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)]% + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)]% \documentclass{ltxdoc} -\usepackage{holtxdoc}[2007/10/21] +\usepackage{holtxdoc}[2007/11/11] \begin{document} \DocInput{pdfescape.dtx}% \end{document} %</driver> % \fi % -% \CheckSum{1890} +% \CheckSum{1979} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -169,7 +179,7 @@ and the derived files % \GetFileInfo{pdfescape.drv} % % \title{The \xpackage{pdfescape} package} -% \date{2007/10/27 v1.7} +% \date{2007/11/11 v1.8} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -267,6 +277,9 @@ and the derived files \fi \fi \else + \catcode35 6 % # + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname PackageInfo\endcsname\relax \def\x#1#2{% \immediate\write-1{Package #1 Info: #2.}% @@ -283,6 +296,7 @@ and the derived files % Package identification: % \begin{macrocode} \begingroup + \catcode35 6 % # \catcode40 12 % ( \catcode41 12 % ) \catcode44 12 % , @@ -291,6 +305,8 @@ and the derived files \catcode47 12 % / \catcode58 12 % : \catcode64 11 % @ + \catcode123 1 % { + \catcode125 2 % } \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -306,7 +322,7 @@ and the derived files \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/10/27 v1.7 Provides hex, PDF name and string conversions (HO)] + [2007/11/11 v1.8 Provides hex, PDF name and string conversions (HO)] % \end{macrocode} % % \subsection{Catcodes} @@ -329,6 +345,7 @@ and the derived files \TMP@EnsureCode\catcode{42}{12}% * \TMP@EnsureCode\catcode{45}{12}% - \TMP@EnsureCode\catcode{46}{12}% . +\TMP@EnsureCode\catcode{47}{12}% / \TMP@EnsureCode\catcode{60}{12}% < \TMP@EnsureCode\catcode{61}{12}% = \TMP@EnsureCode\catcode{62}{12}% > @@ -744,7 +761,16 @@ and the derived files % % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdfescapehex\endcsname\relax +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input pdftexcmds.sty\relax +\else + \RequirePackage{pdftexcmds}[2007/11/11]% +\fi +% \end{macrocode} +% +% \begin{macrocode} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@escapehex\endcsname\relax % \end{macrocode} % % \begin{macro}{\EdefEscapeHex} @@ -804,28 +830,28 @@ and the derived files % \begin{macro}{\EdefEscapeHex} % \begin{macrocode} \long\def\EdefEscapeHex#1#2{% - \PE@edefbabel#1\pdfescapehex{#2}% + \PE@edefbabel#1\pdf@escapehex{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefUnescapeHex} % \begin{macrocode} \def\EdefUnescapeHex#1#2{% - \PE@edefbabel#1\pdfunescapehex{#2}% + \PE@edefbabel#1\pdf@unescapehex{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefEscapeName} % \begin{macrocode} \long\def\EdefEscapeName#1#2{% - \PE@edefbabel#1\pdfescapename{#2}% + \PE@edefbabel#1\pdf@escapename{#2}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\EdefEscapeString} % \begin{macrocode} \long\def\EdefEscapeString#1#2{% - \PE@edefbabel#1\pdfescapestring{#2}% + \PE@edefbabel#1\pdf@escapestring{#2}% }% % \end{macrocode} % \end{macro} @@ -1183,7 +1209,39 @@ and the derived files %<*test1> % \end{macrocode} % \begin{macrocode} +\catcode`\{=1 % +\catcode`\}=2 % +\catcode`\#=6 % \catcode`\@=11 % +\expandafter\ifx\csname count@\endcsname\relax + \countdef\count@=255 % +\fi +\expandafter\ifx\csname @gobble\endcsname\relax + \long\def\@gobble#1{}% +\fi +\expandafter\ifx\csname @firstofone\endcsname\relax + \long\def\@firstofone#1{#1}% +\fi +\expandafter\ifx\csname loop\endcsname\relax + \expandafter\@firstofone +\else + \expandafter\@gobble +\fi +{% + \def\loop#1\repeat{% + \def\body{#1}% + \iterate + }% + \def\iterate{% + \body + \let\next\iterate + \else + \let\next\relax + \fi + \next + }% + \let\repeat=\fi +}% \def\RestoreCatcodes{} \count@=0 % \loop @@ -1192,7 +1250,7 @@ and the derived files \catcode\the\count@=\the\catcode\count@\relax }% \ifnum\count@<255 % - \advance\count@\@ne + \advance\count@ 1 % \repeat \def\RangeCatcodeInvalid#1#2{% @@ -1200,7 +1258,7 @@ and the derived files \loop \catcode\count@=15 % \ifnum\count@<#2\relax - \advance\count@\@ne + \advance\count@ 1 % \repeat } \def\Test{% @@ -1232,7 +1290,7 @@ and the derived files % \subsection{Macro tests} % % \begin{macrocode} -%<*test2|test3|test4> +%<*test2|test3|test4|test5> \NeedsTeXFormat{LaTeX2e} \makeatletter % \end{macrocode} @@ -1241,8 +1299,8 @@ and the derived files % % \begin{macrocode} %<*test2> -\ProvidesFile{pdfescape-test1.tex}% - [2007/10/27 v1.7 Test with \string\pdfescape... commands]% +\ProvidesFile{pdfescape-test2.tex}% + [2007/11/11 v1.8 Test with \string\pdfescape... commands]% %</test2> % \end{macrocode} % @@ -1250,8 +1308,8 @@ and the derived files % % \begin{macrocode} %<*test3> -\ProvidesFile{pdfescape-test2.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape..., with e-TeX]% +\ProvidesFile{pdfescape-test3.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape..., with e-TeX]% %</test3> % \end{macrocode} % @@ -1259,11 +1317,20 @@ and the derived files % % \begin{macrocode} %<*test4> -\ProvidesFile{pdfescape-test3.tex}% - [2007/10/27 v1.7 Test without \string\pdfescape... and e-TeX]% +\ProvidesFile{pdfescape-test4.tex}% + [2007/11/11 v1.8 Test without \string\pdfescape... and e-TeX]% %</test4> % \end{macrocode} % +% \subsection{Test with \LuaTeX} +% +% \begin{macrocode} +%<*test5> +\ProvidesFile{pdfescape-test5.tex}% + [2007/11/11 v1.8 Test with LuaTeX]% +%</test5> +% \end{macrocode} +% % \subsection{Check/ensure test preconditions} % % \subsubsection{Check \cs{pdfescape...}} @@ -1271,7 +1338,7 @@ and the derived files % \begin{macrocode} %<*test2> \@ifundefined{pdfescapehex}{% - \PackageError{pdfescape-test1}{% + \PackageError{pdfescape-test2}{% Missing \string\pdfescape... commands% }{Test aborted.}% \stop @@ -1292,7 +1359,7 @@ and the derived files % \begin{macrocode} %<*test3> \@ifundefined{numexpr}{% - \PackageError{pdfescape-test2}{% + \PackageError{pdfescape-test3}{% Missing \eTeX }{Test aborted.}% \stop @@ -1302,6 +1369,19 @@ and the derived files % Package \xpackage{qstest} uses \eTeX, thus \eTeX's features % can only be disabled later during loading of package \xpackage{pdfescape}. % +% \subsubsection{Check \LuaTeX} +% +% \begin{macrocode} +%<*test5> +\@ifundefined{directlua}{% + \PackageError{pdfescape-test5}{% + Missing LuaTeX% + }{Test aborted.}% + \stop +}{} +%</test5> +% \end{macrocode} +% % \subsection{Common part} % % The files for testing uses the framework, provided by the @@ -1666,7 +1746,7 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -%</test2|test3|test4> +%</test2|test3|test4|test5> % \end{macrocode} % % \section{Installation} @@ -1734,6 +1814,7 @@ and the derived files % test/pdfescape-test2.tex & doc/latex/oberdiek/test/pdfescape-test2.tex\\ % test/pdfescape-test3.tex & doc/latex/oberdiek/test/pdfescape-test3.tex\\ % test/pdfescape-test4.tex & doc/latex/oberdiek/test/pdfescape-test4.tex\\ +% test/pdfescape-test5.tex & doc/latex/oberdiek/test/pdfescape-test5.tex\\ % pdfescape.dtx & source/latex/oberdiek/pdfescape.dtx\\ % \end{tabular}^^A % }^^A @@ -1901,6 +1982,10 @@ and the derived files % \item % More efficient \cs{EdefSanitize}. % \end{Version} +% \begin{Version}{2007/11/11 v1.8} +% \item +% Use of package \xpackage{pdftexcmds} for \LuaTeX\ support. +% \end{Version} % \end{History} % % \PrintIndex |