draftfigure (20jul17)

git-svn-id: svn://tug.org/texlive/trunk@44854 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 13 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/draftfigure/README.md b/Master/texmf-dist/doc/latex/draftfigure/README.md
index a3b9f004c1d..ce292a23d1f 100644
--- a/Master/texmf-dist/doc/latex/draftfigure/README.md
+++ b/Master/texmf-dist/doc/latex/draftfigure/README.md
@@ -3,7 +3,7 @@ draftfigure
 
 a package to replace figures with a white box and additional features
 ---
-_2017/05/06 v0.1_
+_2017/07/19 v0.2_
 
 Copyright (c) 2017 Lukas C. Bossert
 
diff --git a/Master/texmf-dist/doc/latex/draftfigure/draftfigure.pdf b/Master/texmf-dist/doc/latex/draftfigure/draftfigure.pdf
index ec8c9d2463b..21587790901 100644
--- a/Master/texmf-dist/doc/latex/draftfigure/draftfigure.pdf
+++ b/Master/texmf-dist/doc/latex/draftfigure/draftfigure.pdf
diff --git a/Master/texmf-dist/doc/latex/draftfigure/draftfigure.tex b/Master/texmf-dist/doc/latex/draftfigure/draftfigure.tex
index 2e03fdea96e..10fcb21f100 100644
--- a/Master/texmf-dist/doc/latex/draftfigure/draftfigure.tex
+++ b/Master/texmf-dist/doc/latex/draftfigure/draftfigure.tex
@@ -22,6 +22,7 @@ english
 \setkeys{Gin}{width=.5\linewidth}
 
 \begin{document}
+\AddRevision{2017-07-19}{Improvement of coding}{Lukas C. Bossert}
 \AddRevision{2017-05-07}{Documentation completed}{Lukas C. Bossert}
 \AddRevision{2017-05-06}{Initial release}{Lukas C. Bossert}
 
@@ -327,7 +328,7 @@ Since you can also set |draft| to individual images you can also pass some of th
 \DescribeMacro{size}
 \DescribeMacro{position}
 \DescribeMacro{content}
-\DescribeMacro{filename}These are |style|, [size], |position|, |content|, |filename|.
+\DescribeMacro{filename}These are |style|, |size|, |position|, |content|, |filename|.
 
 In the preamble there is this setup
 \begin{code}
@@ -400,7 +401,7 @@ There are still things which work not satisfactually:
 \item  color frame
 \item  image instead of text in background
 \end{itemize}
-If anyone has some ideas plase let me know: \href{mailto:lukas@digitales-altertum.de}{lukas@digitales-altertum.de}
+If anyone has some ideas please let me know: \href{mailto:lukas@digitales-altertum.de}{lukas@digitales-altertum.de}
 
 \section{Changelog}
 \PrintRevisions
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}%
  {}%