diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-22 00:20:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-22 00:20:49 +0000 |
commit | 3b9efd36d9aa093492744a6c328c767767a5825e (patch) | |
tree | cc36f3508b58a1483f9969db9ac9e881fc643894 /Master/texmf-dist/tex | |
parent | 8c9710e1dff6259e1a3c50d9ff052729654fc492 (diff) |
pgfplots (6aug10)
git-svn-id: svn://tug.org/texlive/trunk@19839 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
17 files changed, 467 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/liststructure/pgfplotsarray.code.tex b/Master/texmf-dist/tex/generic/pgfplots/liststructure/pgfplotsarray.code.tex index d62273eca51..1a0ce28dc03 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/liststructure/pgfplotsarray.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/liststructure/pgfplotsarray.code.tex @@ -139,6 +139,9 @@ \expandafter\pgfplotsarray@TMP@@\expandafter=\csname\string#2\endcsname }% +\def\pgfplotsarray@@#1#2{% + \expandafter#1\csname\string#2\endcsname +}% \def\pgfplotsarray@@def#1{% \expandafter\def\csname\string#1\endcsname }% @@ -176,6 +179,12 @@ \pgfplotsarray@@edef{#2@size}{\the\c@pgfplotsarray@tmp}% } +\long\def\pgfplotsarraypushbackglobal#1\to#2{% + \pgfplotsarraysize{#2}\to\c@pgfplotsarray@tmp + \pgfplotsarray@@\gdef{#2@\the\c@pgfplotsarray@tmp}{#1}% + \advance\c@pgfplotsarray@tmp by1 + \pgfplotsarray@@\xdef{#2@size}{\the\c@pgfplotsarray@tmp}% +} % Counts the number of elements in array #1, storing it into the count % register #2. diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfcoreexternal.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfcoreexternal.code.tex index ee2c38fba38..8f769db849b 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfcoreexternal.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfcoreexternal.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% @@ -27,7 +27,7 @@ % % See the file doc/generic/pgf/licenses/LICENSE for more details. -\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreexternal.code.tex,v 1.8 2010/07/10 20:51:57 ludewich Exp $ +\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreexternal.code.tex,v 1.9 2010/07/14 19:32:13 ludewich Exp $ diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeys.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeys.code.tex index 98b203fbb68..a1410e84a0f 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeys.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeys.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% @@ -622,13 +622,13 @@ % \pgfkeysdefargs{/swap}{#1#2}{#2#1} \long\def\pgfkeysdefargs#1#2#3{% - \def\pgfkeys@temp#2\pgfeov{#3}% + \long\def\pgfkeys@temp#2\pgfeov{#3}% \pgfkeyslet{#1/.@cmd}{\pgfkeys@temp}% \pgfkeyssetvalue{#1/.@args}{#2\pgfeov}% \pgfkeyssetvalue{#1/.@body}{#3}% } \long\def\pgfkeysedefargs#1#2#3{% - \edef\pgfkeys@temp#2\pgfeov{#3}% + \long\edef\pgfkeys@temp#2\pgfeov{#3}% \pgfkeyslet{#1/.@cmd}{\pgfkeys@temp}% \pgfkeyssetvalue{#1/.@args}{#2\pgfeov}% \pgfkeyssetvalue{#1/.@body}{#3}% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeysfiltered.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeysfiltered.code.tex index 1063569eeec..82fb11cd2e9 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeysfiltered.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfkeysfiltered.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex index 35dc897fec7..39c273655bf 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryfpu.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryplothandlers.code.tex index af2c68353a7..054598b052e 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryplothandlers.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgflibraryplothandlers.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.code.tex index 8677b488b82..79d03962283 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.pdflinks.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.pdflinks.code.tex index 09c012886d6..366a3212cba 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.pdflinks.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.pdflinks.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.prettyprinter.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.prettyprinter.code.tex index e7154cc49ed..dc5c3867277 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.prettyprinter.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmanual.prettyprinter.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex index f403e35ff85..b8d956b6054 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_pgfmathfloat.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% @@ -1063,6 +1063,14 @@ % % The numerator and denominator is always a number (not empty) \def\pgfmathfloatgetfrac#1{% + \pgfutil@ifundefined{pgfmathfloatmultiply@}{% + \PackageError{tikz}{Sorry, the number format 'frac' requires '\string\usetikzlibrary{fpu}' (and, optionally, \string\usepackage{fp}) in order to work correctly}{}% + \edef\pgfmathresult{{#1}{0}{1}}% + }{% + \pgfmathfloatgetfrac@{#1}% + }% +}% +\def\pgfmathfloatgetfrac@#1{% \begingroup \edef\pgfmathfloat@arg{#1}% \expandafter\pgfmathfloat@decompose@tok\pgfmathfloat@arg\relax\pgfmathfloat@a@S\pgfmathfloat@a@Mtok\pgfmathfloat@a@E diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternal.sty b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternal.sty index 62c7709616a..9025de703be 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternal.sty +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternal.sty @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternalshared.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternalshared.code.tex index 95597ec23c3..757439ed17f 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternalshared.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzexternalshared.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzlibraryexternal.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzlibraryexternal.code.tex index 0983f904866..42056506818 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzlibraryexternal.code.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_tikzlibraryexternal.code.tex @@ -14,7 +14,7 @@ %%% - nested \input commands have been updated %%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Date of this copy: Mi 14. Jul 21:31:43 CEST 2010 %%% +%%% Date of this copy: Do 5. Aug 20:33:50 CEST 2010 %%% diff --git a/Master/texmf-dist/tex/generic/pgfplots/pgfplots.revision.tex b/Master/texmf-dist/tex/generic/pgfplots/pgfplots.revision.tex index 6cf2d1c1e2b..6abd1948238 100644 --- a/Master/texmf-dist/tex/generic/pgfplots/pgfplots.revision.tex +++ b/Master/texmf-dist/tex/generic/pgfplots/pgfplots.revision.tex @@ -1,3 +1,3 @@ \def\pgfplotsrevision{% -version_1.4-1-g38878fa +1.4.1-1-g64c9e95 } 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{% diff --git a/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty b/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty new file mode 100644 index 00000000000..69f9cbddd6c --- /dev/null +++ b/Master/texmf-dist/tex/latex/pgfplots/bugtracker.sty @@ -0,0 +1,401 @@ +%-------------------------------------------------- +% Provides a simple, text-based bug tracker. +% +% Idea: simply write a text-todo list into a tex file, and write +% trivial support macros which allow to provide priorities, status +% flags and sorting capabilities. Sort key: +% (section,isactive,priority). Can be processed with pgfplotstable. +% Could also support the codeexample environment of pgfmanual. +% -> Advantages: +% - simple human readable text files (I like that!) +% - independent of any tool +% - can be sorted +% UI: +% \begin{feature}[<status>][prio=<num>] +% <text> +% \end{feature} +% +% \begin{bug}[<status>][prio=<num>] +% <text> +% \end{bug} +% Idea: collect *all* entries in one huge array, then sort this array, then +% typeset the result. Should work reasonably, I guess. If it is too slow, +% typeset directly. +%-------------------------------------------------- +% +\ProvidesPackage{bugtracker}[2010/07/23 Version 0.1] + +\RequirePackage{pgfplotstable} +\RequirePackage{listings} +\RequirePackage{hyperref} + +\ifx\scantokens\@undefined + \PackageError{pgfmanual-macros}{You need to use extended latex + (elatex) or (pdfelatex) to process this document}{} +\fi + +\def\bugtracker@init@items{% +}% + +{ +\catcode`\[=1 +\catcode`\]=2 +\catcode`\{=12 +\catcode`\}=12 +\gdef\bugtracker@lbrace[{] +\gdef\bugtracker@rbrace[}] +] +{ +\catcode`\|=0 +|catcode`\\=12 +|gdef|bugtracker@bslash{\} +} + +% #1: the environment (item) name +% #2: the sort order (an integer) +\def\declarebugtrackeritem#1#2{% + \expandafter\def\expandafter\bugtracker@init@items\expandafter{% + \bugtracker@init@items + \expandafter\gdef\csname c@bugtracker@#1\endcsname{0}% + }% + \expandafter\edef\csname bugtracker@end@#1\endcsname{\bugtracker@bslash end\bugtracker@lbrace #1\bugtracker@rbrace}% + \expandafter\def\csname #1\endcsname{\bugtracker@collect{#1}}% + \expandafter\def\csname end#1\endcsname{\relax}% + \pgfkeyssetvalue{/bugtracker/sort order/#1}{#2}% +}% + +\newif\ifbugtracker@sort + +\newenvironment{bugtracker}{% + \let\bugtracker@enqueue=\bugtracker@enqueue@ACTIVE + \pgfplotsarraynewemptyglobal\bugtrackeritems +}{% + \ifbugtracker@sort + \begingroup + \pgfkeyslet{/pgfplots/iflessthan/.@cmd}\bugtracker@iflessthan + \pgfkeysdef{/pgfplots/array/unscope pre}{\bugtracker@typeset}% + \pgfkeysdef{/pgfplots/array/unscope post}{}% + \pgfplotsarraysort\bugtrackeritems + \endgroup + \else + \bugtracker@typeset + \fi +}% + +\def\bugtrackerset{\pgfqkeys{/bugtracker}}% + + +\def\bugtracker@collect#1{% + \pgfutil@ifnextchar[{% + \bugtracker@collect@status{#1}% + }{% + \bugtracker@collect@status{#1}[open]% + }% +}% +\def\bugtracker@collect@status#1[#2]{% + \pgfutil@ifnextchar[{% + \bugtracker@collect@status@opt{#1}[#2]% + }{% + \bugtracker@collect@status@opt{#1}[#2][]% + }% +}% +\def\bugtracker@collect@status@opt#1[#2][#3]{% + \begingroup + \bugtrackerset{#3}% + \def\bugtracker@temp{#2}% + \ifx\bugtracker@temp\pgfutil@empty + \else + \bugtrackerset{status=#2}% + \fi + \expandafter\let\expandafter\bugtracker@temp\csname bugtracker@end@#1\endcsname + \expandafter\long\expandafter\def\expandafter\bugtracker@collect@until\expandafter##\expandafter1\bugtracker@temp{\bugtracker@enqueue{#1}{##1}}% + \bugtracker@prepare@collect + \bugtracker@collect@until +}% + + +\def\bugtracker@prepare@collect{% + \def\do##1{\catcode`##1=12 }\dospecials + \catcode`\^^M=12 + \catcode`\^^J=12 + \catcode`\^^I=12 +}% + +\def\bugtracker@restore@catcodes{% + \catcode`\^^M=5 + \catcode`\^^J=10 + \catcode`\^^I=10 + % this is important to get \scantokens to work: otherwise, it will + % eat up the ^^M chars: + \endlinechar=`\^^M + \newlinechar=\endlinechar +}% + +\long\def\bugtracker@enqueue#1#2{% + \toks0={#2}% + \edef\bugtracker@entry{{#1}{\bugtracker@status}{\pgfkeysvalueof{/bugtracker/prio}}{\the\toks0}{\the\inputlineno}}% + \expandafter\pgfplotsarraypushbackglobal\expandafter{\bugtracker@entry}\to\bugtrackeritems + \endgroup + \end{#1}% +}% +\let\bugtracker@enqueue@ACTIVE=\bugtracker@enqueue +\long\def\bugtracker@enqueue#1#2{% + \PackageError{bugtracker}{Sorry, bug tracker elements can only be used inside of \string\begin{bugtracker} ... \string\end{bugtracker}. Discarding this element}{}% +}% + +\long\def\bugtracker@unpack#1#2#3#4#5{% + \bugtrackerset{name={#1},status=#2,prio=#3,source line={#5}}% + \def\bugtracker@content{#4}% +}% + +\long\def\bugtracker@unpack@sorting#1#2#3#4#5{% + \edef\bugtracker@name {\pgfkeysvalueof{/bugtracker/sort order/#1}}% + \edef\bugtracker@status{\pgfkeysvalueof{/bugtracker/status order/#2}}% + \def\bugtracker@prio{#3}% + \def\bugtracker@source{#5}% +}% +\def\bugtracker@iflessthan#1#2#3#4\pgfeov{% + \expandafter\bugtracker@unpack@sorting#1% + \let\bugtracker@nameA=\bugtracker@name + \let\bugtracker@statusA=\bugtracker@status + \let\bugtracker@prioA=\bugtracker@prio + \let\bugtracker@sourceA=\bugtracker@source + % + \expandafter\bugtracker@unpack@sorting#2% + % + \def\bugtracker@lt{0}% + \ifnum\bugtracker@nameA<\bugtracker@name + \def\bugtracker@lt{1}% + \else + \ifnum\bugtracker@nameA=\bugtracker@name + \ifnum\bugtracker@statusA<\bugtracker@status + \def\bugtracker@lt{1}% + \else + \ifnum\bugtracker@statusA=\bugtracker@status + \ifnum\bugtracker@prioA>\bugtracker@prio + \def\bugtracker@lt{1}% + \else + \ifnum\bugtracker@prioA=\bugtracker@prio + \ifnum\bugtracker@sourceA<\bugtracker@source + \def\bugtracker@lt{1}% + %\else + %\ifnum\bugtracker@sourceA=\bugtracker@source + %\fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \if1\bugtracker@lt #3\else #4\fi +}% + + +\long\def\bugtracker@typeset@#1#2{% + \pgfkeysvalueof{/bugtracker/typeset/.@cmd}{#1}{#2}\pgfeov +}% + +\def\bugtracker@typeset{% + \let\minimal=\bugtracker@minimal@env + \def\endminimal{\relax}% + % + \pgfkeysvalueof{/bugtracker/font}% + \bugtracker@init@items + \gdef\bugtracker@isfirst{1}% + \pgfplotsarrayforeach\bugtrackeritems\as\entry{% + \if1\bugtracker@isfirst + \else + \vskip\pgfkeysvalueof{/bugtracker/vskip} + \fi + \expandafter\bugtracker@unpack\entry + % + \edef\c@bugtracker{\csname c@bugtracker@\pgfkeysvalueof{/bugtracker/name}\endcsname}% + \expandafter\pgfplotsutil@advancestringcounter@global\csname c@bugtracker@\pgfkeysvalueof{/bugtracker/name}\endcsname + % + \message{bugtracker: processing \jobname.tex:\pgfkeysvalueof{/bugtracker/source line}...^^J}% + \begingroup + \bugtracker@restore@catcodes + \expandafter\bugtracker@typeset@\expandafter{\expandafter\scantokens\expandafter{\bugtracker@content}}{\c@bugtracker}%% + \endgroup + \gdef\bugtracker@isfirst{0}% + }% +}% + +\bugtrackerset{ + sort/.is if=bugtracker@sort, + sort=true, + name/.initial=, + typeset name/.code={% + \pgfkeysifdefined{/bugtracker/name text/#1}{% + \pgfkeysvalueof{/bugtracker/name text/#1}% + }{% + #1% + }% + }, + prio/.initial=5, + source line/.initial=, + status/.is choice, + status/open/.initial= {\def\bugtracker@status{open}}, + status/closed/.initial= {\def\bugtracker@status{closed}}, + status/cancelled/.initial= {\def\bugtracker@status{cancelled}}, + status/partially/.initial= {\def\bugtracker@status{partially}}, + status/-/.style= {/bugtracker/status/open}, + status/+/.style= {/bugtracker/status/closed}, + status/X/.style= {/bugtracker/status/cancelled}, + status order/open/.initial=0, + status order/closed/.initial=10, + status order/cancelled/.initial=7, + status order/partially/.initial=1, + shell escape/.initial=-shell-escape, + prefix/.initial=\jobname-, + file ext/.initial=pdf, + system call/.initial={pdflatex \bugtracker@checkshellescape -halt-on-error -interaction=batchmode -jobname "\image" "\texsource"}, + vskip/.initial=\baselineskip, + font/.initial={% + \parindent=0pt + \raggedright + }, + typeset/.code 2 args={% + \noindent + \paragraph{% + \protect\llap{\normalfont\scriptsize [#2]\hspace{2em}}\protect\bugtrackerset{/bugtracker/typeset name={\pgfkeysvalueof{/bugtracker/name}}} + % \##2 + } + [\bugtracker@status, Priority \pgfkeysvalueof{/bugtracker/prio}] + \vskip4pt + {% + \noindent + \parskip=\baselineskip + #1% + \par + }% + {\scriptsize Entry in {\ttfamily \jobname.tex:\pgfkeysvalueof{/bugtracker/source line}}}% + }% +} + +\declarebugtrackeritem{feature}{10} +\declarebugtrackeritem{bug}{5} +\declarebugtrackeritem{doctodo}{0} + +\bugtrackerset{ + name text/feature/.initial=Feature Proposal, + name text/bug/.initial=Bug, + name text/doctodo/.initial=Documentation Todo, +} + + +% a +% \begin{minimal} +% \end{minimal} +% environment which is executed automatically : +\newcount\c@bugtracker@minimal +\c@bugtracker@minimal=0 + +\def\bugtracker@minimal@env{% + \begingroup + \bugtracker@prepare@collect + \bugtracker@minimal@collect +}% +\expandafter\edef\csname bugtracker@temp\endcsname{\bugtracker@bslash end\bugtracker@lbrace minimal\bugtracker@rbrace}% +\expandafter\long\expandafter\def\expandafter\bugtracker@minimal@collect\expandafter#\expandafter1\bugtracker@temp{% + \endgroup + \edef\bugtracker@minimal@filename{\pgfkeysvalueof{/bugtracker/prefix}\the\c@bugtracker@minimal}% + \edef\bugtracker@minimal@filename@{\bugtracker@minimal@filename.\pgfkeysvalueof{/bugtracker/file ext}}% + \global\advance\c@bugtracker@minimal by1 + % + \IfFileExists{\bugtracker@minimal@filename@}{}{% + \bugtracker@minimal@create{#1}% + }% + \begingroup + \bugtracker@restore@catcodes + \edef\bugtracker@temp##1{% + \bugtracker@bslash begin{lstlisting}% + ##1% + \bugtracker@bslash end{lstlisting}% + }% + \expandafter\bugtracker@minimal@typeset\expandafter{\bugtracker@temp{#1}}% + \endgroup + \end{minimal}% +}% +\long\def\bugtracker@minimal@typeset#1{% + \ifvmode + \noindent + \fi + \href{file:\bugtracker@minimal@filename@}{% + \vbox{% + \bugtracker@minimal@typeset@{#1}% + }% + }% +}% +\long\def\bugtracker@minimal@typeset@#1{% + \scantokens{#1}% +}% +\long\def\bugtracker@minimal@create#1{% + % + \immediate\openout\w@pgf@writea=\bugtracker@minimal@filename\relax + \immediate\write\w@pgf@writea{#1}% + \immediate\closeout\w@pgf@writea + % + \bugtracker@assemble@systemcall\bugtracker@minimal@filename\bugtracker@temp +\message{Issuing system-call^^J$ \bugtracker@temp^^J}% + \immediate\write18{\bugtracker@temp}% + \IfFileExists{\bugtracker@minimal@filename@}{}{% + \PackageError{bugtracker}{Sorry, the system call '\bugtracker@temp' did NOT result in a usable output file '\bugtracker@minimal@filename@' (adjust '/bugtracker/file ext' if needed). Please verify that you have enabled system calls. For pdflatex, this is 'pdflatex -shell-escape'. Sometimes it is also named 'write 18' or something like that. Or maybe the command simply failed? Error messages can be found in '\bugtracker@minimal@filename.log'}{}% + }% +} + +{ +\catcode`\"=12 +\catcode`\'=12 +\catcode`\;=12 +\catcode`\&=12 +\catcode`\-=12 +\xdef\bugtracker@normal@dq{"} +\xdef\bugtracker@normal@sq{'} +\xdef\bugtracker@normal@semic{;} +\xdef\bugtracker@normal@and{&} +\xdef\bugtracker@normal@dash{-} +\catcode`\"=13 +\catcode`\'=13 +\catcode`\;=13 +\catcode`\&=13 +\catcode`\-=13 +\gdef\bugtracker@activate@normal@dq{\let"=\bugtracker@normal@dq} +\gdef\bugtracker@activate@normal@sq{\let'=\bugtracker@normal@sq} +\gdef\bugtracker@activate@normal@semic{\let;=\bugtracker@normal@semic} +\gdef\bugtracker@activate@normal@and{\let&=\bugtracker@normal@and} +\gdef\bugtracker@activate@normal@dash{\let-=\bugtracker@normal@dash} +\catcode`\|=0 +\catcode`\\=12 +|xdef|bugtracker@normal@backslash{\}% +} +% Creates the '/bugtracker/system call' command as string and +% returns it into the (global!) macro #2. +% #1: the output file name +% #2: the global return value macro +% +\def\bugtracker@assemble@systemcall#1#2{% + \begingroup + \def\image{#1}% + \let\texsource=\image + \ifnum\the\catcode`\"=13 \bugtracker@activate@normal@dq\fi + \ifnum\the\catcode`\'=13 \bugtracker@activate@normal@sq\fi + \ifnum\the\catcode`\;=13 \bugtracker@activate@normal@semic\fi + \ifnum\the\catcode`\-=13 \bugtracker@activate@normal@dash\fi + \let\\=\bugtracker@normal@backslash + \xdef#2{\pgfkeysvalueof{/bugtracker/system call}}% + \endgroup +}% + +\pgfutil@ifundefined{pdfshellescape}{% + \def\bugtracker@checkshellescape{}% +}{% + \ifnum\pdfshellescape=1 + \def\bugtracker@checkshellescape{\pgfkeysvalueof{/bugtracker/shell escape}\space}% + \else + \def\bugtracker@checkshellescape{}% + \fi +}% + +\endinput diff --git a/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty b/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty index 1d774e62926..d707b86e5b7 100644 --- a/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty +++ b/Master/texmf-dist/tex/latex/pgfplots/pgfplots.sty @@ -23,7 +23,7 @@ % along with this program. If not, see <http://www.gnu.org/licenses/>. % %-------------------------------------------- -\def\pgfplotsversion{1.4} +\def\pgfplotsversion{1.4.1} \IfFileExists{pgfplots.revision.tex}{\input pgfplots.revision.tex } {\def\pgfplotsrevision{}} \ifx\pgfplotsrevision\pgfutil@empty \else |