From 801f243e1382ba3fc8798cc8e38db540c8dc9d6e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 20 Jul 2017 21:22:36 +0000 Subject: draftfigure (20jul17) git-svn-id: svn://tug.org/texlive/trunk@44854 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/draftfigure/draftfigure.sty | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/draftfigure') diff --git a/Master/texmf-dist/tex/latex/draftfigure/draftfigure.sty b/Master/texmf-dist/tex/latex/draftfigure/draftfigure.sty index 71d189e27df..ab2bf74851d 100644 --- a/Master/texmf-dist/tex/latex/draftfigure/draftfigure.sty +++ b/Master/texmf-dist/tex/latex/draftfigure/draftfigure.sty @@ -9,8 +9,8 @@ % http://www.latex-project.org/lppl.txt % and version 1.3 or later is part of all distributions of LaTeX % version 2005/12/01 or later. - \def\df@date{2017/05/06} - \def\df@version{0.1} + \def\df@date{2017/07/19} + \def\df@version{0.2} \def\df@styid{\df@date\space v\df@version\space draftfigure (LCB)} \let\dfdate\df@date \let\dfversion\df@version @@ -40,12 +40,7 @@ \patchcmd{\Gin@setfile}{\expandafter\strip@prefix\meaning\@tempa}{\@draftfigure}{}{} -\providecommand\df@noframe{% NOT WORKING - \patchcmd\Gin@setfile{\vrule\hss}{\vrule\@width\z@\hss}{}{}%left - \patchcmd\Gin@setfile{\hss\vrule}{\hss\vrule\@width\z@}{}{}%right - \patchcmd\Gin@setfile{\hrule\@width}{\hrule\@height\z@\@width}{}{}%top - \patchcmd\Gin@setfile{\vss\hrule}{\vss\hrule\@height\z@}{}{}%bottom -} +\providecommand\df@noframe %% Declare a package option \DeclareOptionX{content}{\def\df@content{#1}} @@ -56,12 +51,13 @@ \DeclareOptionX{style}[sf]{\def\df@style{\csname df@style@#1\endcsname}} \DeclareOptionX{position}[right]{\def\df@position{\csname df@position@#1\endcsname}} \DeclareOptionX{allfiguresdraft}[true]{\setkeys{Gin}{draft=#1}} -\DeclareOptionX{noframe}[true]{\csuse{bool#1}{df@noframe}\df@noframe +\DeclareOptionX{noframe}[true]{\csuse{bool#1}{df@noframe} + \ifbool{df@noframe}{% \patchcmd\Gin@setfile{\vrule\hss}{\vrule\@width\z@\hss}{}{}%left \patchcmd\Gin@setfile{\hss\vrule}{\hss\vrule\@width\z@}{}{}%right \patchcmd\Gin@setfile{\hrule\@width}{\hrule\@height\z@\@width}{}{}%top \patchcmd\Gin@setfile{\vss\hrule}{\vss\hrule\@height\z@}{}{}%bottom -} +}{}} %% predefined styles \providecommand\df@style@normal{\normalfont} @@ -94,8 +90,7 @@ \define@key{draftfigure}{code}{% \def\df@style{#1}} \define@key{draftfigure}{noframe}[true]{% - \csuse{bool#1}{df@noframe} - \df@noframe} + \csuse{bool#1}{df@noframe}} \define@key{draftfigure}{filename}[true]{% \csuse{bool#1}{df@filename}} \define@key{draftfigure}{content}[]{% @@ -117,10 +112,10 @@ \df@position% \df@size% \df@style% - \df@content% +\df@content% \ifbool{df@filename}{% \ifdef{\df@content}% - {\mbox{~}\\[\baselineskip]}% + {\par}% {}% \expandafter\strip@prefix\meaning\@tempa}% {}% -- cgit v1.2.3