From cc14f05300604ee3a793fc3d489bfe31048a342d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Nov 2012 22:58:15 +0000 Subject: tikzscale (4nov12) git-svn-id: svn://tug.org/texlive/trunk@28170 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tikzscale') diff --git a/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty b/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty index db61273c40e..9213aff24eb 100644 --- a/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty +++ b/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty @@ -13,7 +13,7 @@ %% ---------------------------------------------------------------- %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tikzscale}[2012/11/02 v0.1.2 tikzscale LaTeX package] +\ProvidesPackage{tikzscale}[2012/11/03 v0.1.3 tikzscale LaTeX package] \RequirePackage{graphicx} \RequirePackage{etoolbox} \RequirePackage{pgfkeys} @@ -206,9 +206,13 @@ axisratio/.value required }{test {\ifdef{\requestedAxisRatio}}}{% \tikzscale@includeAxisRatio{#2}% }{test {\ifundef{\requestedAxisRatio}}}{% +\ifdef{\pgfplotsset}{% \def\requestedAxisRatio{1}% \tikzscale@includeAxisRatio{#2}% }{% +\tikzscale@includeNormalTikzpicture{#2}% +}% +}{% \tikzscale@invalidKeyError{#2}% }% } @@ -265,7 +269,7 @@ axisratio/.value required \foreach \l in {1,...,\maxTestIterations}{% \tikzscale@measureSize{\measuredIntermediate}{#1}{#2}% \tikzscale@ifSizeDifference{\measuredIntermediate-\requestedSize}{% -\pgfmathparsemacro{\errorRatio}{\measuredIntermediate/\requestedSize}% +\pgfmathsetmacro{\errorRatio}{\measuredIntermediate/\requestedSize}% \pgfmathsetglobalmacro{\tikzscale@scale}{\tikzscale@scale/\errorRatio}% }{% \breakforeach% -- cgit v1.2.3