From 5dd252b48248fa6831f6b7173fd54e9e9b24caf9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Oct 2008 00:14:08 +0000 Subject: oberdiek update (13oct08) git-svn-id: svn://tug.org/texlive/trunk@10966 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/oberdiek/grffile.sty | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty index e97c4ad17a1..829dbbcd6da 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/grffile.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/grffile.sty @@ -24,11 +24,12 @@ %% %% This work consists of the main source file grffile.dtx %% and the derived files -%% grffile.sty, grffile.pdf, grffile.ins, grffile.drv. +%% grffile.sty, grffile.pdf, grffile.ins, grffile.drv, +%% grffile-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{grffile}% - [2008/08/11 v1.8 Extended file name support for graphics (HO)]% + [2008/10/13 v1.9 Extended file name support for graphics (HO)]% \edef\grffile@RestoreCatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax \catcode`\noexpand\:\the\catcode`\:\relax @@ -228,7 +229,14 @@ \def\grffile@filename@simple#1.#2\\{% \ifx\\#2\\% - \let\filename@ext\relax + \ifx\filename@base\@empty + \let\filename@ext\relax + \else + \grffile@ReturnAfterFiFiBase{% + \edef\filename@base{\expandafter\filename@dot\filename@base\\}% + \edef\filename@ext{#1}% + }% + \fi \else \expandafter\ifx\csname Gin@rule@.\filename@dot #2\\\endcsname\relax @@ -240,7 +248,7 @@ \fi \edef\filename@base{\filename@base #1}% } -\def\grffile@ReturnAfterFiFiBase#1#2\filename@base#3{\fi\fi#1} +\def\grffile@ReturnAfterFiFiBase#1#2\fi\edef\filename@base#3{\fi\fi#1} \def\grffile@option@status#1{% \begingroup \let\on@line\@empty -- cgit v1.2.3