diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex b/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex index fa6547c6bf3..1331a3f284b 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/pgfplotscoordprocessing.code.tex @@ -1402,13 +1402,17 @@ % of 'n' (without the suffix 'pt', but in units of 'pt'). \def\pgfplotssetaxesfromazel#1#2#3{% \begingroup - \pgfmathsin@{#1}% + \pgfmathparse{#1}% + \let\pgfplots@az=\pgfmathresult + \pgfmathparse{#2}% + \edef\pgfplots@el{-\pgfmathresult}% + \pgfmathsin@{\pgfplots@az}% \let\sinaz=\pgfmathresult - \pgfmathcos@{#1}% + \pgfmathcos@{\pgfplots@az}% \let\cosaz=\pgfmathresult - \pgfmathsin@{-#2}% + \pgfmathsin@{\pgfplots@el}% \let\sinel=\pgfmathresult - \pgfmathcos@{-#2}% + \pgfmathcos@{\pgfplots@el}% \let\cosel=\pgfmathresult % x: \pgfmathmultiply@{\sinaz}{\sinel}% @@ -4312,20 +4316,39 @@ \fi }% \def\pgfplots@identify@gnuplot@logbehavior@checkversion{% - \immediate\write18{gnuplot -V >\pgfplots@plot@filename}% - \openin\r@pgfplots@reada=\pgfplots@plot@filename\relax + \begingroup + \immediate\write18{gnuplot -V >\pgfplots@plot@filename.vrs}% + \openin\r@pgfplots@reada=\pgfplots@plot@filename.vrs\relax \ifeof\r@pgfplots@reada \pgfplots@warning{Sorry, I could not determine 'gnuplot -V' to check whether gnuplot and logscale writes results in log() or not. Please set `/pgfplots/gnuplot writes logscale=true|false' manually.}% \gdef\pgfplots@gnuplot@logscale@writes@log{1}% something doesn't work. set it somehow. \else \read\r@pgfplots@reada to\pgfplots@loc@TMPa \gdef\pgfplots@gnuplot@logscale@writes@log{1}% - \immediate\write-1{Package pgfplots: checking gnuplot -V : `\pgfplots@loc@TMPa' (if this fails, set `/pgfplots/gnuplot writes logscale=true|false')}% - \expandafter\pgfplots@identify@gnuplot@logbehavior@checkversion@\pgfplots@loc@TMPa\relax + \t@pgfplots@toka=\expandafter{\pgfplots@loc@TMPa}% + \immediate\write-1{Package pgfplots: checking gnuplot -V : `\the\t@pgfplots@toka' (if this fails, set `/pgfplots/gnuplot writes logscale=true|false')}% + \expandafter\pgfplots@identify@gnuplot@logbehavior@checkversion@\pgfplots@loc@TMPa 0 0.0 0\relax + \if0\pgfplots@gnuplot@logscale@writes@log + \immediate\write-1{Package pgfplots: I found gnuplot version >= 4.4. This one doesn't write log() coordinates. I will apply log() manually.}% + \else + \immediate\write-1{Package pgfplots: I found gnuplot version < 4.4. This one writes log() coordinates. I'll handle it accordingly.}% + \fi \closein\r@pgfplots@reada \fi + \endgroup +}% +\long\def\pgfplots@identify@gnuplot@logbehavior@checkversion@{% + \pgfutil@ifnextchar\par{% + \pgfplots@warning{Sorry, I can't reliably check which version of gnuplot is available. I guess it is gnuplot < 4.4. Please set `/pgfplots/gnuplot writes logscale=true|false' manually if anything fails.}% + \gdef\pgfplots@gnuplot@logscale@writes@log{1}% + \pgfplots@identify@gnuplot@logbehavior@checkversion@@@ + }{% + \pgfplots@identify@gnuplot@logbehavior@checkversion@@ + }% }% -\def\pgfplots@identify@gnuplot@logbehavior@checkversion@#1 #2.#3 #4\relax{% +\long\def\pgfplots@identify@gnuplot@logbehavior@checkversion@@@#1\relax{% +}% +\long\def\pgfplots@identify@gnuplot@logbehavior@checkversion@@#1 #2.#3 #4\relax{% % starting with gnuplot 4.4, output files are no longer in % logarithmic scale for log plots. \ifnum#2<4 @@ -4345,11 +4368,6 @@ \fi \fi \fi - \if0\pgfplots@gnuplot@logscale@writes@log - \immediate\write-1{Package pgfplots: I found gnuplot version >= 4.4. This one doesn't write log() coordinates. I will apply log() manually.}% - \else - \immediate\write-1{Package pgfplots: I found gnuplot version < 4.4. This one writes log() coordinates. I'll handle it accordingly.}% - \fi }% \def\pgfplots@addplotimpl@gnuplotresult#1#2{% |