tikzscale (31mar13)

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

1 files changed, 8 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty b/Master/texmf-dist/tex/latex/tikzscale/tikzscale.sty
index e68d9595bbe..3359cd5db86 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}[2013/03/10 v0.2.4 tikzscale LaTeX package]
+\ProvidesPackage{tikzscale}[2013/03/30 v0.2.5 tikzscale LaTeX package]
 \RequirePackage{graphicx}
 \RequirePackage{etoolbox}
 \RequirePackage{pgfkeys}
@@ -136,10 +136,6 @@
 \ifExternalizationLoaded{%
 \pgfkeys{/pgf/images/external info}%
 }{}%
-\ProvideDocumentCommand{\tikzsetnextfilename}{m}{}%
-\ProvideDocumentCommand{\tikzsetexternalprefix}{m}{}%
-\ProvideDocumentCommand{\tikzexternaldisable}{}{}%
-\ProvideDocumentCommand{\tikzexternalenable}{}{}%
 \@ifpackageloaded{tikz}{%
 \newlength{\tikzscale@accuracy}%
 \setlength{\tikzscale@accuracy}{\hfuzz}%
@@ -446,6 +442,7 @@ axisratio/.value required
 }%
 \tikzscale@ifSizeDifference{\sizeDifference-\tikzscale@oldSizeDifference}{%
 }{%
+\tikzscale@conditionalEnableExternalization{\fileName}%
 \tikzscale@includeNormalTikzpicture{#4}%
 \gdef\tikzscale@alreadyIncluded{true}%
 \breakforeach
@@ -484,7 +481,10 @@ axisratio/.value required
 }{}%
 }
 \NewDocumentCommand{\tikzscale@conditionalDisableExternalization}{}{%
+\tikzscale@ifExternalizationActive{%
 \tikzexternaldisable
+\def\tikzscale@externalizationWasDisabled{}%
+}{}
 \ifExternalizationLoaded{%
 \tikzscale@addRestoreEndLineCharToTikzpicture
 }{}%
@@ -494,7 +494,10 @@ axisratio/.value required
 }{}%
 }
 \NewDocumentCommand{\tikzscale@conditionalEnableExternalization}{m}{%
+\ifdef{\tikzscale@externalizationWasDisabled}{%
 \tikzexternalenable
+\undef\tikzscale@externalizationWasDisabled
+}{}%
 \ifExternalizationLoaded{%
 \tikzscale@addRestoreEndLineCharToTikzpicture
 }{}%