diff options
author | Karl Berry <karl@freefriends.org> | 2007-10-05 23:13:42 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-10-05 23:13:42 +0000 |
commit | 4c911ff5ebf103e651707635abf2064ddf149c96 (patch) | |
tree | d3550a7008c8851c3df0746c7e9800df307a0699 /Master/texmf-dist/tex/latex/oberdiek | |
parent | f020fc73ad0b6e33f65d5f0b84646131e0340f2f (diff) |
oberdiek update/new: bigintcalc bitset grfext
git-svn-id: svn://tug.org/texlive/trunk@5118 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def | 27 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bookmark.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty | 239 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/flags.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/grfext.sty | 214 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty | 157 |
11 files changed, 598 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index 56c649103b8..da8d136f996 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2007/07/13 v1.1 bookmark driver for dvipdfm (HO)]% + [2007/09/25 v1.2 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \def\BKM@0{000} diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index 533f4a50e19..e3fa652e968 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2007/07/13 v1.1 bookmark driver for dvips (HO)]% + [2007/09/25 v1.2 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -39,17 +39,22 @@ \BKM@PSHeaderFile\BKM@filename \AtEndDocument{\BKM@pdfmark@out} \def\BKM@pdfmark@out{% - \newwrite\BKM@file - \immediate\openout\BKM@file=\BKM@filename\relax - \BKM@write{\@percentchar!}% - \BKM@write{/pdfmark where{pop}}% - \BKM@write{% - {% - /globaldict where{pop globaldict}{userdict}ifelse% - /pdfmark/cleartomark load put% + \if@filesw + \newwrite\BKM@file + \immediate\openout\BKM@file=\BKM@filename\relax + \BKM@write{\@percentchar!}% + \BKM@write{/pdfmark where{pop}}% + \BKM@write{% + {% + /globaldict where{pop globaldict}{userdict}ifelse% + /pdfmark/cleartomark load put% + }% }% - }% - \BKM@write{ifelse}% + \BKM@write{ifelse}% + \else + \let\BKM@write\@gobble + \let\BKM@DO@entry\@gobbletwo + \fi } \def\BKM@write#{% \immediate\write\BKM@file diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 1d900bf7b0a..9b23387b57f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2007/07/13 v1.1 bookmark driver for dvipsone (HO)]% + [2007/09/25 v1.2 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -39,17 +39,22 @@ \BKM@PSHeaderFile\BKM@filename \AtEndDocument{\BKM@pdfmark@out} \def\BKM@pdfmark@out{% - \newwrite\BKM@file - \immediate\openout\BKM@file=\BKM@filename\relax - \BKM@write{\@percentchar!}% - \BKM@write{/pdfmark where{pop}}% - \BKM@write{% - {% - /globaldict where{pop globaldict}{userdict}ifelse% - /pdfmark/cleartomark load put% + \if@filesw + \newwrite\BKM@file + \immediate\openout\BKM@file=\BKM@filename\relax + \BKM@write{\@percentchar!}% + \BKM@write{/pdfmark where{pop}}% + \BKM@write{% + {% + /globaldict where{pop globaldict}{userdict}ifelse% + /pdfmark/cleartomark load put% + }% }% - }% - \BKM@write{ifelse}% + \BKM@write{ifelse}% + \else + \let\BKM@write\@gobble + \let\BKM@DO@entry\@gobbletwo + \fi } \def\BKM@write#{% \immediate\write\BKM@file diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index 160ce654360..866be76905d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2007/07/13 v1.1 bookmark driver for pdfTeX (HO)]% + [2007/09/25 v1.2 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index abfac6a82d3..68ad286b627 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2007/07/13 v1.1 bookmark driver for textures (HO)]% + [2007/09/25 v1.2 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } @@ -39,17 +39,22 @@ \BKM@PSHeaderFile\BKM@filename \AtEndDocument{\BKM@pdfmark@out} \def\BKM@pdfmark@out{% - \newwrite\BKM@file - \immediate\openout\BKM@file=\BKM@filename\relax - \BKM@write{\@percentchar!}% - \BKM@write{/pdfmark where{pop}}% - \BKM@write{% - {% - /globaldict where{pop globaldict}{userdict}ifelse% - /pdfmark/cleartomark load put% + \if@filesw + \newwrite\BKM@file + \immediate\openout\BKM@file=\BKM@filename\relax + \BKM@write{\@percentchar!}% + \BKM@write{/pdfmark where{pop}}% + \BKM@write{% + {% + /globaldict where{pop globaldict}{userdict}ifelse% + /pdfmark/cleartomark load put% + }% }% - }% - \BKM@write{ifelse}% + \BKM@write{ifelse}% + \else + \let\BKM@write\@gobble + \let\BKM@DO@entry\@gobbletwo + \fi } \def\BKM@write#{% \immediate\write\BKM@file diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index bf49901d77b..b19043bd457 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2007/07/13 v1.1 bookmark driver for VTeX (HO)]% + [2007/09/25 v1.2 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index 7a4ef80f920..64417add9b8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2007/07/13 v1.1 PDF bookmarks (HO)]% + [2007/09/25 v1.2 PDF bookmarks (HO)]% \newif\ifBKM@WithFlags \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index aade325323e..20306f5a163 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -25,7 +25,8 @@ %% %% This work consists of the main source file epstopdf.dtx %% and the derived files -%% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv. +%% epstopdf.sty, epstopdf.pdf, epstopdf.ins, epstopdf.drv, +%% epstopdf-test1.tex. %% \begingroup \catcode44 12 % , @@ -79,44 +80,53 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2007/04/26 v1.4 Conversion with epstopdf on the fly (HO)] -\@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}% + [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)] +\expandafter\edef\csname ETE@AtEnd\endcsname{% + \catcode64 \the\catcode64\relax +} +\catcode64 11 % @ +\def\TMP@EnsureCode#1#2{% + \edef\ETE@AtEnd{% + \ETE@AtEnd + \catcode#1 \the\catcode#1\relax }% -}{} -\@ifundefined{on@line}{% - \def\on@line{ on input line \the\inputlineno}% -}{} -\@ifundefined{@spaces}{% - \def\@spaces{\space\space\space\space}% -}{} + \catcode#1 #2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{96}{12}% ` +\RequirePackage{infwarerr}[2007/09/09] +\RequirePackage{grfext}\relax +\RequirePackage{kvoptions}[2006/10/02] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname Gin@setfile\endcsname\relax - \PackageWarningNoLine{epstopdf}{% + \@PackageWarningNoLine{epstopdf}{% No graphics package \string`graphic{s,x}\string' found% }% + \newcommand*{\epstopdfsetup}[1]{}% + \ETE@AtEnd \expandafter\endinput \fi \begingroup \def\x{pdftex.def}% \ifx\Gin@driver\x \else - \PackageWarningNoLine{epstopdf}{% + \@PackageWarningNoLine{epstopdf}{% Graphics driver file \string`pdftex.def\string' not found% }% - \expandafter\endgroup\expandafter\endinput + \endgroup + \newcommand*{\epstopdfsetup}[1]{}% + \ETE@AtEnd + \expandafter\endinput \fi \endgroup \begingroup @@ -124,33 +134,182 @@ \else \ifnum\pdfshellescape>0 % \else - \PackageWarningNoLine{epstopdf}{% + \@PackageWarningNoLine{epstopdf}{% Shell escape feature is not enabled% }% \fi \fi \endgroup -\let\ETEorg@Gin@setfile\Gin@setfile +\SetupKeyvalOptions{family=ETE,prefix=ETE@} +\DeclareBoolOption{update} +\DeclareBoolOption{verbose} +\newif\ifETE@prepend +\DeclareVoidOption{prepend}{\ETE@prependtrue} +\DeclareVoidOption{append}{\ETE@prependfalse} +\DeclareStringOption{outdir} +\ProcessKeyvalOptions* +\newcommand*{\epstopdfsetup}{\setkeys{ETE}} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdffilemoddate\endcsname\relax + \def\ETE@Make#1#2{% + \ifETE@update + \ETE@WarnModDate + \fi + \@firstofone + }% + \def\ETE@WarnModDate{% + \@PackageWarningNoLine{epstopdf}{% + \string\pdffilemoddate\space is not available,\MessageBreak + option `update' will be ignored% + }% + \global\let\ETE@WarnModDate\relax + }% + \def\ETE@FileInfo#1#2{#1 file: <#2>}% +\else + \def\ETE@Make#1#2{% + \ifETE@update + \ifnum\pdfstrcmp{\pdffilemoddate{#1}}{\pdffilemoddate{#2}}>0 % + \expandafter\expandafter\expandafter\@firstofone + \else + \@PackageInfoNoLine{epstopdf}{% + Output file is already uptodate% + }% + \expandafter\expandafter\expandafter\@gobble + \fi + \else + \expandafter\@firstofone + \fi + }% + \def\ETE@FileInfo#1#2{% + #1 file: <#2>% + \expandafter\ETE@Date\pdffilemoddate{#2}\@nil + \expandafter\ETE@Size\pdffilesize{#2}\@nil + }% + \def\ETE@Date#1\@nil{% + \ifx\\#1\\% + \else + \ETE@@Date#1\@nil + \fi + }% + \def\ETE@@Date#1:#2#3#4#5#6#7#8#9{% + \MessageBreak + \@spaces\space\space\space date: #2#3#4#5-#6#7-#8#9 % + \ETE@@Time + }% + \def\ETE@@Time#1#2#3#4#5#6#7\@nil{% + #1#2:#3#4:#5#6% + }% + \def\ETE@Size#1\@nil{% + \ifx\\#1\\% + \else + \MessageBreak + \@spaces\space\space\space size: #1 bytes% + \fi + }% +\fi +\expandafter\ifx\csname ETE@OrgGin@setfile\endcsname\relax + \let\ETE@OrgGin@setfile\Gin@setfile +\else + \@PackageError{epstopdf}{% + Command \string\ETE@OrgGin@setfile\space + already defined.\MessageBreak + }{% + Probably some package has included the code of this package% + \MessageBreak + instead of using \string\RequirePackage{epstopdf}.% + \MessageBreak + \@ehc + }% +\fi \def\Gin@setfile#1#2#3{% \if`\@car #3\relax\@nil - \immediate\write18{\@cdr #3\@empty\@nil}% - \ETEorg@Gin@setfile{#1}{#2}{\Gin@base #2}% + \begingroup + \def\GraphicsType{#1}% + \def\GraphicsRead{#2}% + \ifx\Gin@ext\relax + \def\SourceFile{\Gin@base\Gin@eext}% + \else + \def\SourceFile{\Gin@base\Gin@ext}% + \fi + \let\OutputDirectory\ETE@outdir + \ifx\OutputDirectory\@empty + \def\OutputFile{\Gin@base#2}% + \else + \begingroup + \filename@parse{\Gin@base#2}% + \edef\x{\endgroup + \def\noexpand\OutputFile{% + \OutputDirectory\filename@base#2% + }% + }% + \x + \fi + \edef\CommandLine{\@cdr#3\@empty\@nil}% + \ifETE@verbose + \@PackageInfo{epstopdf}{% + \ETE@FileInfo{Source}\SourceFile\MessageBreak + \ETE@FileInfo{Output}\OutputFile\MessageBreak + Command: <\CommandLine>\MessageBreak + \string\includegraphics + }% + \fi + \ETE@Make\SourceFile\OutputFile{% + \immediate\write18{\CommandLine}% + \ifETE@verbose + \@PackageInfoNoLine{epstopdf}{% + \ETE@FileInfo{Result}\OutputFile + }% + \fi + }% + \edef\x{\endgroup + \ifx\OutputDirectory\@empty + \else + \def\noexpand\Gin@base{% + \OutputDirectory\noexpand\filename@base + }% + \fi + \noexpand\ETE@OrgGin@setfile{% + \GraphicsType + }{% + \GraphicsRead + }{% + \OutputFile + }% + }% + \x \else - \ETEorg@Gin@setfile{#1}{#2}{#3}% + \ETE@OrgGin@setfile{#1}{#2}{#3}% \fi } -\@ifundefined{Gin@extensions}{% - \def\Gin@extensions{.eps}% -}{% - \expandafter\ifx\expandafter\indent\Gin@extensions\indent - \def\Gin@extensions{.eps}% +\expandafter\ifx\csname Gin@rule@.eps\endcsname\relax +\else + \@PackageInfo{epstopdf}{Overwriting graphics rule for `.eps'}% +\fi +\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`\ETE@epstopdf{#1}}} +\def\ETE@epstopdf#1{% + epstopdf % + \ifx\OutputDirectory\@empty \else - \expandafter\def\expandafter\Gin@extensions\expandafter{% - \Gin@extensions,.eps% - }% + --outfile=\OutputFile\space \fi + #1% +} +\ifETE@prepend + \expandafter\PrependGraphicsExtensions +\else + \expandafter\AppendGraphicsExtensions +\fi +{.eps} +\let\ETE@prepend\@undefined +\DeclareVoidOption{prepend}{% + \PrependGraphicsExtensions{.eps}% +} +\let\ETE@append\@undefined +\DeclareVoidOption{append}{% + \AppendGraphicsExtensions{.eps}% } -\@namedef{Gin@rule@.eps}#1{{pdf}{.pdf}{`epstopdf #1}} +\InputIfFileExists{epstopdf.cfg}{}{} +\ETE@AtEnd \endinput %% %% End of file `epstopdf.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/flags.sty b/Master/texmf-dist/tex/latex/oberdiek/flags.sty index 39de0fd1a91..0df21541f6b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/flags.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/flags.sty @@ -28,7 +28,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{flags}% - [2007/03/07 v0.3 Flag setting in bit fields (HO)]% + [2007/09/30 v0.4 Flag setting in bit fields (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \PackageError{flags}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/grfext.sty b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty new file mode 100644 index 00000000000..41817c91c0c --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/grfext.sty @@ -0,0 +1,214 @@ +%% +%% This is file `grfext.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% grfext.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 grfext.dtx +%% and the derived files +%% grfext.sty, grfext.pdf, grfext.ins, grfext.drv, +%% grfext-test1.tex, grfext-test2.tex. +%% +\begingroup + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@grfext.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{grfext}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode47 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@grfext.sty\endcsname +\ProvidesPackage{grfext}% + [2007/09/30 v1.0 Managing graphics extensions (HO)] +\expandafter\edef\csname grfext@AtEnd\endcsname{% + \catcode64 \the\catcode64\relax +} +\catcode64 11 % @ +\def\TMP@EnsureCode#1#2{% + \edef\grfext@AtEnd{% + \grfext@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{60}{12}% < +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\@ifundefined{@expandtwoargs}{% + \def\@expandtwoargs#1#2#3{% + \edef\reserved@a{\noexpand#1{#2}{#3}}% + \reserved@a + }% +}{} +\newcommand*{\AppendGraphicsExtensions}{% + \@ifundefined{Gin@extensions}{% + \let\Gin@extensions\@empty + }{}% + \@ifstar{\grfext@Append\grfext@Check}{\grfext@Append\grfext@@Add}% +}% +\def\grfext@Append#1#2{% + \let\grfext@Print\@gobble + \edef\grfext@next{% + \noexpand\grfext@Add\noexpand#1{% + \zap@space#2 \@empty + }{\noexpand\Gin@extensions,}{}% + }% + \grfext@next + \let\grfext@Print\grfext@@Print + \grfext@Print\AppendGraphicsExtensions +} +\newcommand*{\PrependGraphicsExtensions}{% + \@ifundefined{Gin@extensions}{% + \let\Gin@extensions\@empty + }{}% + \@ifstar{\grfext@Prepend\grfext@Check}{\grfext@Prepend\grfext@@Add}% +}% +\def\grfext@Prepend#1#2{% + \let\grfext@Print\@gobble + \edef\grfext@next{% + \noexpand\grfext@Add\noexpand#1{% + \zap@space#2 \@empty + }{}{,\noexpand\Gin@extensions}% + }% + \grfext@next + \let\grfext@Print\grfext@@Print + \grfext@Print\PrependGraphicsExtensions +} +\def\grfext@Add#1#2{% + #1{#2}% +} +\def\grfext@@Add#1#2#3{% + \RemoveGraphicsExtensions{#1}% + \ifx\Gin@extensions\@empty + \def\Gin@extensions{#1}% + \else + \edef\Gin@extensions{#2#1#3}% + \fi +} +\def\grfext@Check#1{% + \let\grfext@tmp\@empty + \@for\grfext@ext:=#1\do{% + \@ifundefined{Gin@rule@\grfext@ext}{% + }{% + \ifx\grfext@tmp\@empty + \let\grfext@tmp\grfext@ext + \else + \edef\grfext@tmp{\grfext@tmp,\grfext@ext}% + \fi + }% + }% + \ifx\grfext@tmp\@empty + \def\grfext@next##1##2{}% + \else + \edef\grfext@next{% + \noexpand\grfext@@Add{\grfext@tmp}% + }% + \fi + \grfext@next +} +\newcommand*{\RemoveGraphicsExtensions}[1]{% + \@ifundefined{Gin@extensions}{% + \def\Gin@extensions{}% + }{% + \edef\grfext@tmp{\zap@space#1 \@empty}% + \@for\grfext@ext:=\grfext@tmp\do{% + \def\grfext@next{% + \let\grfext@tmp\Gin@extensions + \@expandtwoargs + \@removeelement\grfext@ext\Gin@extensions\Gin@extensions + \ifx\grfext@tmp\Gin@extensions + \let\grfext@next\relax + \fi + \grfext@next + }% + \grfext@next + }% + }% + \grfext@Print\RemoveGraphicsExtensions +} +\RequirePackage{infwarerr}[2007/09/09] +\def\PrintGraphicsExtensions{% + \grfext@Print\PrintGraphicsExtensions +} +\def\grfext@Print#1{% + \@PackageInfo{grfext}{% + Graphics extension search list:\MessageBreak + \@ifundefined{Gin@extensions}{% + <unavailable>% + }{% + [\Gin@extensions]% + }\MessageBreak + \string#1% + }% +} +\let\grfext@@Print\grfext@Print +\grfext@AtEnd +\endinput +%% +%% End of file `grfext.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty index 070ced9c61d..1a222383f32 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty @@ -26,30 +26,119 @@ %% This work consists of the main source file kvoptions.dtx %% and the derived files %% kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv, -%% example-mycolorsetup.sty. +%% example-mycolorsetup.sty, kvoptions-test1.tex. %% %% No we don't need the option 'color'. -%% With color support option 'emphcolor' will dynamically change -%% the color of \emph statements. -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{kvoptions} - [2007/06/11 v2.7 Connects package keyval with LaTeX options (HO)]% -\RequirePackage{keyval} +%% With color support option 'emphcolor' will dynamically +%% change the color of \emph statements. \begingroup - \edef\x{\endgroup - \noexpand\AtEndOfPackage{% - \catcode\@ne=\the\catcode\@ne\relax - \catcode\tw@=\the\catcode\tw@\relax + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode58 12 % : + \catcode64 11 % @ + \expandafter\let\expandafter\x\csname ver@kvoptions.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{kvoptions}{The package is already loaded}% + \endgroup + \expandafter\endinput + \fi +\endgroup +\begingroup + \catcode40 12 % ( + \catcode41 12 % ) + \catcode44 12 % , + \catcode45 12 % - + \catcode46 12 % . + \catcode47 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@kvoptions.sty\endcsname +\ProvidesPackage{kvoptions}% + [2007/10/02 v2.8 Connects package keyval with LaTeX options (HO)] +\expandafter\edef\csname KVO@AtEnd\endcsname{% + \catcode64 \the\catcode64\relax +} +\catcode64 11 % @ +\def\TMP@EnsureCode#1#2{% + \edef\KVO@AtEnd{% + \KVO@AtEnd + \catcode#1 \the\catcode#1\relax + }% + \catcode#1 #2\relax +} +\TMP@EnsureCode{1}{14}% ^^A (comment) +\TMP@EnsureCode{2}{14}% ^^A (comment) +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{39}{12}% ' +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{58}{12}% : +\TMP@EnsureCode{61}{12}% = +\TMP@EnsureCode{62}{12}% > +\TMP@EnsureCode{94}{7}% ^ (superscript) +\TMP@EnsureCode{96}{12}% ` +\@ifundefined{define@key}{% + \RequirePackage{keyval}\relax +}{} +\@ifundefined{@onelevel@sanitize}{% + \def\@onelevel@sanitize#1{% + \edef#1{\expandafter\strip@prefix\meaning#1}% }% -\x -\catcode\@ne=14 % -\catcode\tw@=14 % +}{} +\@ifundefined{strip@prefix}{% + \def\strip@prefix#1>{}% +}{} +\@ifundefined{@x@protect}{% + \def\@x@protect#1\fi#2#3{% + \fi\protect#1% + }% + \let\@typeset@protect\relax +}{} +\@ifundefined{@currname}{% + \def\@currname{}% +}{} +\@ifundefined{@currext}{% + \def\@currext{}% +}{} \DeclareOption{debugshow}{\catcode\@ne=9 } \DeclareOption{patch}{\catcode\tw@=9 } \ProcessOptions\relax \define@key{KVO}{family}{% - \expandafter\edef\csname KVO@family@\@currname.\@currext\endcsname{#1}% + \expandafter\edef\csname KVO@family@% + \@currname.\@currext\endcsname{#1}% } \def\KVO@family{% \@ifundefined{KVO@family@\@currname.\@currext}{% @@ -59,7 +148,8 @@ }% } \define@key{KVO}{prefix}{% - \expandafter\edef\csname KVO@prefix@\@currname.\@currext\endcsname{#1}% + \expandafter\edef\csname KVO@prefix@% + \@currname.\@currext\endcsname{#1}% } \def\KVO@prefix{% \@ifundefined{KVO@prefix@\@currname.\@currext}{% @@ -75,7 +165,8 @@ \KVO@ifdefinable{if\KVO@prefix#2}{% \KVO@ifdefinable{\KVO@prefix#2true}{% \KVO@ifdefinable{\KVO@prefix#2false}{% - \expandafter\newif\csname if\KVO@prefix#2\endcsname + \csname newif\expandafter\endcsname + \csname if\KVO@prefix#2\endcsname \@ifundefined{\KVO@prefix#2#1}{% \PackageWarning{kvoptions}{% Initialization of option `#2' failed,\MessageBreak @@ -111,8 +202,10 @@ You are inside % \ifx\@currext\@clsextension class\else package\fi\space `\@currname.\@currext'.\MessageBreak - `\KVO@family' is used as familiy for the keyval options.\MessageBreak - `\KVO@prefix' serves as prefix for internal switch macros.\MessageBreak + `\KVO@family' is used as familiy % + for the keyval options.\MessageBreak + `\KVO@prefix' serves as prefix % + for internal switch macros.\MessageBreak \MessageBreak \@ehc }% @@ -410,7 +503,8 @@ \ifx\@classoptionslist\relax \else \@for\KVO@CurrentOption:=\@classoptionslist\do{% - \@ifundefined{KV@#1@\expandafter\KVO@getkey\KVO@CurrentOption=\@nil}{% + \@ifundefined{KV@#1@\expandafter\KVO@getkey + \KVO@CurrentOption=\@nil}{% }{% \edef\KVO@temp{% ^^B \etex@unexpanded\expandafter{% @@ -522,8 +616,15 @@ \def\KVO@setcurrentvalue#1=#2\@nil{% \KV@@sp@def\CurrentOptionValue{#2}% } -^^B\@gobble - \endinput +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname documentclass\endcsname\relax + \def\ProcessKeyvalOptions{% + \@ifstar{}\@gobble + }% + \catcode\tw@=14 % +\fi +^^B\@gobbletwo +\KVO@AtEnd\endinput \PackageInfo{kvoptions}{Patching LaTeX's option system} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname eTeXversion\endcsname\relax @@ -691,11 +792,15 @@ } \def\KVO@ExecuteOptions#1#2{% \let#1\CurrentOption - \edef\CurrentOption@SaveLevel{\the\numexpr\CurrentOption@SaveLevel+1}% + \edef\CurrentOption@SaveLevel{% + \the\numexpr\CurrentOption@SaveLevel+1% + }% \@for\CurrentOption:=#2\do{% \csname ds@\CurrentOption\endcsname }% - \edef\CurrentOption@SaveLevel{\the\numexpr\CurrentOption@SaveLevel-1}% + \edef\CurrentOption@SaveLevel{% + \the\numexpr\CurrentOption@SaveLevel-1% + }% \let\CurrentOption#1% } \def\KVO@fileswith@pti@ns#1[#2]#3[#4]{% @@ -724,7 +829,8 @@ \else \ifx\relax##1\relax \else - \KVO@onefilewithoptions{##1}[{\KVO@temp}][{#4}]\@pkgextension + \KVO@onefilewithoptions{##1}[{\KVO@temp}][{#4}]% + \@pkgextension \fi \expandafter\reserved@b \fi @@ -936,6 +1042,7 @@ \else \let\@fileswith@pti@ns\KVO@fileswith@pti@ns \fi +KVO@AtEnd \endinput %% %% End of file `kvoptions.sty'. |