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 --- .../texmf-dist/source/latex/oberdiek/grffile.dtx | 80 +++++++++++++++++++--- 1 file changed, 71 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/source/latex/oberdiek/grffile.dtx') diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx index 8d0cb08c109..91949e5c5f0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx @@ -16,7 +16,8 @@ % % 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. % % Distribution: % CTAN:macros/latex/contrib/oberdiek/grffile.dtx @@ -51,6 +52,7 @@ % Installation: % TDS:tex/latex/oberdiek/grffile.sty % TDS:doc/latex/oberdiek/grffile.pdf +% TDS:doc/latex/oberdiek/test/grffile-test1.tex % TDS:source/latex/oberdiek/grffile.dtx % %<*ignore> @@ -66,7 +68,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: grffile 2008/08/11 v1.8 Extended file name support for graphics (HO)} +\Msg{* Package: grffile 2008/10/13 v1.9 Extended file name support for graphics (HO)} \Msg{************************************************************************} \keepsilent @@ -93,7 +95,8 @@ This Current Maintainer of this work is Heiko Oberdiek. 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. \endpreamble \let\MetaPrefix\DoubleperCent @@ -103,6 +106,8 @@ and the derived files \file{grffile.drv}{\from{grffile.dtx}{driver}}% \usedir{tex/latex/oberdiek}% \file{grffile.sty}{\from{grffile.dtx}{package}}% + \usedir{doc/latex/oberdiek/test}% + \file{grffile-test1.tex}{\from{grffile.dtx}{test1}}% } \obeyspaces @@ -132,7 +137,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{grffile.drv}% - [2008/08/11 v1.8 Extended file name support for graphics (HO)]% + [2008/10/13 v1.9 Extended file name support for graphics (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -141,7 +146,7 @@ and the derived files % % \fi % -% \CheckSum{446} +% \CheckSum{474} % % \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 @@ -162,7 +167,7 @@ and the derived files % \GetFileInfo{grffile.drv} % % \title{The \xpackage{grffile} package} -% \date{2008/08/11 v1.8} +% \date{2008/10/13 v1.9} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -370,7 +375,7 @@ and the derived files %<*package> \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)]% % \end{macrocode} % % \subsection{Catcode stuff} @@ -607,7 +612,14 @@ and the derived files \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 @@ -619,7 +631,7 @@ and the derived files \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} % \end{macrocode} % % Print current option setting @@ -655,6 +667,51 @@ and the derived files % % \end{macrocode} % +% \section{Test} +% +% \subsection{Multidot with default rule} +% +% \begin{macrocode} +%<*test1> +\NeedsTeXFormat{LaTeX2e} +\documentclass{article} +\usepackage{filecontents} +% file grffile-test.mp: +% beginfig(1); +% draw fullcircle scaled 2cm withpen pencircle scaled 2mm; +% endfig; +% end +\begin{filecontents*}{grffile-test.1} +%!PS +%%BoundingBox: -32 -32 32 32 +%%Creator: MetaPost +%%CreationDate: 2004.06.16:1257 +%%Pages: 1 +%%EndProlog +%%Page: 1 1 + 0 5.66928 dtransform truncate idtransform setlinewidth pop [] 0 setdash + 1 setlinejoin 10 setmiterlimit +newpath 28.34645 0 moveto +28.34645 7.51828 25.35938 14.72774 20.04356 20.04356 curveto +14.72774 25.35938 7.51828 28.34645 0 28.34645 curveto +-7.51828 28.34645 -14.72774 25.35938 -20.04356 20.04356 curveto +-25.35938 14.72774 -28.34645 7.51828 -28.34645 0 curveto +-28.34645 -7.51828 -25.35938 -14.72774 -20.04356 -20.04356 curveto +-14.72774 -25.35938 -7.51828 -28.34645 0 -28.34645 curveto +7.51828 -28.34645 14.72774 -25.35938 20.04356 -20.04356 curveto +25.35938 -14.72774 28.34645 -7.51828 28.34645 0 curveto closepath stroke +showpage +%%EOF +\end{filecontents*} +\usepackage{graphicx} +\usepackage[multidot]{grffile}[2008/10/13] +\DeclareGraphicsRule{*}{mps}{*}{} % for pdflatex +\begin{document} +\includegraphics{grffile-test.1} +\end{document} +% +% \end{macrocode} +% % \section{Installation} % % \subsection{Download} @@ -716,6 +773,7 @@ and the derived files % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}} % grffile.sty & tex/latex/oberdiek/grffile.sty\\ % grffile.pdf & doc/latex/oberdiek/grffile.pdf\\ +% test/grffile-test1.tex & doc/latex/oberdiek/test/grffile-test1.tex\\ % grffile.dtx & source/latex/oberdiek/grffile.dtx\\ % \end{tabular}^^A % }^^A @@ -902,6 +960,10 @@ and the derived files % \item % URLs updated. % \end{Version} +% \begin{Version}{2008/10/13 v1.9} +% \item +% Fix for option `multidot' with default rule. +% \end{Version} % \end{History} % % \PrintIndex -- cgit v1.2.3