summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tikzscale
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-04 22:58:15 +0000
committerKarl Berry <karl@freefriends.org>2012-11-04 22:58:15 +0000
commitcc14f05300604ee3a793fc3d489bfe31048a342d (patch)
treedc9b7f6b152654519e986a66bfbfb789944e53b1 /Master/texmf-dist/tex/latex/tikzscale
parent752bbec2052b05f1d87f656a2fd985019745d23a (diff)
tikzscale (4nov12)
git-svn-id: svn://tug.org/texlive/trunk@28170 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tikzscale')
-rw-r--r--Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty8
1 files changed, 6 insertions, 2 deletions
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%