diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
8 files changed, 190 insertions, 110 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def index 5a69c2b1fe0..0210824d2f2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfidvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2005-2009 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 @@ -29,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfipdftex.def}% - [2008/07/29 v2.4 attachfile2 driver for dvips (HO)]% + [2009/09/25 v2.5 attachfile2 driver for dvips (HO)]% \def\atfi@literal#1{% \special{ps:atfi_dict begin{#1}atfi_?pdfmark end}% } @@ -460,23 +460,30 @@ \@ifundefined{atfi@fsobj@#1}{% \stepcounter{atfi@obj}% \expandafter\xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}% - \atfi@pdfstringdef\atfi@file{#1}% - \atfi@literal{% - [% - /_objdef \theatfi@obj - /type/dict% - /OBJ pdfmark% - [% - \theatfi@obj - <<% - /Type/Filespec% - /F(\atfi@file)% - /EF<<% - /F \csname atfi@fileobj@#1\endcsname + \begingroup + \hypersetup{unicode=false}% + \atfi@pdfstringdef\atfi@file{#1}% + \atfi@literal{% + [% + /_objdef \theatfi@obj + /type/dict% + /OBJ pdfmark% + [% + \theatfi@obj + <<% + /Type/Filespec% + /F(\atfi@file)% + \ifx\atfi@ucfilespec\@empty + \else + /UF(\atfi@ucfilespec)% + \fi + /EF<<% + /F \csname atfi@fileobj@#1\endcsname + >>% >>% - >>% - /PUT pdfmark% - }% + /PUT pdfmark% + }% + \endgroup }{% }% \atfi@literal{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def b/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def index f57090200ae..31c0ba775bf 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/atfipdftex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2005-2009 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 @@ -29,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfipdftex.def}% - [2008/07/29 v2.4 attachfile2 driver for pdfTeX (HO)]% + [2009/09/25 v2.5 attachfile2 driver for pdfTeX (HO)]% \let\atfi@literal\pdfliteral @@ -113,19 +113,26 @@ \let\atfi@appearance@dict\@empty \fi \@ifundefined{atfi@fsobj@#1}{% - \atfi@pdfstringdef\atfi@file{#1}% - \immediate\pdfobj{% - <<% - /Type/Filespec% - /F(\atfi@file)% - /EF<<% - /F \@nameuse{atfi@fileobj@#1} 0 R% + \begingroup + \hypersetup{unicode=false}% + \atfi@pdfstringdef\atfi@file{#1}% + \immediate\pdfobj{% + <<% + /Type/Filespec% + /F(\atfi@file)% + \ifx\atfi@ucfilespec\@empty + \else + /UF(\atfi@ucfilespec)% + \fi + /EF<<% + /F \@nameuse{atfi@fileobj@#1} 0 R% + >>% >>% - >>% - }% - \expandafter\xdef\csname atfi@fsobj@#1\endcsname{% - \the\pdflastobj - }% + }% + \expandafter\xdef\csname atfi@fsobj@#1\endcsname{% + \the\pdflastobj + }% + \endgroup }{% }% \pdfannot width \atfi@scale\atfi@appearancewidth diff --git a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty index ea4124bfbd4..6619d689770 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/attachfile2.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2005-2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2005-2009 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 @@ -29,21 +29,17 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2008/07/29 v2.4 attach files into PDF (HO)]% + [2009/09/25 v2.5 attach files into PDF (HO)]% \RequirePackage{ifpdf} \RequirePackage{keyval} \RequirePackage{color} \RequirePackage{kvoptions}[2006/08/17] +\RequirePackage{pdfescape}[2007/11/11] \RequirePackage{hyperref} \RequirePackage{hycolor}[2008/07/29] -\def\atfi@pdfstringdef#1#2{% - \pdfstringdef\atfi@temp@string{#2}% - \edef#1{\atfi@temp@string}% -} - \def\atfi@hexdigit#1{% \ifcase#1% @@ -189,7 +185,7 @@ \atfi@timezone)% } \define@key{AtFi}{date}{% - \atfi@pdfstringdef\atfi@date{#1}% + \EdefEscapeString\atfi@date{#1}% \edef\atfi@date{/M(\atfi@date)}% } @@ -241,6 +237,15 @@ \def\atfi@scale{#1}% } +\def\atfi@ucfilespec{} +\define@key{AtFi}{ucfilespec}[1]{% + \def\atfi@ucfilespec{#1}% + \ifx\atfi@ucfilespec\@empty + \else + \atfi@pdfstringdef\atfi@ucfilespec{#1}% + \fi +} + \newif\ifatfi@nofiles \atfi@nofilesfalse \define@key{AtFi}{nofiles}[true]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty index 3ec6ebb23b0..27fbd26751d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/dtx-attach.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006-2009 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 @@ -31,8 +31,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dtx-attach} - [2007/11/25 v2.3 Embed \string\jobname.dtx (HO)]% -\RequirePackage{embedfile}[2007/11/25] + [2009/09/25 v2.4 Embed \string\jobname.dtx (HO)]% +\RequirePackage{embedfile}[2009/09/25] \embedfile[% stringmethod=escape,% mimetype=plain/text,% diff --git a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty index 7adb01628bb..a7ff7208a83 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/embedfile.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006-2009 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 @@ -89,7 +89,7 @@ \fi \expandafter\x\csname ver@embedfile.sty\endcsname \ProvidesPackage{embedfile}% - [2007/11/25 v2.3 embed files into PDF (HO)] + [2009/09/25 v2.4 embed files into PDF (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -151,6 +151,7 @@ \expandafter\endinput \fi \EmFi@RequirePackage{pdftexcmds}[2007/11/11] +\EmFi@RequirePackage{ltxcmds}[2009/08/05] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdf@filesize\endcsname\relax \EmFi@Error{% @@ -181,7 +182,6 @@ \EmFi@temp{true} \EmFi@temp{false} \newif\ifEmFi@collection -\newif\ifEmFi@initialfile \newif\ifEmFi@sort \newif\ifEmFi@visible \newif\ifEmFi@edit @@ -280,6 +280,7 @@ } \EmFi@DefineKey{mimetype}{} \EmFi@DefineKey{filespec}{\EmFi@file} +\EmFi@DefineKey{ucfilespec}{} \EmFi@DefineKey{filesystem}{} \EmFi@DefineKey{desc}{} \EmFi@DefineKey{stringmethod}{% @@ -306,17 +307,11 @@ } \def\embedfileifobjectexists#1#2{% \expandafter\ifx\csname EmFi@#2@#1\endcsname\relax - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi } -\expandafter\ifx\csname @firstoftwo\endcsname\relax - \long\def\@firstoftwo#1#2{#1}% -\fi -\expandafter\ifx\csname @secondoftwo\endcsname\relax - \long\def\@secondoftwo#1#2{#2}% -\fi \def\embedfilegetobject#1#2{% \embedfileifobjectexists{#1}{#2}{% \csname EmFi@#2@#1\endcsname @@ -329,7 +324,7 @@ \def\EmFi@next{% \global\EmFi@collectiontrue }% - \ifx\EmFi@temp\empty + \ifx\EmFi@temp\ltx@empty \let\EmFi@view\EmFi@S@details \else\ifx\EmFi@temp\EmFi@S@details \let\EmFi@view\EmFi@S@details @@ -465,13 +460,13 @@ `\EmFi@S@descending }\@ehc \fi\fi - \ifx\EmFi@temp\empty + \ifx\EmFi@temp\ltx@empty \else \xdef\EmFi@sortkeys{% \EmFi@sortkeys /\pdf@escapename{#1}% }% - \ifx\EmFi@sortorders\empty + \ifx\EmFi@sortorders\ltx@empty \global\let\EmFi@sortorders\EmFi@temp \gdef\EmFi@sortcase{1}% \else @@ -561,9 +556,6 @@ \else \begingroup \def\EmFi@file{#2}% - \ifx\EmFi@file\EmFi@initialfile - \global\EmFi@initialfiletrue - \fi \setkeys{EmFi}{#1}% \expandafter\expandafter\expandafter \ifx\expandafter\expandafter\expandafter @@ -574,9 +566,16 @@ The unknown file is not embedded.% }% \else - \EmFi@convert\EmFi@filespec\EmFi@@filespec - \ifx\EmFi@desc\empty - \let\EmFi@@desc\empty + \edef\EmFi@@filespec{% + \pdf@escapestring{\EmFi@filespec}% + }% + \ifx\EmFi@ucfilespec\ltx@empty + \let\EmFi@@ucfilespec\ltx@empty + \else + \EmFi@convert\EmFi@ucfilespec\EmFi@@ucfilespec + \fi + \ifx\EmFi@desc\ltx@empty + \let\EmFi@@desc\ltx@empty \else \EmFi@convert\EmFi@desc\EmFi@@desc \fi @@ -591,7 +590,7 @@ \fi \immediate\pdfobj stream attr{% /Type/EmbeddedFile% - \ifx\EmFi@mimetype\empty + \ifx\EmFi@mimetype\ltx@empty \else /Subtype/\pdf@escapename{\EmFi@mimetype}% \fi @@ -605,12 +604,16 @@ \immediate\pdfobj{% <<% /Type/Filespec% - \ifx\EmFi@filesystem\empty + \ifx\EmFi@filesystem\ltx@empty \else /FS/\pdf@escapename{\EmFi@filesystem}% \fi /F(\EmFi@@filespec)% - \ifx\EmFi@@desc\empty + \ifx\EmFi@@ucfilespec\ltx@empty + \else + /UF(\EmFi@@ucfilespec)% + \fi + \ifx\EmFi@@desc\ltx@empty \else /Desc(\EmFi@@desc)% \fi @@ -654,19 +657,18 @@ \edef#2{\pdf@escapestring{#1}}% \fi } -\global\let\EmFi@list\empty +\global\let\EmFi@list\ltx@empty \def\EmFi@add#1#2{% \begingroup - \edef\key{\pdf@escapehex{#1}}% - \ifx\EmFi@list\empty - \xdef\EmFi@list{\noexpand\do{\key}{#2}}% + \ifx\EmFi@list\ltx@empty + \xdef\EmFi@list{\noexpand\do{#1}{#2}}% \else \def\do##1##2{% - \ifnum\pdf@strcmp{##1}{\key}>0 % + \ifnum\pdf@strcmp{##1}{#1}>0 % \edef\x{% \toks@{% \the\toks@% - \noexpand\do{\key}{#2}% + \noexpand\do{#1}{#2}% \noexpand\do{##1}{##2}% }% }% @@ -682,7 +684,7 @@ \fi }% \def\stop{% - \xdef\EmFi@list{\the\toks@\noexpand\do{\key}{#2}}% + \xdef\EmFi@list{\the\toks@\noexpand\do{#1}{#2}}% }% \toks@{}% \EmFi@list\stop @@ -697,12 +699,12 @@ The list of embedded files is already written.% }% \else - \ifx\EmFi@list\empty + \ifx\EmFi@list\ltx@empty \else \global\EmFi@finishedtrue \begingroup \def\do##1##2{% - <##1>##2% + (##1)##2% }% \immediate\pdfobj{% <<% @@ -713,21 +715,37 @@ /EmbeddedFiles \the\pdflastobj\space 0 R% }% \endgroup - \ifEmFi@initialfile + \ifx\EmFi@initialfile\ltx@empty + \else \EmFi@collectiontrue \fi \ifEmFi@collection - \ifEmFi@initialfile + \ifx\EmFi@initialfile\ltx@empty + \let\EmFi@@initialfile\ltx@empty \else - \ifx\EmFi@initialfile\empty - \EmFi@convert\EmFi@initialfile\EmFi@initialfile - \else - \@PackageWarningNoLine{embedfile}{% - Missing initial file `\EmFi@initialfile'\MessageBreak - among the embedded files% - }% - \EmFi@initialfilefalse - \fi + \edef\EmFi@@initialfile{% + \pdf@escapestring{\EmFi@initialfile}% + }% + \fi + \begingroup + \let\f=N% + \def\do##1##2{% + \def\x{##1}% + \ifx\x\EmFi@@initialfile + \let\f=Y% + \let\do\ltx@gobbletwo + \fi + }% + \EmFi@list + \expandafter\endgroup + \ifx\f Y% + \else + \@PackageWarningNoLine{embedfile}{% + Missing initial file `\EmFi@initialfile'\MessageBreak + among the embedded files% + }% + \let\EmFi@initialfile\ltx@empty + \let\EmFi@@initialfile\ltx@empty \fi \ifcase\EmFi@sortcase \def\EmFi@temp{}% @@ -749,19 +767,20 @@ }% \immediate\pdfobj{% <<% - \ifx\EmFi@schema\empty + \ifx\EmFi@schema\ltx@empty \else /Schema<<\EmFi@schema>>% \fi - \ifEmFi@initialfile - /D(\EmFi@initialfile)% + \ifx\EmFi@@initialfile\ltx@empty + \else + /D(\EmFi@@initialfile)% \fi \ifx\EmFi@view\EmFi@S@tile /View/T% \else\ifx\EmFi@view\EmFi@S@hidden /View/H% \fi\fi - \ifx\EmFi@temp\empty + \ifx\EmFi@temp\ltx@empty \EmFi@temp \else /Sort<<\EmFi@temp>>% diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty index ab5f4eeced0..2825290c983 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty @@ -88,7 +88,7 @@ \fi \expandafter\x\csname ver@epstopdf-base.sty\endcsname \ProvidesPackage{epstopdf-base}% - [2009/07/16 v2.2 Base part for package epstopdf] + [2009/09/24 v2.3 Base part for package epstopdf] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -372,7 +372,9 @@ \fi \ifx\ETE@suffix\@empty \else - \edef\noexpand\Gin@base{\Gin@base\ETE@suffix}% + \edef\noexpand\Gin@base{% + \noexpand\Gin@base\ETE@suffix + }% \fi \noexpand\ETE@OrgGin@setfile{% \GraphicsType diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty index c6b554ec603..d06ae6b970e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty @@ -88,7 +88,7 @@ \fi \expandafter\x\csname ver@epstopdf.sty\endcsname \ProvidesPackage{epstopdf}% - [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)] + [2009/09/24 v2.3 Conversion with epstopdf on the fly (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -116,7 +116,7 @@ \TMP@EnsureCode{45}{12}% - \TMP@EnsureCode{47}{12}% / \let\ETE@SavedAtEnd\ETE@AtEnd -\RequirePackage{epstopdf-base}[2009/07/16] +\RequirePackage{epstopdf-base}[2009/09/24] \let\ETE@AtEnd\ETE@SavedAtEnd \DeclareOption*{% \expandafter\epstopdfsetup\expandafter{\CurrentOption}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index 829dbbcd6da..5d5216c5075 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2008 by Heiko Oberdiek <oberdiek@uni-freiburg.de> +%% Copyright (C) 2006-2009 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 @@ -29,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2008/10/13 v1.9 Extended file name support for graphics (HO)]% + [2009/09/25 v1.10 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -229,26 +229,66 @@ \def\grffile@filename@simple#1.#2\\{% \ifx\\#2\\% - \ifx\filename@base\@empty - \let\filename@ext\relax + \def\filename@base{#1}% + \let\filename@ext\relax + \else + \def\filename@base{}% + \grffile@analyze@ext{#1}.{#2}\\% + \fi +} + +\def\grffile@analyze@ext#1.#2\\{% + \let\grffile@next\relax + \ifx\\#2\\% + \edef\filename@base{\filename@base#1}% + \let\filename@ext\relax + \def\grffile@next{\grffile@try@extlist}% + \else + \edef\filename@base{\filename@base #1}% + \edef\filename@ext{\filename@dot#2\\}% + \expandafter\ifx\csname Gin@rule@.\filename@ext\endcsname\relax + \edef\filename@base{\filename@base.}% + \def\grffile@next{\grffile@analyze@ext#2\\}% \else - \grffile@ReturnAfterFiFiBase{% - \edef\filename@base{\expandafter\filename@dot\filename@base\\}% - \edef\filename@ext{#1}% + \grffile@IfFileExists{\filename@area\filename@base.\filename@ext}{% + % success + }{% + \edef\filename@base{\filename@base.\filename@ext}% + \let\filename@ext\relax + \def\grffile@next{\grffile@try@extlist}% }% \fi + \fi + \grffile@next +} + +\def\grffile@try@extlist{% + \@for\grffile@temp:=\Gin@extensions\do{% + \grffile@IfFileExists{\filename@area\filename@base\grffile@temp}{% + \ifx\filename@ext\relax + \edef\filename@ext{\expandafter\@gobble\grffile@temp\@empty}% + \fi + }{}% + }% + \ifx\filename@ext\relax + \expandafter\let\expandafter\filename@base\expandafter\@empty + \expandafter\grffile@use@last@ext\filename@base.\\% + \fi +} + +\def\grffile@use@last@ext#1.#2\\{% + \ifx\\#2\\% + \edef\filename@base{\expandafter\filename@dot\filename@base\\}% + \def\filename@ext{#1}% + \expandafter\@gobble \else - \expandafter\ifx\csname - Gin@rule@.\filename@dot #2\\\endcsname\relax - \edef\filename@base{\filename@base #1.}% - \grffile@ReturnAfterFiFiBase{\grffile@filename@simple #2\\}% - \else - \edef\filename@ext{\filename@dot #2\\}% - \fi + \edef\filename@base{\filename@base#1.}% + \expandafter\@firstofone \fi - \edef\filename@base{\filename@base #1}% + {% + \grffile@use@last@ext#2\\% + }% } -\def\grffile@ReturnAfterFiFiBase#1#2\fi\edef\filename@base#3{\fi\fi#1} \def\grffile@option@status#1{% \begingroup \let\on@line\@empty |