summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/easyfig
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-07 22:51:06 +0000
committerKarl Berry <karl@freefriends.org>2012-05-07 22:51:06 +0000
commit187167fedfccae89ebeb38445a0ddb3b1df5afa6 (patch)
treee5919724d431b36eab01e1ca29651664c2ac48a0 /Master/texmf-dist/tex/latex/easyfig
parentd543752477df00db9845d783c27fd913a48c6f73 (diff)
easyfig 1.1 (7may12)
git-svn-id: svn://tug.org/texlive/trunk@26247 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/easyfig')
-rw-r--r--Master/texmf-dist/tex/latex/easyfig/easyfig.sty17
1 files changed, 9 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty
index cdd34a5978e..b7bf73c694c 100644
--- a/Master/texmf-dist/tex/latex/easyfig/easyfig.sty
+++ b/Master/texmf-dist/tex/latex/easyfig/easyfig.sty
@@ -1,5 +1,5 @@
-%% Copyright (C) 2011 by Martin Scharrer <martin@scharrer.me>
-%% ---------------------------------------------------------------------------
+%% Copyright (C) 2011-2012 by Martin Scharrer <martin@scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
%% of this license or (at your option) any later version.
@@ -16,8 +16,8 @@
%% and the derived filebase easyfig.sty.
%%
\ProvidesPackage{easyfig}[%
- 2011/10/31
- v1.0
+ 2012/05/06
+ v1.1
Easy way to include figures]
\RequirePackage{adjustbox}
\RequirePackage{xkeyval}
@@ -93,10 +93,11 @@
\unexpanded{#1},%
\easyfig@expandonce\easyfig@default@end
}%
+ }%
+ \@tempa
+ \edef\@tempa{%
\noexpand\begin\easyfig@env%
- \ifx\easyfig@placement\@empty\else
- [\easyfig@placement]%
- \fi
+ \easyfig@placement
}%
\@tempa
\easyfig@captionabove{#2}%
@@ -115,7 +116,7 @@
\expandafter\expandafter\expandafter\toks@
\expandafter\expandafter\expandafter{\expandafter\the\expandafter\toks@\expandafter,\easyfig@default@end}%
\expandafter\@tempa\expandafter{\the\toks@}
- \edef\@tempa{\noexpand\begin{\easyfig@env}}%
+ \edef\@tempa{\noexpand\begin\easyfig@env}%
\expandafter\@tempa\easyfig@placement
\easyfig@captionabove{#2}%
\def\@tempa{\begin{adjustbox}}%