summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/grffile.dtx')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/grffile.dtx83
1 files changed, 53 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
index abe16548837..b7a20b32b74 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-2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006-2010 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: grffile 2009/09/25 v1.10 Extended file name support for graphics (HO)}
+\Msg{* Package: grffile 2010/01/28 v1.11 Extended file name support for graphics (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -81,7 +81,7 @@
This is a generated file.
-Copyright (C) 2006-2009 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006-2010 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
@@ -141,7 +141,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{grffile.drv}%
- [2009/09/25 v1.10 Extended file name support for graphics (HO)]%
+ [2010/01/28 v1.11 Extended file name support for graphics (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -150,7 +150,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{561}
+% \CheckSum{596}
%
% \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{grffile.drv}
%
% \title{The \xpackage{grffile} package}
-% \date{2009/09/25 v1.10}
+% \date{2010/01/28 v1.11}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -379,7 +379,7 @@ and the derived files
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{grffile}%
- [2009/09/25 v1.10 Extended file name support for graphics (HO)]%
+ [2010/01/28 v1.11 Extended file name support for graphics (HO)]%
% \end{macrocode}
%
% \subsection{Catcode stuff}
@@ -576,31 +576,50 @@ and the derived files
}{%
}%
}
-\def\grffile@IfFileExists#1{%
- \expandafter\expandafter\expandafter
- \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\%
- \let\reserved@a\@secondoftwo
- \ifx\input@path\@undefined
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdf@filesize\endcsname\relax
+ \begingroup
+ \let\on@line\@empty
+ \PackageInfo{grffile}{%
+ \string\grffile@IfFileExists\space without space support,%
+ \MessageBreak
+ because pdfTeX's \string\pdffilesize\space is not available%
+ }%
+ \endgroup
+ \def\grffile@IfFileExists#1{%
+ \IfFileExists{#1}{%
+ \let\grffile@IFE@next\@firstoftwo
+ }{%
+ \let\grffile@IFE@next\@secondoftwo
+ }%
+ \grffile@IFE@next
+ }%
+\else
+ \def\grffile@IfFileExists#1{%
+ \expandafter\expandafter\expandafter
+ \ifx\expandafter\expandafter\expandafter\\\pdf@filesize{#1}\\%
+ \let\reserved@a\@secondoftwo
+ \ifx\input@path\@undefined
+ \else
+ \expandafter\@tfor\expandafter\reserved@b\expandafter
+ :\expandafter=\input@path\do{%
+ \expandafter\expandafter\expandafter
+ \ifx\expandafter\expandafter\expandafter
+ \\\pdf@filesize{\reserved@b#1}\\%
+ \else
+ \edef\grffile@file@found{\reserved@b#1}%
+ \let\reserved@a\@firstoftwo
+ \@break@tfor
+ \fi
+ }%
+ \fi
+ \expandafter\reserved@a
\else
- \expandafter\@tfor\expandafter\reserved@b\expandafter
- :\expandafter=\input@path\do{%
- \expandafter\expandafter\expandafter
- \ifx\expandafter\expandafter\expandafter
- \\\pdf@filesize{\reserved@b#1}\\%
- \else
- \edef\grffile@file@found{\reserved@b#1}%
- \let\reserved@a\@firstoftwo
- \@break@tfor
- \fi
- }%
+ \edef\grffile@file@found{#1}%
+ \expandafter\@firstoftwo
\fi
- \expandafter\reserved@a
- \else
- \edef\grffile@file@found{#1}%
- \expandafter\@firstoftwo
- \fi
-}
-
+ }%
+\fi
\def\grffile@Ginclude@graphics#1{%
\begingroup
\ifgrffile@space
@@ -1013,6 +1032,10 @@ showpage
% Rewrite of `multidot' algorithm to fix a problem
% (`multidot' with \cs{graphicspath}).
% \end{Version}
+% \begin{Version}{2010/01/28 v1.11}
+% \item
+% Undefined \cs{pdf@filesize} fixed.
+% \end{Version}
% \end{History}
%
% \PrintIndex