diff options
author | Karl Berry <karl@freefriends.org> | 2012-08-30 00:13:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-08-30 00:13:50 +0000 |
commit | 8231318d57cff4a8f9fcd70d387a3f00f4513428 (patch) | |
tree | e99336aabe9de04bad055bcf07814a1a00474a38 /Master/texmf-dist/tex/generic/pgfplots/sys | |
parent | c16497900d7216f5269a43b9c18ae469820d3cd2 (diff) |
pgfplots 1.6.1 (29aug12)
git-svn-id: svn://tug.org/texlive/trunk@27550 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/sys')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/sys/pgflibrarypgfplots.surfshading.pgfsys-pdftex.def | 47 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/sys/pgfplotssysgeneric.code.tex | 56 |
2 files changed, 96 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/sys/pgflibrarypgfplots.surfshading.pgfsys-pdftex.def b/Master/texmf-dist/tex/generic/pgfplots/sys/pgflibrarypgfplots.surfshading.pgfsys-pdftex.def index c94f05e585e..e8e9a4568a4 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/sys/pgflibrarypgfplots.surfshading.pgfsys-pdftex.def +++ b/Master/texmf-dist/tex/generic/pgfplots/sys/pgflibrarypgfplots.surfshading.pgfsys-pdftex.def @@ -25,7 +25,6 @@ % %-------------------------------------------- - % The lowlevel call for surface shadings. It uses a pattern type 2 % dictionary as fill color and has thus several things to do. This is % a little bit more complicated than using the '/sh' operator (as @@ -54,7 +53,7 @@ \pgfusepath{fill}% \endpgfpicture }% - \pdfxform resources{ + \immediate\pdfxform resources{ /Pattern << \pgfplots@glob@TMPa >> % write the pattern resource dictionary }\pgfutil@tempboxa \leavevmode @@ -71,7 +70,15 @@ % % \def\pgfplotssys@do@surfshading@fillpaths#1{% - \immediate\pdfobj stream attr {% + \ifx\pgfplotslibrarysurf@filter@decode\pgfutil@empty + \else + % Unfortunately, there is a bug in pdftex/luatex: if we + % provide a /Filter as attr, and pdftex compresses the stream, + % it overwrites the /Filter argument -- and the viewer cannot + % decode the stream. We have to deactivate compression here: + \pdfcompresslevel=0 + \fi + \def\pgfplots@loc@TMPa{% % stream length will be computed automatically /ShadingType \pgfplotslibrarysurf@type\space /BitsPerCoordinate \pgfplotslibrarysurf@bitspercoordinate\space @@ -88,10 +95,38 @@ \else /Filter /\pgfplotslibrarysurf@filter@decode\space \fi - } {% - \pgfplotslibrarysurf@binarystream }% - \edef\pgfplots@loc@TMPa{\the\pdflastobj}% + % + % \pgfplots@loc@TMPb := final boolean luaBinaryEncoding; + \pgfutil@ifundefined{directlua}{% + \def\pgfplots@loc@TMPb{0}% + }{% + \ifx\pgfplotslibrarysurf@filter@decode\pgfutil@empty + % ah - we have binary encoding (the standard). + \def\pgfplots@loc@TMPb{1}% + \else + % ah - base 16 ASCII encoding: + \def\pgfplots@loc@TMPb{0}% + \fi + }% + \if0\pgfplots@loc@TMPb + % no lua binary encoding. Use standard pdftex operations: + \immediate\pdfobj stream attr {% + \pgfplots@loc@TMPa + } {% + \pgfplotslibrarysurf@binarystream + }% + \edef\pgfplots@loc@TMPa{\the\pdflastobj}% + \else + % special handling for luatex binary encoding (see docs for \pgfplotsbinarytoluabinary): + \pgfplotsbinarytoluabinary{\pgfplotslibrarysurf@binarystream}% + \edef\pgfplots@loc@TMPa{% + \directlua{% + tex.print(pdf.immediateobj(\pgfplotsDQ stream\pgfplotsDQ , pgfplotsretval, \pgfplotsDQ \pgfplots@loc@TMPa\pgfplotsDQ )); + pgfplotsretval=nil; + }% + }% + \fi \pgf@process{\pgfpointdiff{\pgfplotslibrarysurf@corner@sw}{\pgfkeysvalueof{/pgfplots/surf shading/anchor}}}% \pgf@sys@bp@correct\pgf@x% \pgf@sys@bp@correct\pgf@y% diff --git a/Master/texmf-dist/tex/generic/pgfplots/sys/pgfplotssysgeneric.code.tex b/Master/texmf-dist/tex/generic/pgfplots/sys/pgfplotssysgeneric.code.tex index cc79af2d013..f4bd3054304 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/sys/pgfplotssysgeneric.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/sys/pgfplotssysgeneric.code.tex @@ -23,8 +23,62 @@ % %-------------------------------------------- +% NOTE: tex4ht support is lousy. For example, \tikz \node {$10^{-6}$}; +% will already break -- because SVG does not support the html tag +% − produced by tex4ht (and TikZ apparently does not know how to +% escape it somehow). \def\pgfplots@sys@beforenode{% \pgfkeysifdefined{/tikz/tex4ht node/escape/.@cmd}{% - \tikzset{tex4ht node/escape=true}% + \ifpgfplots@has@cell@picture + \tikzset{tex4ht node/escape=true}% + \pgfplots@warning{ATTENTION: you may want to use '\string\pgfplotsset{cell picture=false}' in your preamble. Otherwise, tex4ht will produce TWO SVG files per plot.^^J}% + \fi }{}% }% + +% see compat/show suggested version +\newif\ifpgfplots@show@suggested@version +\pgfplots@show@suggested@versiontrue + +\def\pgfplots@show@suggested@compat@value{% + \ifpgfplots@show@suggested@version + \begingroup + \pgfkeysgetvalue{/pgfplots/compat/current}\current + \pgfkeysgetvalue{/pgfplots/compat/mostrecent}\mostrecent + % + \def\b@isnewest{0}% + \def\b@shouldupgrade{0}% + \ifx\current\mostrecent + \def\b@isnewest{1}% + \else + \def\pgfplots@loc@TMPa{newest}% + \ifx\current\pgfplots@loc@TMPa + \def\b@isnewest{1}% + \else + \expandafter\pgfplotsutilifstringequal\expandafter{\current}{pre 1.3}{% + \def\b@shouldupgrade{1}% + }{}% + \expandafter\pgfplotsutilifstringequal\expandafter{\current}{default}{% + \def\b@shouldupgrade{1}% + }{}% + \fi + \fi + \if1\b@isnewest + \pgfplots@message{Package pgfplots notification 'compat/show suggested version=true': document has been generated with the most recent feature set (\string\pgfplotsset{compat=\mostrecent}).^^J}% + \else + \if1\b@shouldupgrade + \pgfplots@warning{running in backwards compatibility mode (unsuitable tick labels; missing features). Consider writing \string\pgfplotsset{compat=\mostrecent} into your preamble.^^J}% + \else + \pgfplots@message{Package pgfplots notification 'compat/show suggested version=true': you might benefit from \string\pgfplotsset{compat=\mostrecent} (current compat level: \current).^^J}% + \fi + \fi + \endgroup + \fi +} + +\pgfutil@ifundefined{AtBeginDocument}{% +}{% + \AtBeginDocument{% + \pgfplots@show@suggested@compat@value + }% +}% |