diff options
author | Karl Berry <karl@freefriends.org> | 2010-04-03 23:06:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-04-03 23:06:54 +0000 |
commit | 36080b5cf06fe9bdde3b1edb30fd795a58e6bf10 (patch) | |
tree | 172e727ca5a42cbd0c2440855dbb81f3a5c2148e /Master/texmf-dist/tex/generic/pgfplots/libs | |
parent | e27b3d0aaf815fdab1497a0a827998ac044e245d (diff) |
pgfplots update (1apr10)
git-svn-id: svn://tug.org/texlive/trunk@17670 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 | 62 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex | 8 |
2 files changed, 13 insertions, 57 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 2df18861a1e..227f5c1a5a4 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,68 +31,16 @@ % % -\def\pgfplots@orig@pgfincludeexternalgraphics#1{% - \begingroup - \openin\r@pgfplots@reada=#1.dpth - \setbox1=\hbox{\pgfkeysvalueof{/pgf/images/include external/.@cmd}{#1}\pgfeov}% - \ifeof\r@pgfplots@reada - \box1 - \else - \read\r@pgfplots@reada to\pgfincludeexternalgraphics@dp - \closein\r@pgfplots@reada - \dimen0=\pgfincludeexternalgraphics@dp\relax - \hbox{\lower\dimen0 \box1 }% - \fi - \endgroup -} -\def\pgfplots@orig@pgf@external@grab#1{% - \def\pgf@filename{#1}% - \setbox\pgfpic=\hbox\bgroup\bgroup% - \let\endpgfgraphicnamed=\pgf@externalend% -} -\def\pgfplots@orig@pgf@externalend{% - \unskip\egroup\egroup% - {% - \parindent0pt% -% \leftmargin0pt% -% \rightmargin0pt% - \dimen0\ht\pgfpic% - \advance\dimen0\dp\pgfpic% - \ifdim\dp\pgfpic=0pt\relax - \else% store the picture's depth. Otherwise, it would be lost. - \immediate\openout\pgf@plotwrite=\pgf@filename.dpth - \immediate\write\pgf@plotwrite{\the\dp\pgfpic}% - \immediate\closeout\pgf@plotwrite - \fi - \pgfsys@papersize{\the\wd\pgfpic}{\the\dimen0}% - \setbox0=\vbox{% - \kern -1truein% - \hbox{% - \kern -1truein% - \hbox to0pt{% - \wd\pgfexternal@startupbox=0pt% - \ht\pgfexternal@startupbox=0pt% - \dp\pgfexternal@startupbox=0pt% - \box\pgfexternal@startupbox% - \pgfsys@atbegindocument\hss}% - \box\pgfpic% - \kern 1truein}% - \kern1truein}% - \pgfexternal@originalshipout\box0% - }% -} - \pgfplotsiffileexists{tikzlibraryexternal.code.tex}{% \usetikzlibrary{external}% }{% % Backwards compatibility: + \let\pgfplots@backw@compat@AtBeginDocument=\AtBeginDocument + \def\AtBeginDocument#1{}% + \input pgfplotsoldpgfsupp_pgfcoreexternal.code.tex + \let\AtBeginDocument=\pgfplots@backw@compat@AtBeginDocument + % \input pgfplotsoldpgfsupp_tikzlibraryexternal.code.tex - \pgfkeys{ - /pgf/images/include external/.code={\pgfimage{#1}}, - }% - \let\pgfincludeexternalgraphics=\pgfplots@orig@pgfincludeexternalgraphics - \let\pgf@external@grab=\pgfplots@orig@pgf@external@grab - \let\pgf@externalend=\pgfplots@orig@pgf@externalend }% \endinput diff --git a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex index ac81e8f5491..bb5ea8de194 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/libs/tikzlibrarypgfplots.groupplots.code.tex @@ -296,7 +296,15 @@ \edef\pgfplots@loc@TMPa{% \noexpand\pgfkeys{/pgfplots/group/.cd,\pgfplots@group@style} }\pgfplots@loc@TMPa + % + \let\pgfplots@set@options@sanitizemode@old=\pgfplots@set@options@sanitizemode + \let\pgfplots@set@options@sanitize@old=\pgfplots@set@options@sanitize + \let\pgfplots@set@options@sanitize=\relax + \let\pgfplots@set@options@sanitizemode=\relax \expandafter\pgfplots@set@options\expandafter{\pgfplots@group@rmopts} + \let\pgfplots@set@options@sanitize=\pgfplots@set@options@sanitize@old + \let\pgfplots@set@options@sanitizemode=\pgfplots@set@options@sanitizemode@old + % \pgfplots@group@individual@setup \pgfplots@group@determine@ticklabels \pgfplots@group@current@plot=0% |