From 187167fedfccae89ebeb38445a0ddb3b1df5afa6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 May 2012 22:51:06 +0000 Subject: easyfig 1.1 (7may12) git-svn-id: svn://tug.org/texlive/trunk@26247 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/easyfig/easyfig.sty | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/easyfig') 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 -%% --------------------------------------------------------------------------- +%% Copyright (C) 2011-2012 by Martin Scharrer +%% ---------------------------------------------------------------------- %% 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}}% -- cgit v1.2.3