diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-03 22:23:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-03 22:23:41 +0000 |
commit | 17c26f8a0e90231c7f95311cd8270fcd345002e4 (patch) | |
tree | b0378783b5421fc11bc25ca967c349d4938fd923 /Master/texmf-dist/tex/generic/pgfplots/libs | |
parent | 9334469d545fb017cccf5b7f4075005dc17a4949 (diff) |
pgfplots (3oct13)
git-svn-id: svn://tug.org/texlive/trunk@31822 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/libs')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.ternary.code.tex | 16 |
2 files changed, 17 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex index 94344c62860..f9e27d52321 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.external.code.tex @@ -31,6 +31,8 @@ % % +% \pgfplots@glob@TMPa = 1 iff we can rely on the external lib shipped +% with tikz: \pgfplotsiffileexists{tikzlibraryexternal.code.tex}{% \pgfplots@ifneedspgfcompabitibilitycode@has@pgf@one@zero@zero{% \def\pgfplots@glob@TMPa{0}% @@ -40,9 +42,11 @@ }{% \def\pgfplots@glob@TMPa{0}% }% -\pgfutil@ifundefined{tikzexternal@getnextfilename@resetglobals}{% - \def\pgfplots@glob@TMPa{0}% -}{}% + +% this is non-sense - we would need to load the external lib first... +%\pgfutil@ifundefined{tikzexternal@getnextfilename@resetglobals}{% +% \def\pgfplots@glob@TMPa{0}% +%}{}% \if1\pgfplots@glob@TMPa \usetikzlibrary{external}% diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.ternary.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.ternary.code.tex index 7000f8c13cf..cefa4fd82a0 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.ternary.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.ternary.code.tex @@ -305,15 +305,19 @@ \def\pgfplots@ternary@init@map@to@unit#1{% \begingroup - \pgfmath@basic@subtract@ - {\csname pgfplots@#1max\endcsname} - {\csname pgfplots@#1min\endcsname}% - \pgfmath@basic@reciprocal@\pgfmathresult + \pgfplotscoordmath{default}{parsenumber}{\csname pgfplots@#1max\endcsname}% + \let\pgfplots@loc@TMPa=\pgfmathresult + \pgfplotscoordmath{default}{parsenumber}{\csname pgfplots@#1min\endcsname}% + \let\pgfplots@map@to@unit@scale@diff=\pgfmathresult + \pgfplotscoordmath{default}{op}{subtract}{{\pgfplots@loc@TMPa}{\pgfmathresult}}% + \pgfplotscoordmath{default}{op}{reciprocal}{{\pgfmathresult}}% \let\pgfplots@map@to@unit@scale=\pgfmathresult % \expandafter\xdef\csname pgfplots@ternary@map@to@unit@#1\endcsname##1{% - \noexpand\pgfmath@basic@subtract@{##1}{\csname pgfplots@#1min\endcsname}% - \noexpand\pgfmath@basic@multiply@{\noexpand\pgfmathresult}{\pgfplots@map@to@unit@scale}% + \noexpand\pgfplotscoordmath{default}{parsenumber}{##1}% + \noexpand\pgfplotscoordmath{default}{op}{subtract}{{\noexpand\pgfmathresult}{\pgfplots@map@to@unit@scale@diff}}% + \noexpand\pgfplotscoordmath{default}{op}{multiply}{{\noexpand\pgfmathresult}{\pgfplots@map@to@unit@scale}}% + \noexpand\pgfplotscoordmath{default}{tofixed}{\noexpand\pgfmathresult}% }% \endgroup } |