diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic')
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/alphalph.sty | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty | 131 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/engord.sty | 24 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/iflang.sty | 96 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty | 273 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty | 96 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty | 449 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty | 25 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/telprint.sty | 10 |
12 files changed, 810 insertions, 334 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty index 8e68b372106..eb09bf6bbe6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/alphalph.sty @@ -28,6 +28,11 @@ %% alphalph.sty, alphalph.pdf, alphalph.ins, alphalph.drv. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@alphalph.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty index 854e6e0cd59..e127443a137 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty @@ -27,30 +27,12 @@ %% atbegshi.sty, atbegshi.pdf, atbegshi.ins, atbegshi.drv, %% atbegshi-test1.tex, atbegshi-test2.tex. %% -\expandafter\edef\csname AtBegShi@End\endcsname{% - \catcode40 \the\catcode40\relax % ( - \catcode41 \the\catcode41\relax % ) - \catcode44 \the\catcode44\relax % , - \catcode45 \the\catcode45\relax % - - \catcode46 \the\catcode46\relax % . - \catcode58 \the\catcode58\relax % : - \catcode61 \the\catcode61\relax % = - \catcode64 \the\catcode64\relax % @ - \catcode94 \the\catcode94\relax % ^ - \catcode96 \the\catcode96\relax % ` - \noexpand\endinput -} -\catcode40 12 % ( -\catcode41 12 % ) -\catcode44 12 % , -\catcode45 12 % - -\catcode46 12 % . -\catcode58 12 % : -\catcode61 12 % = -\catcode64 11 % @ -\catcode94 7 % ^ -\catcode96 12 % ` \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@atbegshi.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -74,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -89,48 +76,35 @@ \fi \expandafter\x\csname ver@atbegshi.sty\endcsname \ProvidesPackage{atbegshi}% - [2007/04/19 v1.2 At begin shipout hook (HO)] -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname PackageWarning\endcsname\relax - \def\AtBegShi@Warning#1{% - \begingroup - \newlinechar=10 % - \def\@spaces{\space\space\space\space}% - \def\MessageBreak{% - ^^J(atbegshi)\@spaces\@spaces\@spaces\@spaces - }% - \immediate\write16{% - ^^JPackage atbegshi Warning: #1 % - on input line \the\inputlineno.^^J% - }% - \endgroup - }% -\else - \def\AtBegShi@Warning{% - \PackageWarning{atbegshi}% - }% -\fi + [2007/04/27 v1.4 At begin shipout hook (HO)] +\expandafter\edef\csname AtBegShi@End\endcsname{% + \catcode40 \the\catcode40\relax % ( + \catcode41 \the\catcode41\relax % ) + \catcode44 \the\catcode44\relax % , + \catcode45 \the\catcode45\relax % - + \catcode46 \the\catcode46\relax % . + \catcode58 \the\catcode58\relax % : + \catcode61 \the\catcode61\relax % = + \catcode64 \the\catcode64\relax % @ + \catcode94 \the\catcode94\relax % ^ + \catcode96 \the\catcode96\relax % ` + \noexpand\endinput +} +\catcode40 12 % ( +\catcode41 12 % ) +\catcode44 12 % , +\catcode45 12 % - +\catcode46 12 % . +\catcode58 12 % : +\catcode61 12 % = +\catcode64 11 % @ +\catcode94 7 % ^ +\catcode96 12 % ` \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname PackageInfo\endcsname\relax - \def\AtBegShi@Info#1{% - \begingroup - \newlinechar=10 % - \def\@spaces{\space\space\space\space}% - \def\MessageBreak{% - ^^J(atbegshi) \@spaces\@spaces\@spaces - }% - \immediate\write-1{% - ^^JPackage atbegshi Info: #1.^^J% - }% - \endgroup - }% +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax \else - \def\AtBegShi@Info#1{% - \begingroup - \def\on@line{}% - \PackageInfo{atbegshi}{#1}% - \endgroup - }% + \RequirePackage{infwarerr}% \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname @ifdefinable\endcsname\relax @@ -181,23 +155,16 @@ X \global } \def\AtBegShi@Test{% X \ifdim\lastkern=\z@ -X \aftergroup\egroup -X \aftergroup\endgroup -X \expandafter\aftergroup -X \else -X \egroup -X \endgroup -E \ifnum\AtBegShi@GroupLevel=\currentgrouplevel -E \else -E \expandafter\aftergroup +E \ifnum\AtBegShi@GroupLevel<\currentgrouplevel + \expandafter\aftergroup \fi \AtBegShi@Output } -\catcode`\X=11 % -\catcode`\E=11 % \def\AtBegShi@Output{% +X \egroup +X \endgroup \ifvoid\AtBeginShipoutBox - \AtBegShi@Warning{Ignoring void shipout box}% + \@PackageWarning{atbegshi}{Ignoring void shipout box}% \else \let\AtBegShi@OrgProtect\protect \csname set@typeset@protect\endcsname @@ -206,7 +173,7 @@ E \expandafter\aftergroup \AtBegShi@HookNext \gdef\AtBegShi@HookNext{}% \ifAtBegShi@Discarded - \AtBegShi@Info{Shipout page discarded}% + \@PackageInfoNoLine{atbegshi}{Shipout page discarded}% \global\AtBegShi@Discardedfalse \begingroup \setbox\AtBeginShipoutBox\box\AtBeginShipoutBox @@ -219,6 +186,8 @@ E \expandafter\aftergroup \fi \fi } +\catcode`\X=11 % +\catcode`\E=11 % \def\AtBegShi@First{% \begingroup \def\@empty{}% @@ -260,7 +229,7 @@ E \expandafter\aftergroup \AtBegShi@AddTo\AtBegShi@HookFirst } \long\def\AtBegShi@FirstDisabled#1{% - \AtBegShi@Warning{% + \@PackageWarning{atbegshi}{% First page is already shipped out, ignoring\MessageBreak \string\AtBeginShipoutFirst }% @@ -284,7 +253,7 @@ E \expandafter\aftergroup \else #1% \ifvoid\AtBeginShipoutBox - \AtBegShi@Warning{% + \@PackageWarning{atbegshi}{% Shipout box was voided by hook,\MessageBreak ignoring shipout box% }% @@ -390,7 +359,7 @@ E \expandafter\aftergroup \expandafter\AtBeginShipoutBox \fi }% - \AtBegShi@Info{Package `crop' patched}% + \@PackageInfoNoLine{atbegshi}{Package `crop' patched}% \begingroup \fi \fi @@ -461,7 +430,7 @@ E \expandafter\aftergroup \expandafter\@EveryShipout@Output \fi }% - \AtBegShi@Info{Package `everyshi' patched}% + \@PackageInfoNoLine{atbegshi}{Package `everyshi' patched}% \begingroup \fi \fi @@ -556,7 +525,7 @@ E \expandafter\aftergroup \expandafter\AtBeginShipoutBox \fi }% - \AtBegShi@Info{Class `memoir' patched}% + \@PackageInfoNoLine{atbegshi}{Class `memoir' patched}% \begingroup \fi \fi diff --git a/Master/texmf-dist/tex/generic/oberdiek/engord.sty b/Master/texmf-dist/tex/generic/oberdiek/engord.sty index 6f260bc0e30..0887b3c6ecc 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/engord.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/engord.sty @@ -28,6 +28,11 @@ %% engord.sty, engord.pdf, engord.ins, engord.drv. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@engord.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -66,7 +76,7 @@ \fi \expandafter\x\csname ver@engord.sty\endcsname \ProvidesPackage{engord}% - [2007/04/11 v1.3 Provides the ifpdf switch (HO)] + [2007/04/26 v1.4 Provides the ifpdf switch (HO)] \expandafter\chardef\csname EO@atcode\endcsname\catcode`\@ \catcode`\@=11 % \begingroup\expandafter\expandafter\expandafter\endgroup @@ -79,14 +89,10 @@ }% \fi \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname PackageWarning\endcsname\relax - \def\EO@PackageWarning#1#2{% - \immediate\write16{% - Package #1 Warning: #2 on input line \the\inputlineno.% - }% - }% +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax \else - \def\EO@PackageWarning{\PackageWarning}% + \RequirePackage{infwarerr}% \fi \newif\ifengordraise \engordraisetrue @@ -122,7 +128,7 @@ \expandafter\ifx\csname engorderror\endcsname\relax \EO@def\engorderror#1{% #1\engordletters{!ERROR!}% - \EO@PackageWarning{engord}{% + \@PackageWarning{engord}{% `#1' is not an ordinal number% }% }% diff --git a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty index 223267a1532..176640737d5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/iflang.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/iflang.sty @@ -28,6 +28,11 @@ %% iflang-test1.tex, iflang-test2.tex, iflang-test3.tex. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@iflang.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -66,7 +76,7 @@ \fi \expandafter\x\csname ver@iflang.sty\endcsname \ProvidesPackage{iflang}% - [2007/04/12 v1.2 Language checks (HO)] + [2007/04/26 v1.3 Language checks (HO)] \expandafter\edef\csname IfLang@endinput\endcsname{% \catcode39 \the\catcode39\relax % ' \catcode40 \the\catcode40\relax % ( @@ -118,74 +128,22 @@ \fi }% } -\begingroup -\ifnum\expandafter\ifx\csname PackageInfo\endcsname\relax - 1% - \fi - \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax - 1% - \fi - 0=0 % - \endgroup - \expandafter\@secondoftwo +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax \else - \endgroup - \expandafter\@firstoftwo + \RequirePackage{infwarerr}% \fi -{% - \def\IfLang@GenericMessage#1#2#3{% - \begingroup - \newlinechar=10 % - \def\@spaces{\space\space\space\space}% - \ifcase#1 % - \def\MessageBreak{% - ^^J(iflang) \@spaces\@spaces\@spaces\@spaces - }% - \or - \def\MessageBreak{% - ^^J(iflang)\@spaces\@spaces\@spaces\@spaces - }% - \or - \def\MessageBreak{% - ^^J(iflang) \space\@spaces\@spaces\@spaces - }% - \fi - \expandafter\ifx\csname if#3\expandafter\endcsname - \csname iftrue\endcsname - \def\on@line{ on input line \the\inputlineno}% - \else - \def\on@line{}% - \fi - \immediate\write\ifcase#1 -1\or 16\fi{% - ^^JPackage iflang % - \ifcase#1 Info\or Warning\or Error\fi - : #2\on@line.^^J% - }% - \endgroup - }% - \def\IfLang@Info#1{% - \IfLang@GenericMessage{0}{#1}{false}% - }% - \def\IfLang@Warning#1{% - \IfLang@GenericMessage{1}{#1}{false}% - }% -}{% - \def\IfLang@Info#1{% - \begingroup - \def\on@line{}% - \PackageInfo{iflang}{#1}% - \endgroup - }% - \def\IfLang@Warning#1{% - \PackageWarningNoLine{iflang}{#1}% - }% -} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname uselanguage\endcsname\relax - \IfLang@Info{Naming convention for patterns: babel}% + \@PackageInfoNoLine{iflang}{% + Naming convention for patterns: babel% + }% \def\IfLang@prefix{l@}% \else - \IfLang@Info{Naming convention for patterns: etex.src}% + \@PackageInfoNoLine{iflang}{% + Naming convention for patterns: etex.src% + }% \def\IfLang@prefix{lang@}% \let\IfLang@OrgUseLanguage\uselanguage \def\uselanguage#1{% @@ -196,12 +154,14 @@ \expandafter\ifx\csname languagename\endcsname\relax \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname lang@USenglish\endcsname\relax - \IfLang@Warning{\string\lang@USenglish\space is missing}% + \@PackageWarningNoLine{iflang}{% + \string\lang@USenglish\space is missing% + }% \else \ifnum\lang@USenglish=\language \def\languagename{USenglish}% \else - \IfLang@Warning{% + \@PackageWarningNoLine{iflang}{% \string\languagename\space is not set,\MessageBreak current language is unknown% }% @@ -211,7 +171,9 @@ \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname languagename\endcsname\relax - \IfLang@Info{\string\languagename\space is not set}% + \@PackageInfoNoLine{iflang}{% + \string\languagename\space is not set% + }% \fi \def\IfLanguagePatterns#1{% \ifnum\IfLang@IfDefined{\IfLang@prefix#1}{% @@ -289,7 +251,7 @@ \expandafter\ifx\csname languagename\endcsname\relax \else \IfLanguagePatterns{\languagename}{}{% - \IfLang@Warning{% + \@PackageWarningNoLine{iflang}{% Mismatch between \string\language\space (patterns)\MessageBreak and setting of \string\languagename diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty index cc7bfe96758..cc242ac3017 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -28,6 +28,11 @@ %% ifpdf.sty, ifpdf.pdf, ifpdf.ins, ifpdf.drv. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@ifpdf.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty index 6b2decaae84..85a7d298c49 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ifvtex.sty @@ -28,6 +28,11 @@ %% ifvtex.sty, ifvtex.pdf, ifvtex.ins, ifvtex.drv. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@ifvtex.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty new file mode 100644 index 00000000000..382e9bf4ee0 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty @@ -0,0 +1,273 @@ +%% +%% This is file `infwarerr.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% infwarerr.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 infwarerr.dtx +%% and the derived files +%% infwarerr.sty, infwarerr.pdf, infwarerr.ins, infwarerr.drv, +%% infwarerr-test1.tex, infwarerr-test2.tex. +%% +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@infwarerr.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{infwarerr}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \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@infwarerr.sty\endcsname +\ProvidesPackage{infwarerr}% + [2007/04/26 v1.0 Providing info/warning/message (HO)] +\expandafter\edef\csname InfWarErr@End\endcsname{% + \catcode39 \the\catcode39\relax % ' + \catcode40 \the\catcode40\relax % ( + \catcode41 \the\catcode41\relax % ) + \catcode44 \the\catcode44\relax % , + \catcode45 \the\catcode45\relax % - + \catcode46 \the\catcode46\relax % . + \catcode58 \the\catcode58\relax % : + \catcode60 \the\catcode60\relax % < + \catcode61 \the\catcode61\relax % = + \catcode62 \the\catcode62\relax % > + \catcode64 \the\catcode64\relax % @ + \catcode94 \the\catcode94\relax % ^ + \noexpand\endinput +} +\catcode39 12 % ' +\catcode40 12 % ( +\catcode41 12 % ) +\catcode44 12 % , +\catcode45 12 % - +\catcode46 12 % . +\catcode58 12 % : +\catcode60 12 % < +\catcode61 12 % = +\catcode62 12 % > +\catcode64 11 % @ +\catcode94 7 % ^ +\begingroup + \let\x=Y% + \def\check#1{% + \@check{Generic}{#1}% + \@check{Package}{#1}% + \@check{Class}{#1}% + }% + \def\@check#1#2{% + \expandafter\ifx\csname #1#2\endcsname\relax + \let\x=N% + \fi + }% + \check{Info}% + \check{Warning}% + \check{Error}% + \@check{Package}{WarningNoLine}% + \@check{Class}{WarningNoLine}% + \@check{}{@ehc}% + \@check{}{@ehd}% +\expandafter\endgroup +\ifx\x Y% + \let\@PackageInfo\PackageInfo + \def\@PackageInfoNoLine#1#2{% + \PackageInfo{#1}{#2\@gobble}% + }% + \let\@ClassInfo\ClassInfo + \def\@ClassInfoNoLine#1#2{% + \ClassInfo{#1}{#2\@gobble}% + }% + \let\@PackageWarning\PackageWarning + \let\@PackageWarningNoLine\PackageWarningNoLine + \let\@ClassWarning\ClassWarning + \let\@ClassWarningNoLine\ClassWarningNoLine + \let\@PackageError\PackageError + \let\@ClassError\ClassError + \csname fi\endcsname + \InfWarErr@End +\fi +\begingroup\expandafter\endgroup +\ifcase\expandafter\ifx\csname inputlineno\endcsname\relax + 0 % + \else + \ifnum\inputlineno<0 % + 0 % + \else + 1 % + \fi + \fi + \def\InfWarErr@online{}% +\else + \def\InfWarErr@online{ on input line \the\inputlineno}% +\fi +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname protected\endcsname\relax + \def\InfWarErr@protected{}% +\else + \let\InfWarErr@protected\protected +\fi +\chardef\InfWarErr@unused=16 % +\def\InfWarErr@ehc{% + Try typing \space <return> \space to proceed.\MessageBreak + If that doesn't work, type \space X <return> \space to quit.% +} +\def\InfWarErr@ehd{% + You're in trouble here. \space\@ehc +} +\InfWarErr@protected\def\InfWarErr@GenericInfo#1#2{% + \begingroup + \let\on@line\InfWarErr@online + \long\def\@gobble##1{}% + \def\@spaces{\space\space\space\space}% + \def\MessageBreak{^^J#1}% + \newlinechar=10 % + \immediate\write-1{#2\on@line.}% + \endgroup +} +\InfWarErr@protected\def\InfWarErr@GenericWarning#1#2{% + \begingroup + \let\on@line\InfWarErr@online + \long\def\@gobble##1{}% + \def\@spaces{\space\space\space\space}% + \def\MessageBreak{^^J#1}% + \newlinechar=10 % + \immediate\write\InfWarErr@unused{^^J#2\on@line.^^J}% + \endgroup +} +\InfWarErr@protected\def\InfWarErr@GenericError#1#2#3#4{% + \begingroup + \immediate\write\InfWarErr@unused{}% + \newlinechar=10 % + \def\@spaces{\space\space\space\space}% + \let\@ehc\InfWarErr@ehc + \let\@ehd\InfWarErr@ehd + \let\on@line\InfWarErr@online + \def\MessageBreak{^^J}% + \edef\InfWarErr@help{\noexpand\errhelp{#4}}% + \InfWarErr@help + \def\MessageBreak{^^J#1}% + \errmessage{% + #2.^^J^^J% + #3^^J% + Type \space H <return> \space for immediate help% + }% + \endgroup +} +\def\@PackageInfo#1#2{% + \InfWarErr@GenericInfo{% + (#1) \@spaces\@spaces\@spaces + }{% + Package #1 Info: #2% + }% +} +\def\@PackageInfoNoLine#1#2{% + \@PackageInfo{#1}{#2\@gobble}% +} +\def\@ClassInfo#1#2{% + \InfWarErr@GenericInfo{% + (#1) \space\space\@spaces\@spaces + }{% + Class #1 Info: #2% + }% +} +\def\@ClassInfoNoLine#1#2{% + \@ClassInfo{#1}{#2\@gobble}% +} +\def\@PackageWarning#1#2{% + \InfWarErr@GenericWarning{% + (#1)\@spaces\@spaces\@spaces\@spaces + }{% + Package #1 Warning: #2% + }% +} +\def\@PackageWarningNoLine#1#2{% + \@PackageWarning{#1}{#2\@gobble}% +} +\def\@ClassWarning#1#2{% + \InfWarErr@GenericWarning{% + (#1) \space\@spaces\@spaces\@spaces + }{% + Class #1 Warning: #2% + }% +} +\def\@ClassWarningNoLine#1#2{% + \@ClassWarning{#1}{#2\@gobble}% +} +\def\@PackageError#1#2#3{% + \InfWarErr@GenericError{% + (#1)\@spaces\@spaces\@spaces\@spaces + }{% + Package #1 Error: #2% + }{% + See the #1 package documentation for explanation.% + }{#3}% +} +\def\@ClassError#1#2#3{% + \InfWarErr@GenericError{% + (#1) \space\@spaces\@spaces\@spaces + }{% + Class #1 Error: #2% + }{% + See the #1 class documentation for explanation.% + }{#3}% +} +\InfWarErr@End +\endinput +%% +%% End of file `infwarerr.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty index 61d84d9a6b6..0b4e32a5960 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty @@ -28,6 +28,11 @@ %% kvsetkeys-example.tex. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@kvsetkeys.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty index b7e9d0b6a05..264c0712954 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfcrypt.sty @@ -8,7 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 2001, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2001, 2006, 2007 by +%% Heiko Oberdiek <oberdiek@uni-freiburg.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -87,62 +88,31 @@ }% }{} -\@ifundefined{PackageError}{% - \def\PackageError#1#2#3{% - \begingroup - \newlinechar=10 % - \errhelp{#3}% - \errmessage{% - \MessageBreak - Package #1 Error: #2.\MessageBreak - \MessageBreak - See the #1 package documentation for explanation.\MessageBreak - Type \space H <return> \space for immediate help% - }% - \endgroup - }% -}{} - -\@ifundefined{PackageWarning}{% - \def\PackageWarning#1#2{% - \begingroup - \newlinechar=10 % - \def\MessageBreak{% - ^^J(#1)\@spaces\@spaces\@spaces\@spaces - }% - \immediate\write16{^^JPackage #1 Warning: #2\on@line.^^J}% - \endgroup - }% -}{} - -\@ifundefined{PackageWarningNoLine}{% - \def\PackageWarningNoLine#1#2{% - \PackageWarning{#1}{#2\@gobble}% - }% -}{} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax +\else + \RequirePackage{infwarerr}% +\fi \@ifundefined{@gobble}{% \long\def\@gobble#1{}% }{} -\@ifundefined{on@line}{% - \def\on@line{ on input line \the\inputlineno}% -}{} - \@ifundefined{@empty}{% \def\@empty{}% }{} \ProvidesPackage{pdfcrypt}% - [2007/04/11 v0.9 Setting pdf encryption (HO)]% + [2007/04/26 v1.0 Setting pdf encryption (HO)]% \@ifundefined{pdfcryptsetup}{% \let\pdfcryptsetup\@gobble }{% - \PackageWarningNoLine{pdfcrypt}{Package pdfcrypt is already loaded}% + \@PackageWarningNoLine{pdfcrypt}{Package pdfcrypt is already loaded}% \pc@endinput } \newif\ifpc@nopdfcrypt \ifx Y\nopdfcrypt - \PackageWarningNoLine{pdfcrypt}{% + \@PackageWarningNoLine{pdfcrypt}{% Encryption disabled by \string \nopdfcrypt\space request% }% \global\pc@nopdfcrypttrue @@ -155,7 +125,7 @@ \ifcase\pdfoutput \else \@ifundefined{pdfcrypt}{% - \PackageError{pdfcrypt}{% + \@PackageError{pdfcrypt}{% PDF encryption is not supported with this pdfTeX% }{% Encryption support was added in 0.14h (2001/03/10)\MessageBreak @@ -173,7 +143,7 @@ }{% \ifnum\OpMode=1 % \ifnum\@ifundefined{VTeXversion}0\VTeXversion<735 % - \PackageError{pdfcrypt}{% + \@PackageError{pdfcrypt}{% PDF encryption is not supported with this VTeX% }{% You need VTeX 7.35 or higher.% @@ -207,34 +177,6 @@ \def\@nameuse#1{\csname #1\endcsname}% }{} -\@ifundefined{MessageBreak}{% - \def\MessageBreak{^^J}% -}{} - -\@ifundefined{@ehc}{% - \def\@ehc{% - Try typing \space <return> \space to proceed.\MessageBreak - If that doesn't work, type \space X <return> \space - to quit.% - }% -}{} - -\@ifundefined{PackageInfo}{% - \def\PackageInfo#1#2{% - \begingroup - \newlinechar=10 % - \def\MessageBreak{% - ^^J(#1) \space\@spaces\@spaces\@spaces - }% - \wlog{Package #1 Info: #2}% - \endgroup - }% -}{} - -\@ifundefined{@spaces}{% - \def\@spaces{\space\space\space\space}% -}{} - \def\pc@KeyvalRestore{% \let\pc@KeyvalRestore\@undefined } @@ -300,7 +242,7 @@ \edef\pc@temp{\catcode`\noexpand\"=\the\catcode`\"\relax} \@makeother\" \def\pc@set{% - \PackageInfo{pdfcrypt}{% + \@PackageInfo{pdfcrypt}{% \ifpc@debug \ifx\pc@owner\@empty No owner password% @@ -331,10 +273,10 @@ \else \@ifundefined{pc@set@\pc@driver}{% \ifx\pc@driver\@empty - \PackageError{pdfcrypt}{No driver for encryption % + \@PackageError{pdfcrypt}{No driver for encryption % support found}\@ehc \else - \PackageError{pdfcrypt}{Cannot set encryption for % + \@PackageError{pdfcrypt}{Cannot set encryption for % unknown driver `\pc@driver'}\@ehc \fi }{% @@ -440,7 +382,7 @@ \fi \fi \ifx\pc@temp\relax - \PackageWarning{pdfcrypt}{% + \@PackageWarning{pdfcrypt}{% Unexpected value \string`#3\string' of % option \string`#2\string'\MessageBreak instead of % @@ -503,7 +445,7 @@ \pc@set \global\let\pc@set\relax \gdef\pdfcryptsetup##1{% - \PackageWarning{pdfcrypt}{% + \@PackageWarning{pdfcrypt}{% Encryption options are already set\MessageBreak new values are ignored% }% @@ -517,7 +459,7 @@ \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname InputIfFileExists\endcsname\relax - \PackageInfo{pdfcrypt}{% + \@PackageInfo{pdfcrypt}{% Configuration file pdfcrypt.cfg not supported.% }% \else diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty index b8d7f6b126a..1612f48aa5e 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdfescape.sty @@ -28,7 +28,36 @@ %% pdfescape-test1.tex, pdfescape-test2.tex, %% pdfescape-test3.tex. %% +\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 + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@pdfescape.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -52,6 +81,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% @@ -67,36 +101,294 @@ \fi \expandafter\x\csname ver@pdfescape.sty\endcsname \ProvidesPackage{pdfescape}% - [2007/04/11 v1.3 Provides hex, PDF name and string conversions (HO)] -\expandafter\edef\csname PE@AtEnd\endcsname{% - \catcode64 \the\catcode64\relax + [2007/04/21 v1.4 Provides hex, PDF name and string conversions (HO)] +\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}% + \PE@onelevel@sanitize#1% + \expandafter\endgroup + \expandafter\def\expandafter#1\expandafter{#1}% + }% + \def\PE@onelevel@sanitize#1{% + \edef#1{\detokenize\expandafter{#1}}% + }% +\fi +\begingroup + \catcode`\ =12\relax% +\def\x{\endgroup\def\PE@space@other{ }}\x\relax +\def\PE@space@space{ } +\def\PE@SanitizeSpaceOther#1{% + \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% } -\catcode64 11 % @ -\def\PE@EnsureCode#1#2#3{% - \edef\PE@AtEnd{% - \PE@AtEnd - #1#2 \the#1#2\relax +\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} +\def\EdefUnescapeName#1#2{% + \PE@sanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@UnescapeName#1% + \PE@onelevel@sanitize#1% +} +\begingroup + \catcode`\$=6 % hash + \catcode`\#=12 % other + \gdef\PE@UnescapeName$1{% + \begingroup + \PE@InitUccodeHexDigit + \def\PE@result{}% + \expandafter\PE@DeName$1#\relax\relax + \expandafter\endgroup + \expandafter\def\expandafter$1\expandafter{\PE@result}% }% - #1#2 #3\relax + \gdef\PE@DeName$1#$2$3{% + \ifx\relax$2% + \edef\PE@result{\PE@result$1}% + \let\PE@next\relax + \else + \ifx\relax$3% + % wrong escape sequence in input + \edef\PE@result{\PE@result$1#}% + \let\PE@next\relax + \else + \uppercase{% + \def\PE@testA{$2}% + \def\PE@testB{$3}% + }% + \ifcase\ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \ifcase\expandafter\PE@TestUcHexDigit\PE@testB + \z@ + \else + \@ne + \fi + \else + \@ne + \fi + \uccode\z@="\PE@testA\PE@testB\relax + \uppercase{% + \def\PE@temp{^^@}% + }% + \uccode\z@=\z@ + \edef\PE@result{\PE@result$1\PE@temp}% + \let\PE@next\PE@DeName + \else + % wrong escape sequence in input + \edef\PE@result{\PE@result$1#}% + \def\PE@next{\PE@DeName$2$3}% + \fi + \fi + \fi + \PE@next + }% +\endgroup +\def\PE@InitUccodeHexDigit{% + \uccode`a=`A\relax + \uccode`b=`B\relax + \uccode`c=`C\relax + \uccode`d=`D\relax + \uccode`e=`E\relax + \uccode`f=`F\relax + \uccode`A=\z@ + \uccode`B=\z@ + \uccode`C=\z@ + \uccode`D=\z@ + \uccode`E=\z@ + \uccode`F=\z@ + \uccode`0=\z@ + \uccode`1=\z@ + \uccode`2=\z@ + \uccode`3=\z@ + \uccode`4=\z@ + \uccode`5=\z@ + \uccode`6=\z@ + \uccode`7=\z@ + \uccode`8=\z@ + \uccode`9=\z@ +} +\def\PE@TestUcHexDigit#1{% + \ifnum`#1<48 % 0 + \@ne + \else + \ifnum`#1>70 % F + \@ne + \else + \ifnum`#1>57 % 9 + \ifnum`#1<65 % A + \@ne + \else + \z@ + \fi + \else + \z@ + \fi + \fi + \fi +} +\def\EdefUnescapeString#1#2{% + \PE@sanitize#1{#2}% + \PE@SanitizeSpaceOther#1% + \PE@NormalizeLineEnd#1% + \PE@UnescapeString#1% + \PE@onelevel@sanitize#1% +} +\begingroup + \uccode`\8=10 % lf + \uccode`\9=13 % cr +\def\x#1#2{\endgroup + \def\PE@NormalizeLineEnd##1{% + \def\PE@result{}% + \expandafter\PE@@NormalizeLineEnd##1#2\relax + \let##1\PE@result + }% + \def\PE@@NormalizeLineEnd##1#2##2{% + \ifx\relax##2% + \edef\PE@result{\PE@result##1}% + \let\PE@next\relax + \else + \edef\PE@result{\PE@result##1#1}% + \ifx#1##2% lf + \let\PE@next\PE@@NormalizeLineEnd + \else + \def\PE@next{\PE@@NormalizeLineEnd##2}% + \fi + \fi + \PE@next + }% +}% +\uppercase{% + \x 89% +} +\begingroup + \catcode`\|=0 % + \catcode`\\=12 % + |gdef|PE@UnescapeString#1{% + |begingroup + |def|PE@result{}% + |expandafter|PE@DeString#1\|relax + |expandafter|endgroup + |expandafter|def|expandafter#1|expandafter{|PE@result}% + }% + |gdef|PE@DeString#1\#2{% + |ifx|relax#2% + |edef|PE@result{|PE@result#1}% + |let|PE@next|relax + |else + |if n#2% + |uccode|z@=10 % + |else|if r#2% + |uccode|z@=13 % + |else|if t#2% + |uccode|z@=9 % + |else|if b#2% + |uccode|z@=8 % + |else|if f#2% + |uccode|z@=12 % + |else + |uccode|z@=|z@ + |fi|fi|fi|fi|fi + |ifnum|uccode|z@>|z@ + |uppercase{% + |edef|PE@temp{^^@}% + }% + |edef|PE@result{|PE@result#1|PE@temp}% + |let|PE@next|PE@DeString + |else + |if\#2% backslash + |edef|PE@result{|PE@result#1}% + |let|PE@next|PE@CheckEndBackslash + |else + |ifnum`#2=10 % linefeed + |edef|PE@result{|PE@result#1}% + |let|PE@next|PE@DeString + |else + |ifcase|PE@TestOctDigit#2% + |edef|PE@result{|PE@result#1}% + |def|PE@next{|PE@OctI#2}% + |else + |edef|PE@result{|PE@result#1#2}% + |let|PE@next|PE@DeString + |fi + |fi + |fi + |fi + |fi + |PE@next + }% + |gdef|PE@CheckEndBackslash#1{% + |ifx|relax#1% + |else + |edef|PE@result{|PE@result\}% + |expandafter|PE@DeString|expandafter#1% + |fi + }% +|endgroup +\def\PE@TestOctDigit#1{% + \ifnum`#1<48 % 0 + \@ne + \else + \ifnum`#1>55 % 7 + \@ne + \else + \z@ + \fi + \fi +} +\def\PE@OctI#1#2{% + \ifcase\PE@TestOctDigit#2% + \def\PE@next{\PE@OctII{#1#2}}% + \else + \def\PE@next{\PE@OctAll#1#2}% + \fi + \PE@next +} +\def\PE@OctII#1#2{% + \ifcase\PE@TestOctDigit#2% + \def\PE@next{\PE@OctAll{#1#2}}% + \else + \def\PE@next{\PE@OctAll{#1}#2}% + \fi + \PE@next +} +\def\PE@OctAll#1{% + \uccode\z@='#1\relax + \uppercase{% + \edef\PE@result{\PE@result^^@}% + }% + \PE@DeString } -\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@SanitizeSpaceOther#1% \PE@EscapeHex#1% }% \def\EdefUnescapeHex#1#2{% @@ -105,22 +397,22 @@ }% \long\def\EdefEscapeName#1#2{% \PE@sanitize#1{#2}% - \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@SanitizeSpaceOther#1% \PE@EscapeName#1% }% \long\def\EdefEscapeString#1#2{% \PE@sanitize#1{#2}% - \edef#1{\expandafter\PE@SpaceToOther#1 \relax}% + \PE@SanitizeSpaceOther#1% \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\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}% }% @@ -138,14 +430,9 @@ \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 % + \escapechar=-1 % \edef\x{\endgroup - \def\noexpand\PE@backslash{\expandafter\@gobble\string\\}% + \def\noexpand\PE@backslash{\string\\}% } \x \newif\ifPE@etex @@ -154,46 +441,6 @@ \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}% @@ -272,6 +519,7 @@ \fi \def\PE@UnescapeHex#1{% \begingroup + \PE@InitUccodeHexDigit \def\PE@result{}% \expandafter\PE@DeHex#1\relax\relax \expandafter\endgroup @@ -280,19 +528,48 @@ \def\PE@DeHex#1#2{% \ifx#2\relax \ifx#1\relax + \let\PE@next\relax \else - \PE@DeHex#10\relax\relax + \uppercase{% + \def\PE@testA{#1}% + }% + \ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \def\PE@next{% + \PE@DeHex#10\relax\relax + }% + \else + \let\PE@next\relax + \fi \fi \else - \uppercase{\lccode0="#1#2}\relax - \ifnum\lccode0=32 % - \edef\PE@result{\PE@result\PE@space@space}% + \uppercase{% + \def\PE@testA{#1}% + \def\PE@testB{#2}% + }% + \ifcase\expandafter\PE@TestUcHexDigit\PE@testA + \ifcase\expandafter\PE@TestUcHexDigit\PE@testB + \uccode\z@="\PE@testA\PE@testB\relax + \ifnum\uccode\z@=32 % + \let\PE@temp\PE@space@space + \else + \uppercase{% + \def\PE@temp{^^@}% + }% + \fi + \edef\PE@result{\PE@result\PE@temp}% + \let\PE@next\PE@DeHex + \else + % invalid input sequence + \def\PE@next{% + \PE@DeHex#1% + }% + \fi \else - \lowercase{\def\PE@temp{^^@}}% - \edef\PE@result{\PE@result\PE@temp}% + % invalid input sequence + \def\PE@next{\PE@DeHex#2}% \fi - \expandafter\PE@DeHex \fi + \PE@next } \ifPE@etex \def\PE@EscapeName#1{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty index f0e04ca9acb..92864e105f7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/setouterhbox.sty @@ -8,7 +8,8 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2005, 2006, 2007 by +%% Heiko Oberdiek <oberdiek@uni-freiburg.de> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -66,20 +67,16 @@ \fi \expandafter\x\csname ver@setouterhbox.sty\endcsname \ProvidesPackage{setouterhbox}% - [2006/08/26 v1.4 Set hbox in outer horizontal mode (HO)]% + [2007/04/26 v1.5 Set hbox in outer horizontal mode (HO)]% \newbox\setouterhboxBox -\def\setouterhboxFailure#1#2{% - \begingroup - \expandafter\ifx\csname PackageError\endcsname\relax - \def\MessageBreak{^^J}% - \newlinechar=10\relax - \edef\z{#2}% - \errhelp\expandafter{\z}% - \errmessage{Package setouterhbox Error: #1}% - \else - \PackageError{setouterhbox}{#1}{#2}% - \fi - \endgroup +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax + \input infwarerr.sty\relax +\else + \RequirePackage{infwarerr}% +\fi +\edef\setouterhboxFailure#1#2{% + \expandafter\noexpand\csname @PackageError\endcsname{setouterhbox}{#1}{#2}% } \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname lastnodetype\endcsname\relax diff --git a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty index 61364d3bd01..1df5c8358ef 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/telprint.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/telprint.sty @@ -28,6 +28,11 @@ %% telprint.sty, telprint.pdf, telprint.ins, telprint.drv. %% \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\let\expandafter\x\csname ver@telprint.sty\endcsname \ifcase 0% \ifx\x\relax % plain @@ -51,6 +56,11 @@ \fi \endgroup \begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ \expandafter\ifx\csname ProvidesPackage\endcsname\relax \def\x#1#2#3[#4]{\endgroup \immediate\write-1{Package: #3 #4}% |