diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
6 files changed, 280 insertions, 154 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx index 0c23d2ca767..c60089364cf 100644 --- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -70,7 +70,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: attachfile2 2008/07/29 v2.4 attach files into PDF (HO)} +\Msg{* Package: attachfile2 2009/09/25 v2.5 attach files into PDF (HO)} \Msg{************************************************************************} \keepsilent @@ -81,7 +81,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 @@ -144,7 +144,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{attachfile2.drv}% - [2008/07/29 v2.4 attach files into PDF (HO)]% + [2009/09/25 v2.5 attach files into PDF (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -153,7 +153,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1380} +% \CheckSum{1405} % % \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 @@ -174,7 +174,7 @@ and the derived files % \GetFileInfo{attachfile2.drv} % % \title{The \xpackage{attachfile2} package} -% \date{2008/07/29 v2.4} +% \date{2009/09/25 v2.5} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -280,6 +280,8 @@ and the derived files % \item New option \xoption{scale} for scaling the annotation rectangle. % \item Options \xoption{file} and \xoption{nofile} for controlling % the generation of the auxiliary file \xfile{.atfi}. +% \item New option \xoption{ucfilespec} for file names with +% characters outside ASCII (PDF 1.7). % \end{itemize} % % \subsubsection{Option \xoption{color}} @@ -392,13 +394,14 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2008/07/29 v2.4 attach files into PDF (HO)]% + [2009/09/25 v2.5 attach files into PDF (HO)]% % \end{macrocode} % \begin{macrocode} \RequirePackage{ifpdf} \RequirePackage{keyval} \RequirePackage{color} \RequirePackage{kvoptions}[2006/08/17] +\RequirePackage{pdfescape}[2007/11/11] % --- hyperref --- @@ -406,11 +409,6 @@ and the derived files % because of \pdfstringdef \RequirePackage{hycolor}[2008/07/29] -\def\atfi@pdfstringdef#1#2{% - \pdfstringdef\atfi@temp@string{#2}% - \edef#1{\atfi@temp@string}% -} - % --- convert to hex --- \def\atfi@hexdigit#1{% @@ -566,7 +564,7 @@ and the derived files \atfi@timezone)% } \define@key{AtFi}{date}{% - \atfi@pdfstringdef\atfi@date{#1}% + \EdefEscapeString\atfi@date{#1}% \edef\atfi@date{/M(\atfi@date)}% } @@ -627,6 +625,16 @@ and the derived files \def\atfi@scale{#1}% } +% option ucfilespec +\def\atfi@ucfilespec{} +\define@key{AtFi}{ucfilespec}[1]{% + \def\atfi@ucfilespec{#1}% + \ifx\atfi@ucfilespec\@empty + \else + \atfi@pdfstringdef\atfi@ucfilespec{#1}% + \fi +} + % option nofiles \newif\ifatfi@nofiles \atfi@nofilesfalse @@ -1159,7 +1167,7 @@ and the derived files %<*pdftex> \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)]% % \end{macrocode} % \begin{macrocode} \let\atfi@literal\pdfliteral @@ -1253,19 +1261,26 @@ and the derived files \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 @@ -1298,7 +1313,7 @@ and the derived files %<*dvips> \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)]% % \end{macrocode} % \begin{macrocode} \def\atfi@literal#1{% @@ -1748,23 +1763,30 @@ and the derived files \@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{% @@ -1835,8 +1857,8 @@ $^W=1; # turn warning on # my $file = "pdfatfi.pl"; my $program = uc($&) if $file =~ /^\w+/; -my $version = "2.4"; -my $date = "2008/07/29"; +my $version = "2.5"; +my $date = "2009/09/25"; my $author = "Heiko Oberdiek"; my $copyright = "Copyright (c) 2005, 2006 by $author."; # @@ -2267,6 +2289,13 @@ __END__ % the usual color specifications if package \xpackage{xcolor} is % loaded. % \end{Version} +% \begin{Version}{2009/09/25 v2.5} +% \item +% New option \xoption{ucfilespec} (since PDF 1.7). +% \item +% Fix: \xpackage{hyperref}'s option \xoption{unicode} is disabled +% for file names except for \xoption{ucfilespec}. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx index beb7675f472..a6bc8487e13 100644 --- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -75,7 +75,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: embedfile 2007/11/25 v2.3 embed files into PDF (HO)} +\Msg{* Package: embedfile 2009/09/25 v2.4 embed files into PDF (HO)} \Msg{************************************************************************} \keepsilent @@ -86,7 +86,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 @@ -152,7 +152,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{embedfile.drv}% - [2007/11/25 v2.3 embed files into PDF (HO)]% + [2009/09/25 v2.4 embed files into PDF (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -161,7 +161,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1396} +% \CheckSum{1418} % % \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 @@ -182,7 +182,7 @@ and the derived files % \GetFileInfo{embedfile.drv} % % \title{The \xpackage{embedfile} package} -% \date{2007/11/25 v2.3} +% \date{2009/09/25 v2.4} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -261,10 +261,24 @@ and the derived files % \item[\xoption{filespec}] % This allows to override the file name % that appears in the PDF file. If you are using other than -% simple file names (8bit, path separators, \dots), look into +% simple file names (8-bit, path separators, \dots), look into % the PDF specification (\cite{pdfspec}). -% There are rules how these file names -% must be written/encoded. +% There are rules how these file names must be written/encoded. +% Avoid 8-bit characters +% and other special characters, the behaviour is currently undefined. +% Use option \xoption{ucfilespec} for more funny file names. +% The string method, see below, is |escape| since version 2.4. +% +% This name is also used as entry in a name tree +% (see PDF specification: |/EmbeddedFiles|). Therefore the +% value for \xoption{filespec} must be unique among all +% embedded files. Also key \xoption{initialfiles} refers +% to this name, if the file name and the value of \xoption{filespec} +% are different. +% \item[\xoption{ucfilespec}] +% Since PDF 1.7 the file name may be provided in Unicode. +% The conversion of the option value into a PDF string +% is controlled by option \xoption{stringmethod}. % \item[\xoption{filesystem}] % This sets the entry \verb|/FS| in % the file specification dictionary, see PDF specification @@ -277,8 +291,9 @@ and the derived files % \item[\xoption{desc}] % The description for the file. % \item[\xoption{stringmethod}] -% The package must convert the values of the keys \xoption{filespec} -% and \xoption{desc} into a PDF string. If \xpackage{hyperref} +% The package must convert the values of the keys \xoption{ucfilespec} +% and \xoption{desc} into a PDF string (before version 2.4: \xoption{filespec} +% and \xoption{desc}). If \xpackage{hyperref} % is found, then its \cs{pdfstringdef} will be used, otherwise % \pdfTeX's \cs{pdfescapestring} is used. Value \verb|psd| % forces the use of \cs{pdfstringdef}, value \verb|escape| @@ -356,7 +371,10 @@ and the derived files % \item[\xoption{initialfile}] % Selects the file that is initially presented. Especially % useful for an embedded PDF file that is then shown instead -% of the cover document. +% of the cover document. There must be an \cs{embedfile} command +% somewhere whose value for key \xoption{filespec} is used here. +% The \cs{embedfile} command can drop option \xoption{filespec} +% if the file name is not different. % \end{description} % % \begin{declcs}{embedfilefield} \M{key} \M{options} @@ -518,7 +536,7 @@ This example document contains three embedded files. \usepackage[bookmarks=false]{hyperref} % provides \pdfstringdef that is then used by `title' and % other keys. -\usepackage{embedfile}[2007/11/25] +\usepackage{embedfile}[2009/09/25] \embedfilesetup{ view=details, initialfile=embedfile.pdf @@ -586,8 +604,8 @@ You need Acrobat Reader 8 or higher. %<*dtxattach> \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,% @@ -671,7 +689,7 @@ You need Acrobat Reader 8 or higher. \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)] % \end{macrocode} % % \subsection{Catcodes} @@ -758,6 +776,7 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % \begin{macrocode} \EmFi@RequirePackage{pdftexcmds}[2007/11/11] +\EmFi@RequirePackage{ltxcmds}[2009/08/05] % \end{macrocode} % Check version. % \begin{macrocode} @@ -869,11 +888,6 @@ You need Acrobat Reader 8 or higher. \newif\ifEmFi@collection % \end{macrocode} % \end{macro} -% \begin{macro}{\ifEmFi@initialfile} -% \begin{macrocode} -\newif\ifEmFi@initialfile -% \end{macrocode} -% \end{macro} % \begin{macro}{\ifEmFi@sort} % \begin{macrocode} \newif\ifEmFi@sort @@ -1041,6 +1055,10 @@ You need Acrobat Reader 8 or higher. % \begin{macrocode} \EmFi@DefineKey{filespec}{\EmFi@file} % \end{macrocode} +% File specification string in Unicode. +% \begin{macrocode} +\EmFi@DefineKey{ucfilespec}{} +% \end{macrocode} % File system (optional). % \begin{macrocode} \EmFi@DefineKey{filesystem}{} @@ -1086,27 +1104,13 @@ You need Acrobat Reader 8 or higher. % \begin{macrocode} \def\embedfileifobjectexists#1#2{% \expandafter\ifx\csname EmFi@#2@#1\endcsname\relax - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi } % \end{macrocode} % \end{macro} -% \begin{macro}{\@firstoftwo} -% \begin{macrocode} -\expandafter\ifx\csname @firstoftwo\endcsname\relax - \long\def\@firstoftwo#1#2{#1}% -\fi -% \end{macrocode} -% \end{macro} -% \begin{macro}{\@secondoftwo} -% \begin{macrocode} -\expandafter\ifx\csname @secondoftwo\endcsname\relax - \long\def\@secondoftwo#1#2{#2}% -\fi -% \end{macrocode} -% \end{macro} % \begin{macro}{\embedfilegetobject} % \begin{macrocode} \def\embedfilegetobject#1#2{% @@ -1126,7 +1130,7 @@ You need Acrobat Reader 8 or higher. \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 @@ -1293,13 +1297,13 @@ You need Acrobat Reader 8 or higher. `\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 @@ -1425,9 +1429,6 @@ You need Acrobat Reader 8 or higher. \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 @@ -1438,9 +1439,16 @@ You need Acrobat Reader 8 or higher. 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 @@ -1455,7 +1463,7 @@ You need Acrobat Reader 8 or higher. \fi \immediate\pdfobj stream attr{% /Type/EmbeddedFile% - \ifx\EmFi@mimetype\empty + \ifx\EmFi@mimetype\ltx@empty \else /Subtype/\pdf@escapename{\EmFi@mimetype}% \fi @@ -1469,12 +1477,16 @@ You need Acrobat Reader 8 or higher. \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 @@ -1529,7 +1541,7 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % \end{macro} % \begin{macrocode} -\global\let\EmFi@list\empty +\global\let\EmFi@list\ltx@empty % \end{macrocode} % \begin{macro}{\EmFi@add} % Sorting is done by the insertion sort algorithm. @@ -1540,16 +1552,15 @@ You need Acrobat Reader 8 or higher. % \begin{macrocode} \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}% }% }% @@ -1565,7 +1576,7 @@ You need Acrobat Reader 8 or higher. \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 @@ -1584,7 +1595,7 @@ You need Acrobat Reader 8 or higher. The list of embedded files is already written.% }% \else - \ifx\EmFi@list\empty + \ifx\EmFi@list\ltx@empty \else % \end{macrocode} % Write |/EmbeddedFiles| entry. @@ -1592,7 +1603,7 @@ You need Acrobat Reader 8 or higher. \global\EmFi@finishedtrue \begingroup \def\do##1##2{% - <##1>##2% + (##1)##2% }% \immediate\pdfobj{% <<% @@ -1606,21 +1617,40 @@ You need Acrobat Reader 8 or higher. % \end{macrocode} % Write collection objects. % \begin{macrocode} - \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 +% \end{macrocode} +% Look for initial file among the embedded files. +% \begin{macrocode} + \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{}% @@ -1642,19 +1672,20 @@ You need Acrobat Reader 8 or higher. }% \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>>% @@ -1806,7 +1837,7 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% \NeedsTeXFormat{LaTeX2e} \let\SavedJobname\jobname \def\jobname{embedfile} -\RequirePackage{dtx-attach}[2007/11/25] +\RequirePackage{dtx-attach}[2009/09/25] \let\jobname\SavedJobname \documentclass{minimal} \begin{document} @@ -2063,6 +2094,20 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.% % \item % Fix in use of \cs{pdf@filesize}, bug introduced in previous version. % \end{Version} +% \begin{Version}{2009/09/25 v2.4} +% \item +% Bug fix: If \xpackage{hyperref} is used with option \xoption{unicode}, +% the Unicode encoded file name causes trouble. Therefore \cs{pdfstringdef} +% is now never used for option \xoption{filespec}, always method +% \texttt{escape} is applied (Peter Cibulka). +% \item +% Bug fix for \xoption{initialfile}. +% \item +% Bug fix for file names in \texttt{/EmbeddedFiles}. +% \item +% New option \xoption{ucfilespec} for file name support in Unicode +% (since PDF 1.7). +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx index bfbf9e757f6..42dd3cb9e9c 100644 --- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx @@ -70,7 +70,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: epstopdf 2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)} +\Msg{* Package: epstopdf 2009/09/24 v2.3 Conversion with epstopdf on the fly (HO)} \Msg{************************************************************************} \keepsilent @@ -141,7 +141,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{epstopdf.drv}% - [2009/07/16 v2.2 Conversion with epstopdf on the fly (HO)]% + [2009/09/24 v2.3 Conversion with epstopdf on the fly (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -150,7 +150,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{909} +% \CheckSum{910} % % \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 @@ -171,7 +171,7 @@ and the derived files % \GetFileInfo{epstopdf.drv} % % \title{The \xpackage{epstopdf} package} -% \date{2009/07/16 v2.2} +% \date{2009/09/24 v2.3} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -563,7 +563,7 @@ and the derived files \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)] % \end{macrocode} % \begin{macrocode} \begingroup @@ -596,7 +596,7 @@ and the derived files % % \begin{macrocode} \let\ETE@SavedAtEnd\ETE@AtEnd -\RequirePackage{epstopdf-base}[2009/07/16] +\RequirePackage{epstopdf-base}[2009/09/24] \let\ETE@AtEnd\ETE@SavedAtEnd % \end{macrocode} % @@ -689,7 +689,7 @@ and the derived files \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] % \end{macrocode} % % \subsubsection{Catcodes} @@ -1035,7 +1035,9 @@ and the derived files \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 @@ -1497,6 +1499,11 @@ and the derived files % \item % Documentation extended for package options. % \end{Version} +% \begin{Version}{2009/09/24 v2.3} +% \item +% Bug fix for the case that both option \xoption{suffix} and +% \xoption{outdir} are used. +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx index 91949e5c5f0..f2cc5de1fe2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% 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 @@ -68,7 +68,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: grffile 2008/10/13 v1.9 Extended file name support for graphics (HO)} +\Msg{* Package: grffile 2009/09/25 v1.10 Extended file name support for graphics (HO)} \Msg{************************************************************************} \keepsilent @@ -79,7 +79,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 @@ -137,7 +137,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{grffile.drv}% - [2008/10/13 v1.9 Extended file name support for graphics (HO)]% + [2009/09/25 v1.10 Extended file name support for graphics (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -146,7 +146,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{474} +% \CheckSum{561} % % \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 @@ -167,7 +167,7 @@ and the derived files % \GetFileInfo{grffile.drv} % % \title{The \xpackage{grffile} package} -% \date{2008/10/13 v1.9} +% \date{2009/09/25 v1.10} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -375,7 +375,7 @@ and the derived files %<*package> \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)]% % \end{macrocode} % % \subsection{Catcode stuff} @@ -612,26 +612,66 @@ and the derived files \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} % \end{macrocode} % % Print current option setting @@ -964,6 +1004,11 @@ showpage % \item % Fix for option `multidot' with default rule. % \end{Version} +% \begin{Version}{2009/09/25 v1.10} +% \item +% Rewrite of `multidot' algorithm to fix a problem +% (`multidot' with \cs{graphicspath}). +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index c07c36e7374..389e1e4ad0d 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -1,5 +1,5 @@ % oberdiek.ins -% 2009/09/23 +% 2009/09/26 % % Copyright (C) 1999, 2001, 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 12d6ec7bd13..d34f7c6408b 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,7 +6,7 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{oberdiek@uni-freiburg.de} -\newcommand*{\Date}{2009/09/23} +\newcommand*{\Date}{2009/09/26} % Copyright (C) 2006 by % Heiko Oberdiek <oberdiek@uni-freiburg.de> @@ -173,7 +173,7 @@ [\entrysep] \entry{atenddvi}{2007/04/17}{1.1}{At end DVI hook}% [\entrysep] -\entry{attachfile2}{2008/07/29}{2.4}{attach files into PDF}% +\entry{attachfile2}{2009/09/25}{2.5}{attach files into PDF}% [\entrysep] \entry{auxhook}{2007/04/06}{1.1}{Hooks for auxiliary files}% [\entrysep] @@ -197,11 +197,11 @@ [\entrysep] \entry{dvipscol}{2008/08/11}{1.2}{Fix for dvips.def}% [\entrysep] -\entry{embedfile}{2007/11/25}{2.3}{embed files into PDF}% +\entry{embedfile}{2009/09/25}{2.4}{embed files into PDF}% [\entrysep] \entry{engord}{2008/08/11}{1.7}{Provides English ordinal numbers}% [\entrysep] -\entry{epstopdf}{2009/07/16}{2.2}{Conversion with epstopdf on the fly}% +\entry{epstopdf}{2009/09/24}{2.3}{Conversion with epstopdf on the fly}% [\entrysep] \entry{etexcmds}{2007/12/12}{1.2}{Prefix for e-TeX command names}% [\entrysep] @@ -209,7 +209,7 @@ [\entrysep] \entry{grfext}{2007/09/30}{1.0}{Managing graphics extensions}% [\entrysep] -\entry{grffile}{2008/10/13}{1.9}{Extended file name support for graphics}% +\entry{grffile}{2009/09/25}{1.10}{Extended file name support for graphics}% [\entrysep] \entry{holtxdoc}{2009/08/07}{0.12}{Private additional ltxdoc support}% [\entrysep] |