painful pgfplots update (14jun08)

git-svn-id: svn://tug.org/texlive/trunk@8751 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2008-06-15 17:56:37 +0000
committer: Karl Berry <karl@freefriends.org> 2008-06-15 17:56:37 +0000
commit: 3f126e90ac9efa15e72c8b415a2f25d3b19c509a (patch)
tree: 3fb6f3eebbf51978c31e8d6ff1180432e50b9935 /Master/texmf-dist/doc/latex
parent: 9667a29e9fef0ef89c9d7bd311e2d2a6aaccf50c (diff)
73 files changed, 7114 insertions, 4792 deletions
diff --git a/Master/texmf-dist/doc/latex/pgfplots/ChangeLog b/Master/texmf-dist/doc/latex/pgfplots/ChangeLog
new file mode 100644
index 00000000000..32846b08963
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/ChangeLog
@@ -0,0 +1,219 @@
+2008-06-11 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added boolean |row predicate| to select table entries.
+	- added macro |\coordindex| inside of \addplot to allow index based
+	  coordinate filters.
+	- added style keys |/pgfplots/skip coords between index| and
+	  |/pgfplots/table/skip rows between index|
+	- added style |dec sep align| for table typesetting.
+
+2008-06-10 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- Fixed several warnings in manual
+	- reimplemented |minor tick num| as style which sets the [xy] variants
+
+2008-06-09 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- Replaced |xfilter| and |yfilter| by code keys |x filter/.code={...}| and
+	|y filter|. Backwards compatibility is checked. Added docs.
+
+2008-06-09 Pascal Wolkotte <wolkottept@users.sourceforge.net>
+
+	- Added |minor x tick num| and |minor y tick num| option
+	- Adjusted section title format in documentation
+	- Filtered x and y tick's if axis x/y line is middle or center
+
+2008-06-07 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- Wrote more documentation, added |every axis plot post| style.
+	- Added |col sep=<space|comma|colon|semicolon|braces>| option for table
+	input.
+
+2008-06-06 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- Added |minor tick num| option
+
+2008-06-05 Pascal Wolkotte <wolkottept@users.sourceforge.net>
+
+	- Added options to choose the drawing of the axis lines
+	- Added options to include a discontinuity decoration on the axis lines
+	- Added options to align ticks with the axis lines
+
+2008-06-03 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- Added options |before end axis/.code| and |after end axis/.code| and
+	|extra description/.code|.
+
+2008-06-02 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- I have replaced all /tikz/ options with /pgfplots/ ones. The
+	documentation is updated to reflect this change. 
+	Backwardscompatibility with \tikzstyle and the old /tikz/every... styles
+	is provided. 
+
+2008-05-31 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added \pgfnumtabletypeset feature. It is quite sophisticated by now and
+	allows to typeset (selected parts of) numeric tables; rounds each number
+	to desired accuracy and provides number format styles.
+
+2008-05-26 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added special values 'xtick=data' and 'ytick=data' to collect the first plot's
+	coordinates as tick data.
+
+2008-05-24 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- First version of manual with pgfmanual styles is ready. It is not quite
+	final, but should be enough to communicate with Pascal.
+	- fixed plot expression to work properly.
+
+2008-05-21 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added useful styles for all bar options.
+
+2008-05-20 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- fixed some issues with stacked plots
+	- added public macros \plotnum and \numplots inside of an axis
+	- added options '[xy] tick label as interval=true|false'
+	- added support for 'ybar interval' plot handler (which I added to PGF
+	recently).
+
+2008-05-19 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added \closedcycle command for use after \addplot. It connects the
+	current plot with the x-axis to provide fillable plots easily.
+	- added named coordinates 'current plot begin' and 'current plot end'
+
+2008-05-18 Christian Feuersaenger <ludewich@users.sourceforge.net>
+
+	- added support for stacked plots:
+		- stack plots=x|y|false
+		- reverse stacked plots=true|false
+		- stack dir=plus|minus
+	- rewrote some internals
+
+2008-05-12 Christian Feuersaenger <ludewich@users.sourceforge.net>
+	- added 'current plot style' key to \addplot
+	- Added error bar support with fixed absolute/relative errors or explicit
+	  absolute/relative errors for each coordinate.
+	- added plot types for piecewise constant plots
+	- added plot types 'ybar' and 'xbar' with option '/pgf/bar width'
+	- added option 'legend image code'
+	- fixed data scaling trafo: contained possiblity for cancellation of significant
+	  digits
+	- added limited support for \addlegendentry[]{}
+	- removed clipping region for tick line placement
+	- added options
+	  'every axis plot no 1,2,3,4,...'
+	  'every [xy] tick'
+	  'every minor [xy] tick'
+	  'every major [xy] tick'
+	  and the same for s/tick/grid/
+	  and the corresponding '[xy] tick style', 'minor [xy] tick style' ...
+
+2008-04-23 Christian Feuersaenger <ludewich@users.sourceforge.net>
+	Released version 0.98 beta
+	Changes since version 0.92.4:
+	- enlargelimits now works properly for logarithmic axes
+	- added support for plot function (gnuplot interface)
+	- added extra ticks which are drawn on top of the normal ticks
+	- providing x limits will now automatically clip y and vice-versa
+	- added option 'log identify minor tick positions'
+	- added option 'log plot exponent style'
+	- added option 'log number format code' and 'log base 10 number format code'
+	- improved automatic tick placement for log plots
+	   they are now scale dependend as for linear plots.
+	- added 'at' option
+	- cycle list and \legend now accept comma separated lists
+	- added support for plot expression
+	- re-implemented the internal plot representation as pgf node. This improves
+	  the PGF integration:
+		- you can access various axis anchor from outside,
+		- you can easily clip parts of the axis out of the bounding box (useful for
+		  alignment),
+		- you can access named axis descriptions (legends, titles, labels,...)
+
+	- the complete floating point number support has been integrated into PGF 2.0.
+	  That means: there are options 
+	   /pgf/number format/sci
+	   /pgf/number format/fixed
+	   /pgf/number format/....
+	   BUT
+	   numbers are now printed with
+	   \pgfmathprintnumber
+	   NOT 
+	   \prettyprintnumber   [ INCOMPATIBLE ]
+
+	- added option 'scaled ticks'
+	  and associated styles 
+		'every x tick scale label'
+		'every y tick scale label'
+	  and options
+		'x tick scale label style'
+		'y tick scale label style'
+	  and parameters
+		'scale ticks [below,above] exponent'
+
+	- legends have been improved (was \edef, is now better)
+
+	- Any styles can now contain axis options, for example
+		\tikzstyle{every axis legend}+=[legend columns=2]
+	- added option "cycle list"
+	- added option "cycle list name"
+	- added '\addplot plot file {filename}'
+	- added '\addplot plot table[x=colnameA,y=colnameB] {filename}'
+	  and   '\addplot plot table[xindex=numberA,yindex=numberB] {filename}'
+	  and   '\addplot plot table[...] from {\macroname}' in conjunction with
+	  '\numtableread{FILE} to \macroname'
+
+	- eliminated several scopes such that node names for labels, titles and legends
+	  will be known outside of an axis,
+	- added
+		\tikzstyle{every semilogx axis}=[]
+		\tikzstyle{every semilogy axis}=[]
+		\tikzstyle{every loglog axis}=[]
+		\tikzstyle{every linear axis}=[]
+	- added option 'legend style'
+	- added option 'label style'
+	  added option 'x label style'
+	  added option 'y label style'
+	  added option 'grid style'
+	  added option 'tick style'
+	  and the same for all 'every ...' styles.
+	  added option 'style=' option
+
+
+2008-02-01 Christian Feuersaenger <ludewich@users.sourceforge.net>
+	Released version 0.92.4
+	Changes since version 0.92:
+	** UPGRADE INCOMPATIBILITIES **
+	- Warning: I have greatly improved the legend placement.
+	  If you have overwritten 
+		\tikzstyle{every axis legend}
+	  you will need to update the legend!
+	- renamed 'manual.pdf' to 'pgfplots.pdf' to allow 
+		'texdoc pgfplots'
+	- any \axispath commands need to use the 'axis cs' coordinate system.
+
+	Improvements:
+	- introduced a data scale transformation:
+	  know, pgfplots is no longer restricted to numbers within 
+	  TeX's limited precision.
+	  It can produce plots with numbers of order O(10^10) or O(10^-10) (now even for non-logarithmic plots)
+	- fixed a bug which did not allow scientific notation for normal plots,
+	- improved default tick placement for normal plots,
+	- enlargelimits option is now relative and has a better user interface,
+	- legends are now TikZ matrizes, which fixes some bugs and improves their
+	  flexibility.
+	- Added the 'legend columns' option.
+	- Added the 'legend plot pos' option.
+	- Added the 'hide axis' option
+	- Added the 'scale only axis' option
+	- Added the 'xticklabels=LIST' and 'yticklabels=LIST' options
+	- Added anchors to axes to allow horizontal/vertical alignment
+	- rounded tick labels to \prettyprintnumberprecision digits
+	- Added 'grid=major|minor|both|none' option for grid lines
+	- Added '[xy]minorgrids',  '[xy]majorgrids' options and corresponding styles
+	- Added '[xy]majorticks', 'ticks=major|minor|both|none' options ticks
diff --git a/Master/texmf-dist/doc/latex/pgfplots/Makefile b/Master/texmf-dist/doc/latex/pgfplots/Makefile
new file mode 100644
index 00000000000..8751da9863b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/Makefile
@@ -0,0 +1,17 @@
+
+PDFLATEX=pdflatex -shell-escape
+
+all: pgfplots.pdf pgfplotstable.pdf
+	@echo "$^ have been compiled successfully. I did NOT check for references, so you may need to rerun make several times."
+
+pgfplots: pgfplots.pdf
+pgfplotstable: pgfplotstable.pdf
+
+%.pdf: FORCE
+	@$(PDFLATEX) $(@:.pdf=.tex)
+	@bibtex $(@:.pdf=) || exit 0
+	@makeindex $(@:.pdf=) || exit 0
+	@echo ""
+	@echo "$@ compiled successfully. You may need to re-run make several times to get all cross-references right."
+	
+FORCE:
diff --git a/Master/texmf-dist/doc/latex/pgfplots/README b/Master/texmf-dist/doc/latex/pgfplots/README
deleted file mode 100644
index 8b01a60342d..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/README
+++ /dev/null
@@ -1,28 +0,0 @@
-pgfplots - A tool to draw normal and/or logarithmic plots in LaTeX.
-
-Pgfplots draws high-quality function plots in normal or logarithmic
-scaling with a user-friendly interface. The user supplies axis labels, legend
-entries and the plot coordinates for one or more plots and Pgfplots applies
-axis scaling, computes any logarithms and axis ticks and draws the plots.
-It is based on Till Tantau's package PGF/TikZ.
-
-Please take a look at 
-  doc/latex/pgfplots/manual.pdf. 
-The manual contains installation instructions and more detailed information.
-
-
-Copyright 2007/2008 by Christian Feuersaenger.
-%
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/Master/texmf-dist/doc/latex/pgfplots/changelog.txt b/Master/texmf-dist/doc/latex/pgfplots/changelog.txt
deleted file mode 100644
index a225e8a6d98..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/changelog.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Changes since version 0.92:
-** UPGRADE INCOMPATIBILITIES **
-- Warning: I have greatly improved the legend placement.
-  If you have overwritten 
-    \tikzstyle{every axis legend}
-  you will need to update the legend!
-- renamed 'manual.pdf' to 'pgfplots.pdf' to allow 
-  	'texdoc pgfplots'
-- any \axispath commands need to use the 'axis cs' coordinate system.
-
-Improvements:
-- introduced a data scale transformation:
-  know, pgfplots is no longer restricted to numbers within 
-  TeX's limited precision.
-  It can produce plots with numbers of order O(10^10) or O(10^-10).
-  [now even for non-logarithmic plots]
-- fixed a bug which did not allow scientific notation for normal plots,
-- improved default tick placement for normal plots,
-- enlargelimits option is now relative and has a better user interface,
-- legends are now TikZ matrizes, which fixes some bugs and improves their
-  flexibility.
-- Added the 'legend columns' option.
-- Added the 'legend plot pos' option.
-- Added the 'hide axis' option
-- Added the 'scale only axis' option
-- Added the 'xticklabels=LIST' and 'yticklabels=LIST' options
-- Added anchors to axes to allow horizontal/vertical alignment
-- rounded tick labels to \prettyprintnumberprecision digits
-- Added 'grid=major|minor|both|none' option for grid lines
-- Added '[xy]minorgrids',  '[xy]majorgrids' options and corresponding styles
-- Added '[xy]majorticks', 'ticks=major|minor|both|none' options ticks
diff --git a/Master/texmf-dist/doc/latex/pgfplots/example.pdf b/Master/texmf-dist/doc/latex/pgfplots/example.pdf
deleted file mode 100644
index edb9a5798c8..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/example.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.gnuplot
new file mode 100644
index 00000000000..3e74472d8f1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_cubic.table"; set format "%.5f"
+set format "\%.7e"; set samples 8; plot [x=-5:0] 0.7*x**3 + 50
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.table
new file mode 100644
index 00000000000..baba41efbf3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_cubic.table
@@ -0,0 +1,12 @@
+
+#Curve 0 of 1, 8 points
+#x y type
+-5.0000000e+00 -3.7500000e+01  i
+-4.2857143e+00 -5.1020408e+00  i
+-3.5714286e+00 1.8112245e+01  i
+-2.8571429e+00 3.3673469e+01  i
+-2.1428571e+00 4.3112245e+01  i
+-1.4285714e+00 4.7959184e+01  i
+-7.1428571e-01 4.9744898e+01  i
+0.0000000e+00 5.0000000e+01  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.gnuplot
new file mode 100644
index 00000000000..be341cc7f9d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_exp.table"; set format "%.5f"
+set format "\%.7e"; set samples 25; plot [x=0:10] exp(x)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.table
new file mode 100644
index 00000000000..e85583c1952
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_exp.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+0.0000000e+00 1.0000000e+00  i
+4.1666667e-01 1.5168968e+00  i
+8.3333333e-01 2.3009759e+00  i
+1.2500000e+00 3.4903430e+00  i
+1.6666667e+00 5.2944901e+00  i
+2.0833333e+00 8.0311950e+00  i
+2.5000000e+00 1.2182494e+01  i
+2.9166667e+00 1.8479586e+01  i
+3.3333333e+00 2.8031625e+01  i
+3.7500000e+00 4.2521082e+01  i
+4.1666667e+00 6.4500093e+01  i
+4.5833333e+00 9.7839985e+01  i
+5.0000000e+00 1.4841316e+02  i
+5.4166667e+00 2.2512745e+02  i
+5.8333333e+00 3.4149510e+02  i
+6.2500000e+00 5.1801282e+02  i
+6.6666667e+00 7.8577199e+02  i
+7.0833333e+00 1.1919350e+03  i
+7.5000000e+00 1.8080424e+03  i
+7.9166667e+00 2.7426137e+03  i
+8.3333333e+00 4.1602620e+03  i
+8.7500000e+00 6.3106881e+03  i
+9.1666667e+00 9.5726626e+03  i
+9.5833333e+00 1.4520741e+04  i
+1.0000000e+01 2.2026466e+04  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.gnuplot
new file mode 100644
index 00000000000..33184d75b83
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_filesuffix.table"; set format "%.5f"
+set format "\%.7e"; set samples 25; plot [x=-5:5] (-x**5 - 242)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.table
new file mode 100644
index 00000000000..13b7b7a4299
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+-5.0000000e+00 2.8830000e+03  i
+-4.5833333e+00 1.7805870e+03  i
+-4.1666667e+00 1.0138674e+03  i
+-3.7500000e+00 4.9957715e+02  i
+-3.3333333e+00 1.6952263e+02  i
+-2.9166667e+00 -3.0926364e+01  i
+-2.5000000e+00 -1.4434375e+02  i
+-2.0833333e+00 -2.0275414e+02  i
+-1.6666667e+00 -2.2913992e+02  i
+-1.2500000e+00 -2.3894824e+02  i
+-8.3333333e-01 -2.4159812e+02  i
+-4.1666667e-01 -2.4198744e+02  i
+0.0000000e+00 -2.4200000e+02  i
+4.1666667e-01 -2.4201256e+02  i
+8.3333333e-01 -2.4240188e+02  i
+1.2500000e+00 -2.4505176e+02  i
+1.6666667e+00 -2.5486008e+02  i
+2.0833333e+00 -2.8124586e+02  i
+2.5000000e+00 -3.3965625e+02  i
+2.9166667e+00 -4.5307364e+02  i
+3.3333333e+00 -6.5352263e+02  i
+3.7500000e+00 -9.8357715e+02  i
+4.1666667e+00 -1.4978674e+03  i
+4.5833333e+00 -2.2645870e+03  i
+5.0000000e+00 -3.3670000e+03  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.gnuplot
new file mode 100644
index 00000000000..97353b62591
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_filesuffix1.table"; set format "%.5f"
+set samples 25; plot [x=-5:5] (40*x**2 - 5*x +3)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.table
new file mode 100644
index 00000000000..8bf1fff7241
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix1.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+-5.00000 1028.00000  i
+-4.58333 866.19444  i
+-4.16667 718.27778  i
+-3.75000 584.25000  i
+-3.33333 464.11111  i
+-2.91667 357.86111  i
+-2.50000 265.50000  i
+-2.08333 187.02778  i
+-1.66667 122.44444  i
+-1.25000 71.75000  i
+-0.83333 34.94444  i
+-0.41667 12.02778  i
+0.00000 3.00000  i
+0.41667 7.86111  i
+0.83333 26.61111  i
+1.25000 59.25000  i
+1.66667 105.77778  i
+2.08333 166.19444  i
+2.50000 240.50000  i
+2.91667 328.69444  i
+3.33333 430.77778  i
+3.75000 546.75000  i
+4.16667 676.61111  i
+4.58333 820.36111  i
+5.00000 978.00000  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.gnuplot
new file mode 100644
index 00000000000..41fe261aa7e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_filesuffix2.table"; set format "%.5f"
+set samples 10; plot [x=-5:5] (-x**5 - 242 + 50*rand(0))
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.table
new file mode 100644
index 00000000000..63225c0eae6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix2.table
@@ -0,0 +1,14 @@
+
+#Curve 0 of 1, 10 points
+#x y type
+-5.00000 2894.12287  i
+-3.88889 654.12997  i
+-2.77778 -49.81883  i
+-1.66667 -187.85451  i
+-0.55556 -238.04659  i
+0.55556 -192.99785  i
+1.66667 -226.47249  i
+2.77778 -381.58225  i
+3.88889 -1119.61214  i
+5.00000 -3333.88065  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.gnuplot
new file mode 100644
index 00000000000..e9e821b1e69
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_filesuffix_noise.table"; set format "%.5f"
+set samples 10; plot [x=-6:5] (-x**5 - 242 + (-300 + 600*rand(0)))
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.table
new file mode 100644
index 00000000000..a2aa3943eaa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_filesuffix_noise.table
@@ -0,0 +1,14 @@
+
+#Curve 0 of 1, 10 points
+#x y type
+-6.00000 7367.47446  i
+-4.77778 2027.60977  i
+-3.55556 347.84069  i
+-2.33333 22.58953  i
+-1.11111 -493.50066  i
+0.11111 46.66082  i
+1.33333 -205.56286  i
+2.55556 -341.40638  i
+3.77778 -1169.24780  i
+5.00000 -3269.56775  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.gnuplot
new file mode 100644
index 00000000000..39cf8e5343d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_gnuplot_exp.table"; set format "%.5f"
+set format "\%.7e"; set samples 15; plot [x=-5:10] exp(x)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.table
new file mode 100644
index 00000000000..edd0fa85a34
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_exp.table
@@ -0,0 +1,19 @@
+
+#Curve 0 of 1, 15 points
+#x y type
+-5.0000000e+00 6.7379470e-03  i
+-3.9285714e+00 1.9671755e-02  i
+-2.8571429e+00 5.7432619e-02  i
+-1.7857143e+00 1.6767725e-01  i
+-7.1428571e-01 4.8954166e-01  i
+3.5714286e-01 1.4292400e+00  i
+1.4285714e+00 4.1727339e+00  i
+2.5000000e+00 1.2182494e+01  i
+3.5714286e+00 3.5567367e+01  i
+4.6428571e+00 1.0384061e+02  i
+5.7142857e+00 3.0316758e+02  i
+6.7857143e+00 8.8511208e+02  i
+7.8571429e+00 2.5841266e+03  i
+8.9285714e+00 7.5444798e+03  i
+1.0000000e+01 2.2026466e+04  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.gnuplot
new file mode 100644
index 00000000000..863dc53c9e1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_gnuplot_expv.table"; set format "%.5f"
+set format "\%.7e"; set samples 15; plot [x=-5:10] exp(2*x)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.table
new file mode 100644
index 00000000000..ad3ec95b515
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_expv.table
@@ -0,0 +1,19 @@
+
+#Curve 0 of 1, 15 points
+#x y type
+-5.0000000e+00 4.5399930e-05  i
+-3.9285714e+00 3.8697794e-04  i
+-2.8571429e+00 3.2985058e-03  i
+-1.7857143e+00 2.8115660e-02  i
+-7.1428571e-01 2.3965104e-01  i
+3.5714286e-01 2.0427271e+00  i
+1.4285714e+00 1.7411708e+01  i
+2.5000000e+00 1.4841316e+02  i
+3.5714286e+00 1.2650376e+03  i
+4.6428571e+00 1.0782873e+04  i
+5.7142857e+00 9.1910580e+04  i
+6.7857143e+00 7.8342340e+05  i
+7.8571429e+00 6.6777103e+06  i
+8.9285714e+00 5.6919176e+07  i
+1.0000000e+01 4.8516520e+08  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.gnuplot
new file mode 100644
index 00000000000..166ff692202
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_gnuplot_ppp.table"; set format "%.5f"
+set format "\%.7e"; set samples 120; plot [x=-40:40] 10000*sin(x/3)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.table
new file mode 100644
index 00000000000..fa803afffdc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_gnuplot_ppp.table
@@ -0,0 +1,124 @@
+
+#Curve 0 of 1, 120 points
+#x y type
+-4.0000000e+01 -6.9395153e+03  i
+-3.9327731e+01 -5.1659813e+03  i
+-3.8655462e+01 -3.1341153e+03  i
+-3.7983193e+01 -9.4552356e+02  i
+-3.7310924e+01 1.2903504e+03  i
+-3.6638655e+01 3.4616986e+03  i
+-3.5966387e+01 5.4599399e+03  i
+-3.5294118e+01 7.1851493e+03  i
+-3.4621849e+01 8.5510554e+03  i
+-3.3949580e+01 9.4893542e+03  i
+-3.3277311e+01 9.9531248e+03  i
+-3.2605042e+01 9.9191756e+03  i
+-3.1932773e+01 9.3892044e+03  i
+-3.1260504e+01 8.3897132e+03  i
+-3.0588235e+01 6.9706827e+03  i
+-2.9915966e+01 5.2030737e+03  i
+-2.9243697e+01 3.1752778e+03  i
+-2.8571429e+01 9.8869771e+02  i
+-2.7899160e+01 -1.2473235e+03  i
+-2.7226891e+01 -3.4209706e+03  i
+-2.6554622e+01 -5.4235474e+03  i
+-2.5882353e+01 -7.1549122e+03  i
+-2.5210084e+01 -8.5284858e+03  i
+-2.4537815e+01 -9.4755806e+03  i
+-2.3865546e+01 -9.9488360e+03  i
+-2.3193277e+01 -9.9245862e+03  i
+-2.2521008e+01 -9.4040438e+03  i
+-2.1848739e+01 -8.4132391e+03  i
+-2.1176471e+01 -7.0017189e+03  i
+-2.0504202e+01 -5.2400681e+03  i
+-1.9831933e+01 -3.2163804e+03  i
+-1.9159664e+01 -1.0318533e+03  i
+-1.8487395e+01 1.2042732e+03  i
+-1.7815126e+01 3.3801783e+03  i
+-1.7142857e+01 5.3870529e+03  i
+-1.6470588e+01 7.1245405e+03  i
+-1.5798319e+01 8.5057557e+03  i
+-1.5126050e+01 9.4616288e+03  i
+-1.4453782e+01 9.9443601e+03  i
+-1.3781513e+01 9.9298100e+03  i
+-1.3109244e+01 9.4187061e+03  i
+-1.2436975e+01 8.4366068e+03  i
+-1.1764706e+01 7.0326234e+03  i
+-1.1092437e+01 5.2769639e+03  i
+-1.0420168e+01 3.2574226e+03  i
+-9.7478992e+00 1.0749894e+03  i
+-9.0756303e+00 -1.1612002e+03  i
+-8.4033613e+00 -3.3393223e+03  i
+-7.7310924e+00 -5.3504570e+03  i
+-7.0588235e+00 -7.0940348e+03  i
+-6.3865546e+00 -8.4828655e+03  i
+-5.7142857e+00 -9.4474989e+03  i
+-5.0420168e+00 -9.9396971e+03  i
+-4.3697479e+00 -9.9348470e+03  i
+-3.6974790e+00 -9.4331913e+03  i
+-3.0252101e+00 -8.4598158e+03  i
+-2.3529412e+00 -7.0633955e+03  i
+-1.6806723e+00 -5.3137605e+03  i
+-1.0084034e+00 -3.2984035e+03  i
+-3.3613445e-01 -1.1181053e+03  i
+3.3613445e-01 1.1181053e+03  i
+1.0084034e+00 3.2984035e+03  i
+1.6806723e+00 5.3137605e+03  i
+2.3529412e+00 7.0633955e+03  i
+3.0252101e+00 8.4598158e+03  i
+3.6974790e+00 9.4331913e+03  i
+4.3697479e+00 9.9348470e+03  i
+5.0420168e+00 9.9396971e+03  i
+5.7142857e+00 9.4474989e+03  i
+6.3865546e+00 8.4828655e+03  i
+7.0588235e+00 7.0940348e+03  i
+7.7310924e+00 5.3504570e+03  i
+8.4033613e+00 3.3393223e+03  i
+9.0756303e+00 1.1612002e+03  i
+9.7478992e+00 -1.0749894e+03  i
+1.0420168e+01 -3.2574226e+03  i
+1.1092437e+01 -5.2769639e+03  i
+1.1764706e+01 -7.0326234e+03  i
+1.2436975e+01 -8.4366068e+03  i
+1.3109244e+01 -9.4187061e+03  i
+1.3781513e+01 -9.9298100e+03  i
+1.4453782e+01 -9.9443601e+03  i
+1.5126050e+01 -9.4616288e+03  i
+1.5798319e+01 -8.5057557e+03  i
+1.6470588e+01 -7.1245405e+03  i
+1.7142857e+01 -5.3870529e+03  i
+1.7815126e+01 -3.3801783e+03  i
+1.8487395e+01 -1.2042732e+03  i
+1.9159664e+01 1.0318533e+03  i
+1.9831933e+01 3.2163804e+03  i
+2.0504202e+01 5.2400681e+03  i
+2.1176471e+01 7.0017189e+03  i
+2.1848739e+01 8.4132391e+03  i
+2.2521008e+01 9.4040438e+03  i
+2.3193277e+01 9.9245862e+03  i
+2.3865546e+01 9.9488360e+03  i
+2.4537815e+01 9.4755806e+03  i
+2.5210084e+01 8.5284858e+03  i
+2.5882353e+01 7.1549122e+03  i
+2.6554622e+01 5.4235474e+03  i
+2.7226891e+01 3.4209706e+03  i
+2.7899160e+01 1.2473235e+03  i
+2.8571429e+01 -9.8869771e+02  i
+2.9243697e+01 -3.1752778e+03  i
+2.9915966e+01 -5.2030737e+03  i
+3.0588235e+01 -6.9706827e+03  i
+3.1260504e+01 -8.3897132e+03  i
+3.1932773e+01 -9.3892044e+03  i
+3.2605042e+01 -9.9191756e+03  i
+3.3277311e+01 -9.9531248e+03  i
+3.3949580e+01 -9.4893542e+03  i
+3.4621849e+01 -8.5510554e+03  i
+3.5294118e+01 -7.1851493e+03  i
+3.5966387e+01 -5.4599399e+03  i
+3.6638655e+01 -3.4616986e+03  i
+3.7310924e+01 -1.2903504e+03  i
+3.7983193e+01 9.4552356e+02  i
+3.8655462e+01 3.1341153e+03  i
+3.9327731e+01 5.1659813e+03  i
+4.0000000e+01 6.9395153e+03  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.gnuplot
new file mode 100644
index 00000000000..51693f78c60
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_parable.table"; set format "%.5f"
+set format "\%.7e"; set samples 25; plot [x=-5:5] 4*x**2 - 5
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.table
new file mode 100644
index 00000000000..e014e557a37
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parable.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+-5.0000000e+00 9.5000000e+01  i
+-4.5833333e+00 7.9027778e+01  i
+-4.1666667e+00 6.4444444e+01  i
+-3.7500000e+00 5.1250000e+01  i
+-3.3333333e+00 3.9444444e+01  i
+-2.9166667e+00 2.9027778e+01  i
+-2.5000000e+00 2.0000000e+01  i
+-2.0833333e+00 1.2361111e+01  i
+-1.6666667e+00 6.1111111e+00  i
+-1.2500000e+00 1.2500000e+00  i
+-8.3333333e-01 -2.2222222e+00  i
+-4.1666667e-01 -4.3055556e+00  i
+0.0000000e+00 -5.0000000e+00  i
+4.1666667e-01 -4.3055556e+00  i
+8.3333333e-01 -2.2222222e+00  i
+1.2500000e+00 1.2500000e+00  i
+1.6666667e+00 6.1111111e+00  i
+2.0833333e+00 1.2361111e+01  i
+2.5000000e+00 2.0000000e+01  i
+2.9166667e+00 2.9027778e+01  i
+3.3333333e+00 3.9444444e+01  i
+3.7500000e+00 5.1250000e+01  i
+4.1666667e+00 6.4444444e+01  i
+4.5833333e+00 7.9027778e+01  i
+5.0000000e+00 9.5000000e+01  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.gnuplot
new file mode 100644
index 00000000000..a32cd893de5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_parablex.table"; set format "%.5f"
+set format "\%.7e"; set samples 8; plot [x=-5:0] 4*x**2 - 5
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.table
new file mode 100644
index 00000000000..f0a24fce15a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_parablex.table
@@ -0,0 +1,12 @@
+
+#Curve 0 of 1, 8 points
+#x y type
+-5.0000000e+00 9.5000000e+01  i
+-4.2857143e+00 6.8469388e+01  i
+-3.5714286e+00 4.6020408e+01  i
+-2.8571429e+00 2.7653061e+01  i
+-2.1428571e+00 1.3367347e+01  i
+-1.4285714e+00 3.1632653e+00  i
+-7.1428571e-01 -2.9591837e+00  i
+0.0000000e+00 -5.0000000e+00  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.gnuplot
new file mode 100644
index 00000000000..03cb9c0494b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_pgf-plot.table"; set format "%.5f"
+set samples 25; plot [x=0:10] 2**(-1.5*x -3)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.table
new file mode 100644
index 00000000000..c8b21067744
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pgf-plot.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+0.00000 0.12500  i
+0.41667 0.08105  i
+0.83333 0.05256  i
+1.25000 0.03408  i
+1.66667 0.02210  i
+2.08333 0.01433  i
+2.50000 0.00929  i
+2.91667 0.00602  i
+3.33333 0.00391  i
+3.75000 0.00253  i
+4.16667 0.00164  i
+4.58333 0.00106  i
+5.00000 0.00069  i
+5.41667 0.00045  i
+5.83333 0.00029  i
+6.25000 0.00019  i
+6.66667 0.00012  i
+7.08333 0.00008  i
+7.50000 0.00005  i
+7.91667 0.00003  i
+8.33333 0.00002  i
+8.75000 0.00001  i
+9.16667 0.00001  i
+9.58333 0.00001  i
+10.00000 0.00000  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.gnuplot
new file mode 100644
index 00000000000..c0c5c3891ca
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_pow1.table"; set format "%.5f"
+set format "\%.7e"; set samples 8; plot [x=0:10] 2**(-2*x + 6)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.table
new file mode 100644
index 00000000000..ee222507116
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow1.table
@@ -0,0 +1,12 @@
+
+#Curve 0 of 1, 8 points
+#x y type
+0.0000000e+00 6.4000000e+01  i
+1.4285714e+00 8.8327161e+00  i
+2.8571429e+00 1.2190137e+00  i
+4.2857143e+00 1.6823752e-01  i
+5.7142857e+00 2.3218661e-02  i
+7.1428571e+00 3.2044350e-03  i
+8.5714286e+00 4.4224788e-04  i
+1.0000000e+01 6.1035156e-05  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.gnuplot
new file mode 100644
index 00000000000..0e9aa76475d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_pow2.table"; set format "%.5f"
+set format "\%.7e"; set samples 8; plot [x=0:10] 2**(-1.5*x -3)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.table
new file mode 100644
index 00000000000..50bf268abe4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_pow2.table
@@ -0,0 +1,12 @@
+
+#Curve 0 of 1, 8 points
+#x y type
+0.0000000e+00 1.2500000e-01  i
+1.4285714e+00 2.8303865e-02  i
+2.8571429e+00 6.4088700e-03  i
+4.2857143e+00 1.4511663e-03  i
+5.7142857e+00 3.2858891e-04  i
+7.1428571e+00 7.4402689e-05  i
+8.5714286e+00 1.6847069e-05  i
+1.0000000e+01 3.8146973e-06  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.gnuplot
new file mode 100644
index 00000000000..0d406650d1c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_sin.table"; set format "%.5f"
+set format "\%.7e"; set samples 25; plot [x=-5:5] sin(x)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.table
new file mode 100644
index 00000000000..ed5cd95f8f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sin.table
@@ -0,0 +1,29 @@
+
+#Curve 0 of 1, 25 points
+#x y type
+-5.0000000e+00 9.5892427e-01  i
+-4.5833333e+00 9.9168387e-01  i
+-4.1666667e+00 8.5475261e-01  i
+-3.7500000e+00 5.7156132e-01  i
+-3.3333333e+00 1.9056796e-01  i
+-2.9166667e+00 -2.2303421e-01  i
+-2.5000000e+00 -5.9847214e-01  i
+-2.0833333e+00 -8.7150319e-01  i
+-1.6666667e+00 -9.9540796e-01  i
+-1.2500000e+00 -9.4898462e-01  i
+-8.3333333e-01 -7.4017685e-01  i
+-4.1666667e-01 -4.0471456e-01  i
+0.0000000e+00 0.0000000e+00  i
+4.1666667e-01 4.0471456e-01  i
+8.3333333e-01 7.4017685e-01  i
+1.2500000e+00 9.4898462e-01  i
+1.6666667e+00 9.9540796e-01  i
+2.0833333e+00 8.7150319e-01  i
+2.5000000e+00 5.9847214e-01  i
+2.9166667e+00 2.2303421e-01  i
+3.3333333e+00 -1.9056796e-01  i
+3.7500000e+00 -5.7156132e-01  i
+4.1666667e+00 -8.5475261e-01  i
+4.5833333e+00 -9.9168387e-01  i
+5.0000000e+00 -9.5892427e-01  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.gnuplot
new file mode 100644
index 00000000000..0678ea0bc79
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_sinneg.table"; set format "%.5f"
+set format "\%.7e"; set samples 40; plot [x=-10:0] sin(x)
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.table
new file mode 100644
index 00000000000..1b6fcffaf5c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_sinneg.table
@@ -0,0 +1,44 @@
+
+#Curve 0 of 1, 40 points
+#x y type
+-1.0000000e+01 5.4402111e-01  i
+-9.7435897e+00 3.1343844e-01  i
+-9.4871795e+00 6.2361036e-02  i
+-9.2307692e+00 -1.9279396e-01  i
+-8.9743590e+00 -4.3534277e-01  i
+-8.7179487e+00 -6.4942592e-01  i
+-8.4615385e+00 -8.2104518e-01  i
+-8.2051282e+00 -9.3897894e-01  i
+-7.9487179e+00 -9.9551587e-01  i
+-7.6923077e+00 -9.8695921e-01  i
+-7.4358974e+00 -9.1386845e-01  i
+-7.1794872e+00 -7.8102277e-01  i
+-6.9230769e+00 -5.9710850e-01  i
+-6.6666667e+00 -3.7415123e-01  i
+-6.4102564e+00 -1.2672941e-01  i
+-6.1538462e+00 1.2897884e-01  i
+-5.8974359e+00 3.7625358e-01  i
+-5.6410256e+00 5.9892631e-01  i
+-5.3846154e+00 7.8243716e-01  i
+-5.1282051e+00 9.1478695e-01  i
+-4.8717949e+00 9.8732176e-01  i
+-4.6153846e+00 9.9529876e-01  i
+-4.3589744e+00 9.3819637e-01  i
+-4.1025641e+00 8.1974833e-01  i
+-3.8461538e+00 6.4769957e-01  i
+-3.5897436e+00 4.3329981e-01  i
+-3.3333333e+00 1.9056796e-01  i
+-3.0769231e+00 -6.4624510e-02  i
+-2.8205128e+00 -3.1559139e-01  i
+-2.5641026e+00 -5.4592277e-01  i
+-2.3076923e+00 -7.4055800e-01  i
+-2.0512821e+00 -8.8677052e-01  i
+-1.7948718e+00 -9.7499996e-01  i
+-1.5384615e+00 -9.9947728e-01  i
+-1.2820513e+00 -9.5860198e-01  i
+-1.0256410e+00 -8.5504677e-01  i
+-7.6923077e-01 -6.9558279e-01  i
+-5.1282051e-01 -4.9063689e-01  i
+-2.5641026e-01 -2.5360981e-01  i
+0.0000000e+00 0.0000000e+00  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.gnuplot b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.gnuplot
new file mode 100644
index 00000000000..2f77a168932
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.gnuplot
@@ -0,0 +1,2 @@
+set terminal table; set output "gnuplot/pgfplots_square.table"; set format "%.5f"
+set format "\%.7e"; set samples 20; plot [x=-4:4] x*x+x+104
diff --git a/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.table b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.table
new file mode 100644
index 00000000000..e3200d03764
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/gnuplot/pgfplots_square.table
@@ -0,0 +1,24 @@
+
+#Curve 0 of 1, 20 points
+#x y type
+-4.0000000e+00 1.1600000e+02  i
+-3.5789474e+00 1.1322992e+02  i
+-3.1578947e+00 1.1081440e+02  i
+-2.7368421e+00 1.0875346e+02  i
+-2.3157895e+00 1.0704709e+02  i
+-1.8947368e+00 1.0569529e+02  i
+-1.4736842e+00 1.0469806e+02  i
+-1.0526316e+00 1.0405540e+02  i
+-6.3157895e-01 1.0376731e+02  i
+-2.1052632e-01 1.0383380e+02  i
+2.1052632e-01 1.0425485e+02  i
+6.3157895e-01 1.0503047e+02  i
+1.0526316e+00 1.0616066e+02  i
+1.4736842e+00 1.0764543e+02  i
+1.8947368e+00 1.0948476e+02  i
+2.3157895e+00 1.1167867e+02  i
+2.7368421e+00 1.1422715e+02  i
+3.1578947e+00 1.1713019e+02  i
+3.5789474e+00 1.2038781e+02  i
+4.0000000e+00 1.2400000e+02  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/liststructuretest.tex b/Master/texmf-dist/doc/latex/pgfplots/liststructuretest.tex
deleted file mode 100644
index a04801eaabd..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/liststructuretest.tex
+++ /dev/null
@@ -1,193 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage{german}
-\usepackage[utf8]{inputenc} % erlaubt direkte Nutzung von Umlauten
-
-% \usepackage[a4paper,noheadfoot,pdftex,left=0.8cm,right=1cm,top=0.8cm,bottom=0.8cm]{geometry}
-% \usepackage{color}
-% \usepackage{colortbl}
-% \usepackage{longtable}
-% \usepackage[a4paper,colorlinks=true]{hyperref} % Querverweise etc. option pdftex,dvipdfm?
-% \usepackage{graphicx}
-% \usepackage[draft]{graphicx}
-% \usepackage{listings} % fuer codefragmente jeder art
-\usepackage[intlimits]{amsmath}
-\usepackage{amssymb}
-\usepackage{amsfonts}
-% \usepackage{amsthm}
-\usepackage{bibgerm}
-%\usepackage{simplelist}
-\usepackage{liststructure}
-
-
-% fuer endvironment 'sidewaysfigure' bspw
-% \usepackage{rotating}
-
-%\pdfinfo {
-%	/Author	(Christian Feuersaenger)
-%}
-
-%%
-% My user defined commands ...
-%
-\usepackage{mymath}
-\usepackage{myext}
-
-% von Alex: A4-Groesse, symmetrische Seitenraender.
-% \usepackage{mya4sym}
-
-
-% figure einstellungen:
-%\renewcommand{\topfraction}{0.85}
-%\renewcommand{\textfraction}{0.06}
-%\renewcommand{\floatpagefraction}{0.8}
-
-
-
-\author{Christian Feuersänger}
-%\title{}
-
-\begin{document}
-%\maketitle
-{
-\tracingcommands=1
-%--------------------------------------------------
-% \message{TEST toks0:}%
-% \toks0={{a}{b}{c}{d}}%
-% Der Inhalt davon ist \the\toks0
-% 
-% \message{TEST 2 toks0:}%
-% \def\probe{{a}{b}{c}{d}}%
-% \toks0={\probe}%
-% Der Inhalt davon ist \the\toks0
-% 
-% ENDE
-% 
-% \message{TEST create:}%
-% \listcreate{\probe}{{a}{b}{c}{d}}%
-% 
-% %\show\listcreate
-% 
-% \message{Nutze probe:}%
-% Inhalt: \probe
-% 
-% \count0=0
-% \loop
-% \ifnum\count0<5
-% \listpopfront\erstes\probe
-% Das Erste: \erstes
-% 
-% Inhalt: \probe
-% \vskip2cm
-% \advance\count0 by1
-% \repeat
-% 
-% \tracingmacros=2
-% \message{Pushback-Test}%
-% Inhalt vorher: \probe
-% 
-% \listpushback\probe{a}%
-% Inhalt jetzt: \probe
-% 
-% \listpushback\probe{[eins]}%
-% Inhalt jetzt: \probe
-% 
-% \listpushback\probe{zwei}%
-% Inhalt jetzt: \probe
-% 
-% \message{lese wieder alles aus:}%
-% lese wieder alles aus:%
-% \count0=0
-% \loop
-% \ifnum\count0<5
-% \listpopfront\erstes\probe
-% Das Erste: \erstes
-% 
-% Inhalt: \probe
-% \vskip2cm
-% \advance\count0 by1
-% \repeat
-% 
-% 
-% \vskip3cm
-% \message{Das hat NICHT geklappt}%
-% \listcreate{\probe}{{eins}{drei}}%
-% Inhalt: \probe
-% 
-% \listpopfront\erstes\probe
-% Erstes: \erstes
-% 
-% Inhalt: \probe
-% 
-% \listpopfront\erstes\probe
-% Erstes: \erstes
-% 
-% Inhalt: \probe
-% 
-%-------------------------------------------------- 
-
-
-\tracingmacros=2
-\message{HIER GEHTS LOS}%
-\let\probe=\empty
-\listpushback eins\to\probe
-\listpushback [probe]\to\probe
-\listpushback [probe2]\to\probe
-\listpushback [probe3]\to\probe
-
-Groesse: \listsize\probe\to{\count0}\the\count0
-
-Inhalt:
-
-\listforeach\probe\as\curlistelem{\curlistelem \par}
-
-\listnew\foolist{Eins\\Zwei\\Drei\\}%
-\listforeach\foolist\as\foo{Element \foo\par}%
-
-\tracingcommands=2
-\message{SELECT TEST:}%
-\count1=1
-Element \the\count1: \listselect\count1\of\probe\to\elem\elem
-
-Element 3: \listselect3\of\probe\to\elem\elem
-
-Jetzt ist count1=\the\count1
-\vskip1cm
-
-\listpopfront\probe\to\first
-Erstes: \first
-
-verbleibedne Größe: \listsize\probe\to{\count0}\the\count0
-
-\listpopfront\probe\to\first
-Erstes: \first
-
-verbleibedne Größe: \listsize\probe\to{\count0}\the\count0
-
-
-\message{NEUE LISTE:}%
-NEUE LISTE:
-\listnew\foolist{First Element\\Second Element\\Third Element\\}
-\listnew\foolistX{Eins\\Zwei\\}
-{\def\\#1{#1\par}
-Inhalt: 
-
-\foolist
-}
-
-\listconcat\third=\foolist&\foolistX
-
-{\def\\#1{#1\par}
-Ergebnis von concat: 
-
-\third
-}
-\message{ENDE}%
-}
-
-
-
-\bibliographystyle{gerabbrv} %gerapali} %gerabbrv} %gerunsrt.bst} %gerabbrv}% gerplain}
-% \bibliography{literatur.bib}
-\end{document}
-
-
diff --git a/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.m b/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.m
deleted file mode 100644
index c591a7a4af7..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.m
+++ /dev/null
@@ -1,332 +0,0 @@
-function matlab2pgfplots(varargin )
-% matlab2pgfplots(outfile )
-% matlab2pgfplots( outfile, OPTIONS )
-%
-% Generate LaTeX code for use in package pgfplots to
-% draw line plots.
-%
-% It will use every (2d) line plot in the figure specified by handler fighandle.
-% 
-% It understands
-% - axis labels,
-% - legends,
-% - any 2d line plots,
-% - line styles/markers (in case of styles=1),
-% - tick positions, labels and axis limits (in case of axes=1).
-%
-% Linestyles and markers will follow as an option. However, pgfplots has its
-% own line styles which may be appropriate.
-%
-% OPTIONS are key value pairs. Known options are
-% - 'fig',HANDLE
-%		a figure handle (default is 'gcf').
-% - 'styles',0|1
-% 		a boolean indicating whether line styles, markers and colors shall be exported (default 1).
-% - 'axes',0|1
-% 		a boolean indicating whether axis ticks, tick labels and limits shall be exported (default 0).
-% - 'maxpoints',100
-%       an integer denoting the maximum number of points exported to tex. If the actual number is larger,
-%       the data will be interpolated to 'maxpoints'. The interpolation assumes
-%       parametric plots if x and y are not monotonically increasing.
-% 
-% See
-%   http://tug.ctan.org/tex-archive/graphics/pgf/contrib/pgfplots/
-% for details about pgfplots.
-%
-%
-% Copyright Christian Feuersaenger 2008
-%
-parser = inputParser;
-
-parser.addRequired( 'outfile', @(x) ischar(x) );
-parser.addParamValue( 'fig', gcf, @(x) ishandle(x) );
-parser.addParamValue( 'styles', 1, @(x) x==0 || x==1 );
-parser.addParamValue( 'axes' , 0, @(x) x==0 || x==1 );
-parser.addParamValue( 'maxpoints', 100000, @(x) isnumeric(x) );
-
-parser.parse( varargin{:} );
-
-
-fighandle = parser.Results.fig;
-
-lineobjs = findobj(fighandle, 'Type', 'line' );
-axesobj = findobj( fighandle, 'Type', 'axes' );
-
-legendobj = findobj( fighandle, 'tag', 'legend' );
-if length(legendobj) > 0 
-	allchildsoflegend = [ findobj( legendobj ) ];
-	lineobjs = setdiff( lineobjs, allchildsoflegend );
-	axesobj = setdiff( axesobj, allchildsoflegend );
-end
-
-FID=fopen( parser.Results.outfile, 'w' );
-assert( FID >= 0, [ 'could not open file ' parser.Results.outfile ' for writing' ] );
-
-ENDL=sprintf('\n');
-TAB=sprintf('\t');
-fwrite( FID, [ ...
-	'\begin{tikzpicture}%' ENDL ...
-	'\begin{axis}'] );
-
-xislog = 0;
-yislog = 0;
-
-if length(axesobj) > 0
-	axis = axesobj(1);
-	xlabel = get( get(axis, 'XLabel'), 'String');
-	ylabel = get( get(axis, 'YLabel'), 'String');
-	zlabel = get( get(axis, 'ZLabel'), 'String');
-	xscale = get(axis,'XScale');
-	yscale = get(axis,'YScale');
-
-	axisoptions = {};
-	if length(xlabel) > 0
-		axisoptions = [ axisoptions [ 'xlabel={' xlabel '}'] ];
-	end
-	if length(ylabel) > 0
-		axisoptions = [ axisoptions ['ylabel={' ylabel '}'] ];
-	end
-	if strcmp(xscale,'log')
-		xislog=1;
-		axisoptions = [ axisoptions ['xmode=log'] ];
-	end
-	if strcmp(yscale,'log')
-		yislog = 1;
-		axisoptions = [ axisoptions ['ymode=log'] ];
-	end
-	if parser.Results.axes
-		for k = 'xy'
-			L = get(gca, [ k 'Lim'] );
-			axisoptions = [ axisoptions [ k 'min=' num2str(L(1)) ] ];
-			axisoptions = [ axisoptions [ k 'max=' num2str(L(2)) ] ];
-		end
-
-		for k = 'xy'
-			L = get(gca, [ k 'Tick'] );
-			opt = [ k 'tick={' ];
-			for q=1:length(L)
-				if q>1
-					opt = [opt ',' ];
-				end
-				opt = [opt num2str(L(q)) ];
-			end
-			opt = [ opt '}' ];
-			axisoptions = [axisoptions opt ];
-		end
-
-	end
-
-
-	axisoptstr = [];
-	for i = 1:length(axisoptions)
-		if i>1
-			axisoptstr = [axisoptstr ',' ENDL TAB];
-		end
-		axisoptstr = [axisoptstr axisoptions{i}];
-	end
-	if length( axisoptstr ) 
-		fwrite( FID, [ '[' ENDL TAB axisoptstr ']' ENDL ] );
-	end
-end
-fwrite( FID, ENDL );
-
-if length(legendobj) > 0 
-	legentries = get(legendobj, 'String');
-	if length(legentries) > 0
-		legstr = ['\legend{%' ENDL TAB ];
-		for i = 1:length(legentries)
-			legstr = [ legstr legentries{i} '\\%' ENDL ];
-			if i ~= length(legentries)
-				legstr = [ legstr TAB ];
-			end
-		end
-		legstr = [ legstr '}%' ENDL ];
-		fwrite( FID, legstr );
-	end
-end
-
-xpointformat = '%f';
-ypointformat = '%f';
-if xislog
-	xpointformat = '%e';
-end
-if yislog
-	ypointformat = '%e';
-end
-
-for i = 1:length(lineobjs)
-	
-	x = get(lineobjs(i), 'XData');
-	y = get(lineobjs(i), 'YData');
-	z = get(lineobjs(i), 'ZData');
-
-	if size(x,1) > 1
-		disp( ['line element ' num2str(i) ' skipped: size ' num2str(size(x)) ' not supported']);
-	end
-	if abs(max(z) > 0)
-		disp( ['line element ' num2str(i) ' skipped: only 2d-plots supported up to now']);
-	end
-
-	if size(x,2) > parser.Results.maxpoints
-		% we need to re-interpolate the data!
-		q = find( diff(x) < 0 );
-		if length(q) 
-			% parametric plot  x(t), y(t), z(t). 
-			% we assume t = 1:size(x,2)
-			X = 1:parser.Results.maxpoints;
-			x = interp1( 1:size(x,2),x,  X);
-			y = interp1( 1:size(y,2),y,  X);
-			z = interp1( 1:size(z,2),z,  X);
-
-		else
-			% a normal plot y(x):
-			X = linspace( min(x), max(x), parser.Results.maxpoints );
-			y = interp1( x,y, X );
-			x = X;
-		end
-	end
-
-	coordstr = [];
-	for j = 1:size(x,2)
-		coordstr = [coordstr  sprintf(['\t(' xpointformat ',\t' ypointformat ')\n'], x(j), y(j)) ];
-	end
-
-	addplotoptstr = [];
-	if parser.Results.styles
-		markOpts = {};
-		mark = [];
-		linestyle = [];
-		color = [];
-
-		C = matlabColorToPGFColor( get(lineobjs(i), 'Color') );
-		if length(C)
-			color = [ 'color=' C ];
-		end
-
-		L = get(lineobjs(i), 'LineStyle' );
-		switch L
-		case 'none'
-			linestyle = 'only marks';
-		case '-'
-			linestyle = [];
-		case ':'
-			linestyle = 'densely dotted';
-		case '-:'
-			linestyle = 'dash pattern=on 2pt off 3pt on 1pt off 3pt]';
-		case '--'
-			linestyle = 'densely dashed';
-		end
-
-		M = get(lineobjs(i), 'Marker');
-		switch M
-		case '.'
-			mark = '*';
-			markOpts = [ markOpts 'scale=0.1' ];
-		case 'o'
-			mark = '*';
-		case 'x'
-			mark = 'x';
-		case '+'
-			mark = '+';
-		case '*'
-			mark = 'asterisk';
-		case 'square'
-			mark = 'square*';
-		case 'diamond'
-			mark = 'diamond*';
-		case '^'
-			mark = 'triangle*';
-		case 'v'
-			mark = 'triangle*';
-			markOpts = [ markOpts 'rotate=180' ];
-		case '<'
-			mark = 'triangle*';
-			markOpts = [ markOpts 'rotate=90' ];
-		case '>'
-			mark = 'triangle*';
-			markOpts = [ markOpts 'rotate=270' ];
-		case 'pentagramm'
-			mark = 'pentagon*';
-		case 'hexagram'
-			mark = 'oplus*';
-		end
-
-		M = matlabColorToPGFColor( get(lineobjs(i), 'MarkerFaceColor') );
-		if length(M)
-			markOpts = [ markOpts ['fill=' M] ];
-		end
-
-		M = matlabColorToPGFColor( get(lineobjs(i), 'MarkerEdgeColor') );
-		if length(M)
-			markOpts = [ markOpts ['draw=' M] ];
-		end
-
-		if length(color)
-			if length(addplotoptstr)
-				addplotoptstr = [addplotoptstr ',' ];
-			end
-			addplotoptstr = [ addplotoptstr color ];
-		end
-
-		if length(linestyle)
-			if length(addplotoptstr)
-				addplotoptstr = [addplotoptstr ',' ];
-			end
-			addplotoptstr = [ addplotoptstr linestyle ];
-		end
-
-		if length(mark)
-			if length(addplotoptstr)
-				addplotoptstr = [addplotoptstr ',' ];
-			end
-			addplotoptstr = [ addplotoptstr [ 'mark=' mark ] ];
-
-			if length(markOpts)
-				markOptsStr = 'mark options={';
-				for q = 1:length(markOpts)
-					if q > 1
-						markOptsStr = [markOptsStr ',' ];
-					end
-					markOptsStr = [ markOptsStr markOpts{q} ];
-				end
-				markOptsStr = [ markOptsStr '}' ];
-
-				addplotoptstr = [ addplotoptstr ',' markOptsStr ];
-			end
-		end
-		
-
-		if length(addplotoptstr)
-			addplotoptstr = [ '[' addplotoptstr ']' ];
-		end
-
-	end
-	fwrite( FID, [ ...
-		'\addplot' addplotoptstr ' plot coordinates {' ENDL coordstr '};' ENDL ] );
-
-end
-
-
-fwrite( FID, [ ...
-	'\end{axis}' ENDL ...
-	'\end{tikzpicture}%' ENDL ] );
-
-end
-
-function cstr = matlabColorToPGFColor( C )
-
-if length(C) ~= 3 | ischar(C) & strcmp(C,'none'),				cstr = [];
-elseif norm( C - [0   0   1 ], 'inf' ) < 1e-10,		cstr = 'blue';
-elseif norm( C - [0   1   0 ], 'inf' ) < 1e-10,	  cstr = 'green';  
-elseif norm( C - [1   0   0 ], 'inf' ) < 1e-10,	  cstr = 'red';    
-elseif norm( C - [0   1   1 ], 'inf' ) < 1e-10,	  cstr = 'cyan';   
-elseif norm( C - [1   0   1 ], 'inf' ) < 1e-10,	  cstr = 'magenta';
-elseif norm( C - [1   1   0 ], 'inf' ) < 1e-10,	  cstr = 'yellow'; 
-elseif norm( C - [0   0   0 ], 'inf' ) < 1e-10,	  cstr = 'black';  
-elseif norm( C - [1   1   1 ], 'inf' ) < 1e-10,	  cstr = 'white';  
-else
-	cstr= 'blue'; % FIXME
-% cstr = [ '{rgb:red,' num2str( floor( C(1)*100) ) ';green,' num2str(floor(C(2)*100)) ';blue,' num2str(floor(C(3)*100)) '}' ];
-end
-
-end
diff --git a/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.sh b/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.sh
deleted file mode 100644
index 9bc84642506..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/matlab2pgfplots.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-
-CONVERT_STYLES=1
-CONVERT_AXES=1
-OUTFILE=""
-MAXPOINTS=100000
-
-function echoHelp()
-{
-	echo -e \
-		"matlab2pgfplots.sh [--maxpoints N]  [--styles [0|1] ]   [ --axes [0|1] ]  [ -o OUTFILE ]  INFILE ...\n"\
-		"converts Matlab figures (.fig-files) to pgfplots-files (.pgf-files).\n"\
-		"This script is a front-end for matlab2pgfplots.m (which needs to be in matlab's search path)\n"\
-		"type\n"\
-		" >> help matlab2pgfplots\n"\
-		"at your matlab prompt for more information.\n"
-	exit 0
-}
-
-LONGOPTS="styles:,axes:,help,maxpoints:"
-SHORTOPTS="o:"
-ARGS=`getopt -l "$LONGOPTS" "$SHORTOPTS" "$@"`
-if [ $? -ne 0 ]; then
-	echo "`basename $0`: Could not process command line arguments. Use the '--help' option for documentation."
-	exit 1
-fi
-
-eval set -- "$ARGS"
-while [ $# -gt 0 ]; do
-	ARG=$1
-	# echo "PROCESSING OPTION '$ARG' (next = $@)"
-	case "$ARG" in
-		--maxpoints)	shift; MAXPOINTS=$1; shift;;
-		--styles)		shift; CONVERT_STYLES="$1"; shift;;
-		--axes)			shift; CONVERT_AXES="$1"; shift;;
-		-o)				shift; OUTFILE="$1"; shift;;
-		--help)			shift; echoHelp;;
-		--)				shift; break;;
-		*)				break;
-	esac
-done
-
-if [ $# -eq 0 ]; then
-	echo "No input files specified."
-	exit 1
-fi
-
-HAS_OUTFILE=0
-if [ $# -gt 1 -a -n "$OUTFILE" ]; then
-	HAS_OUTFILE=1
-fi
-
-for A; do
-	INFILE="$A"
-	if [ $HAS_OUTFILE -eq 0 ]; then
-		OUTFILE="${INFILE%%.*}.pgf"
-	fi
-	echo "$INFILE -> $OUTFILE ... "
-
-	M_LOGFILE=`mktemp`
-	matlab -nojvm -nodesktop -nosplash 1>/dev/null 2>&1 -logfile $M_LOGFILE  <<-EOF
-		f=hgload( '$INFILE' );
-		matlab2pgfplots( '$OUTFILE', 'fig', f, 'styles', $CONVERT_STYLES, 'axes', $CONVERT_AXES, 'maxpoints', $MAXPOINTS );
-		exit
-	EOF
-	grep -q "Error" $M_LOGFILE
-	CODE=$?
-	if [ $CODE -eq 0 ]; then
-		echo "Matlab output:" 1>&2
-		cat $M_LOGFILE  1>&2
-		CODE=1
-	else
-		CODE=0
-	fi
-	rm -f $M_LOGFILE
-	if [ $CODE -ne 0 ]; then
-		exit $CODE
-	fi
-done
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgf2pdf.sh b/Master/texmf-dist/doc/latex/pgfplots/pgf2pdf.sh
deleted file mode 100644
index 027a6157b77..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/pgf2pdf.sh
+++ /dev/null
@@ -1,282 +0,0 @@
-#!/bin/sh
-
-TEX_FILE=""
-TEX_LOG_FILE=""
-
-TEX_DEFINES=""
-
-OLD_DIR=`pwd`
-
-DRIVER="pdftex"
-
-ALSO_EPS_OUTPUT=0
-WARN_ONLY_IF_TEXFILE_DOESNOT_INCLUDE_TARGET=0
-VERBOSE_LEVEL=0
-
-function dumpHelp() {
-	echo -e \
-		"`basename $0` [OPTIONS] [--texdefs <defsfile> | --mainfile <latexmainfile>.tex ]  [plot1.pgf plot2.pgf .... plotn.pgf]\n"\
-		"converts each plot*.pgf to plot*.pdf.\n"\
-		"This is done by running \n"\
-		"  latex --jobname plot1 latexmainfile\n"\
-		"for each single plot. See the pgfmanual section \"Externalizing graphics\".\n"\
-		"Options:\n"\
-		"--eps\n"\
-		"    will also produce eps output files.\n"\
-		"--driver D\n"\
-		"    will use either \"dvipdfm\", \"dvips\" or \"pdflatex\"\n"\
-		"    please note that only pdflatex works without additional\n"\
-		"    work.\n"\
-		"--mainfile FILE\n"\
-		"    A tex-file which has been configured for externalized graphics.\n"\
-		"    Two conditions must be met to perform the conversion of\n"\
-		"      \"plot.pgf\"  -> \"plot.pdf\":\n"\
-		"    1. FILE needs the command\n"\
-		"         \pgfrealjobname{FILE}\n"\
-		"       (see the pgf manual for details)\n"\
-		"    2. It needs to include \"plot.pgf\" somewhere (using \input{plot.pgf})\n"\
-		"\n"\
-		"--warnonly\n"\
-		"    Use this flag if the argument of --mainfile does not contain\n"\
-		"      \input{TARGET.pgf},\n"\
-		"    i.e. if (2.) is not fulfilled. In this case, the conversion for this\n"\
-		"    input file will be skipped.\n"\
-		"\n"\
-		"--texdefs FILE\n"\
-		"    Generates a temporary tex-file\n"\
-		"    \documentclass{article}\n"\
-		"    \input{FILE}\n"\
-		"    \begin{document}\n"\
-		"    \input{plot1.pgf}\n"\
-		"    \end{document}\n"\
-		"    and converts this one to pdf.\n"\
-		"    If FILE is '-', the input step is omitted.\n"
-		"-v\n"\
-		"    each -v option increases the verbosity.\n"\
-		""
-	exit 0;
-}
-
-
-LONGOPTS="mainfile:,eps,driver:,texdefs:,warnonly"
-SHORTOPTS="f:t:v"
-ARGS=`getopt -l "$LONGOPTS" "$SHORTOPTS" "$@"`
-if [ $? -ne 0 ]; then
-	echo "`basename $0`: Could not process command line arguments. Use the '--help' option for documentation."
-	exit 1
-fi
-
-eval set -- "$ARGS"
-while [ $# -gt 0 ]; do
-	ARG=$1
-	# echo "PROCESSING OPTION '$ARG' (next = $@)"
-	case "$ARG" in
-		--texdefs|-t)	shift; TEX_DEFINES="$1"; shift;;
-		--driver)		shift; DRIVER="$1"; shift;;
-		--mainfile|-f)	shift; TEX_FILE="$1"; TEX_LOG_FILE="${1%%.tex}.log"; shift;;
-		--eps)			shift; ALSO_EPS_OUTPUT=1;;
-		--warnonly)		shift; WARN_ONLY_IF_TEXFILE_DOESNOT_INCLUDE_TARGET=1;;
-		-v)				shift; VERBOSE_LEVEL=$((VERBOSE_LEVEL+1));;
-		--)				shift; break;;
-		*)				break;
-	esac
-done
-if [ -n "${TEX_DEFINES}" ]; then
-	if [ "${TEX_DEFINES:0:1}" != "/" ]; then
-		TEX_DEFINES=`pwd`/${TEX_DEFINES}
-	fi
-fi
-
-
-if [ $# -ne 0 ]; then
-	PGF_FILES=("$@")
-elif [ -n "${TEX_LOG_FILE}" ]; then
-	# search for lines with
-	#  (XXXX.pgf
-	PGF_FILES=(`sed -n '{s/.*(\([a-zA-Z0-9._-+^~]\+\.pgf\).*/\1/g;T ende;p};: ende' < $TEX_LOG_FILE`)
-	#PGF_FILES=(./errplot_L2.pgf)
-else
-	echo "No input files." 1>&2
-	exit 1
-fi
-
-for A in "${PGF_FILES[@]}"; do
-	if [ ! -f "$A" ]; then
-		echo "$A not found: no such file" 1>&2
-		exit 1
-	fi
-
-	CONTINUE_ON_ERROR=0
-		
-	TARGET_FILE=$(sed -n '{s/.*\\beginpgfgraphicnamed{\(.*\)}.*/\1/g;T ende;p};: ende' < "$A")
-	if [ $? -ne 0 -o -z "$TARGET_FILE" ]; then
-		echo "There is no valid \\beginpgfgraphicnamed{TARGET}...\\endpgfgraphicnamed command in $A. Can't be exported to pdf. Please see the PGF manual for details." 1>&2
-		exit 1
-	fi
-	echo "processing \"$A\"" 1>&2
-
-	CMD="latex"
-	case $DRIVER in
-		pdftex|pdflatex)
-			CMD="pdflatex"
-			;;
-	esac
-
-	if [ -z "${TEX_DEFINES}" ]; then
-		# LaTeX cannot write into a \jobname in another directory.
-		# But the TEX_FILE and $A may not necessarily be in the same directory!
-		#
-		# So, we have to build a work-around which simulates a \jobname in the directory of TEX_FILE
-		# which does not fool \beginpgfgraphicnamed
-		
-		# modify the input file A:
-		ORIGINAL_FILE="$A.orig"
-		mv "$A" "$ORIGINAL_FILE" || exit 1
-		cat - "$ORIGINAL_FILE" >"$A" <<-EOF
-			\let\tmpXXXXXZEUGoldjobname=\jobname
-			\def\jobname{${TARGET_FILE}}%
-			\message{PGF2PDF: TEX HAS ENTERED THE TARGET FILE...}%
-		EOF
-		cat >> "$A" <<-EOF
-			\let\jobname=\tmpXXXXXZEUGoldjobname
-		EOF
-
-		cd `dirname "${TEX_FILE}"`
-
-		# generate a temp \jobname in the current directory:
-		TMP_JOB_FILE=`mktemp ./tmppgf2pdfXXXXXX`
-		if [ $? -ne 0 ]; then exit 1; fi
-		rm -f "$TMP_JOB_FILE"
-
-		$CMD --interaction nonstopmode --jobname "$TMP_JOB_FILE" "${TEX_FILE}" 1>/dev/null
-		CODE=$?
-		
-		INTERM_EXTENSION="dvi"
-		case $DRIVER in
-			pdftex|pdflatex)
-				INTERM_EXTENSION="pdf"
-				;;
-			dvipdfm)
-				INTERM_EXTENSION="dvi"
-				;;
-			dvips)
-				INTERM_EXTENSION="dvi"
-				;;
-		esac
-		if [ ! -s "$TMP_JOB_FILE.$INTERM_EXTENSION" ]; then
-			if [ $VERBOSE_LEVEL -ge 1 ]; then
-				if [ $WARN_ONLY_IF_TEXFILE_DOESNOT_INCLUDE_TARGET -eq 1 ]; then
-					echo -n "WARNING: ";
-				else
-					echo -n "ERROR: ";
-				fi
-				echo -e "running\n"\
-					"  '$CMD --jobname $TMP_JOB_FILE $TEX_FILE'\n"\
-					"resulted in a zero-size file \"$TMP_JOB_FILE.$INTERM_EXTENSION\"!\n"\
-					"Please check\n"\
-					"- if $TEX_FILE contains\n"\
-					"    \pgfrealjobname{`basename ${TEX_FILE%%.tex}`}\n"\
-					"- if $TEX_FILE contains\n"\
-					"    \input{$A}\n"\
-					"\n"\
-					"You may take a look at\n\t$TARGET_FILE.log\n for more information.\n"\
-					"Maybe `basename $0` --texdefs is more appropriate for this application?\n"\
-					"It doesn't need \input{}...\n"\
-					1>&2
-			fi
-
-			CODE=1
-			if [ $WARN_ONLY_IF_TEXFILE_DOESNOT_INCLUDE_TARGET -eq 1 ]; then
-				CONTINUE_ON_ERROR=1
-			fi
-			rm -f $TMP_JOB_FILE.{$INTERM_EXTENSION,pdf}
-		fi
-
-
-		# FIXME: this here may clash if A and TARGET_FILE have inconsistent paths!
-		mv "$ORIGINAL_FILE" "$A" || exit 1
-		for QQ in $TMP_JOB_FILE.*; do
-			if [ "$TARGET_FILE.${QQ##*.}" != "$A" ]; then
-				mv "$QQ" "$TARGET_FILE.${QQ##*.}" || exit 1
-			fi
-		done
-
-		cd "$OLD_DIR"
-	else
-		# Die Idee hier ist wie folgt:
-		# - Erstelle ein fast leeres Tex-File
-		# - darin steht NUR 
-		# 	\input $TEX_DEFINES
-		#   und 
-		#   \input $A
-		# - das TeX-file wird mit pgflatex uebersetzt
-		# - die ausgabe wird nach $TARGET_FILE geschrieben
-		# - fertig.
-		#
-		# BUGS:
-		# - TARGET_FILE != A wird nicht funktionieren (nur die endungen natuerlich)
-		DRIVER="pdftex"
-		cd `dirname "$A"`
-		BASE=`basename $TARGET_FILE`
-		TMP_TEX_FILE=`mktemp tmp_${BASE}_XXXXXX`
-		mv "$TMP_TEX_FILE" "${TMP_TEX_FILE}.tex"
-		TMP_TEX_FILE="$TMP_TEX_FILE.tex"
-		rm -f "${BASE}.pdf"
-
-		cat >"$TMP_TEX_FILE" <<-EOF
-		\documentclass{report}
-
-		\input{${TEX_DEFINES}}
-
-		%\def\pgfsysdriver{pgfsys-dvipdfm.def}
-		%\def\pgfsysdriver{pgfsys-pdftex.def}
-		\usepackage{tikz}
-		\pgfrealjobname{${TMP_TEX_FILE%%.tex}}
-		\begin{document}
-		\let\oldjobname=\jobname%
-		% make sure that PGF recognises that jobname==target file name
-		% even if --jobname has a different path.
-		\def\jobname{${TARGET_FILE}}%
-		\input{`basename $A`}%
-		\let\jobname=\oldjobname
-		\end{document}
-		EOF
-		$CMD --interaction nonstopmode --jobname "$BASE" "${TMP_TEX_FILE}" 1>/dev/null
-		CODE=$?
-		if [ $CODE -eq 0 ]; then
-			rm -f "$TMP_TEX_FILE"
-		fi
-		cd $OLD_DIR
-	fi
-
-	if [ $CODE -ne 0 ]; then
-		rm -f "${TARGET_FILE}.pdf"
-		if [ $CONTINUE_ON_ERROR -eq 1 ]; then
-			echo "WARNING: $A SKIPPED [use -v for messages]." 1>&2
-			CODE=0
-			continue
-		else
-			echo -e "FAILED: could not convert\n\t$A\n->\t$TARGET_FILE.pdf" 1>&2;
-			exit 1;
-		fi
-	fi
-	CMD=""
-	case $DRIVER in
-		dvipdfm)
-			dvipdfm -o ${TARGET_FILE}.pdf "${TARGET_FILE}.dvi" || exit 1
-			pdfcrop "${TARGET_FILE}.pdf" "${TARGET_FILE}.pdf" || exit 1
-			;;
-		dvips)
-			dvipdfm -o ${TARGET_FILE}.ps "${TARGET_FILE}.dvi" || exit 1
-			;;
-	esac
-
-	if [ $ALSO_EPS_OUTPUT -eq 1 ]; then
-		pdftops -f 1 -l 1 -eps "${TARGET_FILE}.pdf" "${TARGET_FILE}.eps" 
-		if [ $? -ne 0 ]; then
-			echo "Conversion pdf -> eps FAILED!" 1>&2 
-			exit 1
-		fi
-	fi
-done
-cd $OLD_DIR
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfmanual-en-macros.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfmanual-en-macros.tex
new file mode 100644
index 00000000000..e4efc70dcfa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfmanual-en-macros.tex
@@ -0,0 +1,943 @@
+% Copyright 2006 by Till Tantau
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Free Documentation License.
+%
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+
+% $Header: /cvsroot/pgfplots/pgfplots/doc/latex/pgfplots/pgfmanual-en-macros.tex,v 1.1 2008/05/24 12:09:27 ludewich Exp $
+
+
+\providecommand\href[2]{\texttt{#1}}
+
+
+\colorlet{examplefill}{yellow!80!black}
+\definecolor{graphicbackground}{rgb}{0.96,0.96,0.8}
+\definecolor{codebackground}{rgb}{0.8,0.8,1}
+
+\newenvironment{pgfmanualentry}{\list{}{\leftmargin=2em\itemindent-\leftmargin\def\makelabel##1{\hss##1}}}{\endlist}
+\newcommand\pgfmanualentryheadline[1]{\itemsep=0pt\parskip=0pt\item\strut{#1}\par\topsep=0pt}
+\newcommand\pgfmanualbody{\parskip3pt}
+
+
+
+\newenvironment{pgflayout}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{\texttt{\string\pgfpagesuselayout\char`\{\declare{#1}\char`\}}\oarg{options}}
+    \index{#1@\protect\texttt{#1} layout}%
+    \index{Page layouts!#1@\protect\texttt{#1}}%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+\newenvironment{command}[1]{
+  \begin{pgfmanualentry}
+    \extractcommand#1\@@
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+%% MW: START MATH MACROS
+\def\mvar#1{{\rmfamily\textit{#1}}}
+
+\makeatletter
+
+\def\extractmathfunctionname#1{\extractmathfunctionname@#1(,)\tmpa\tmpb}
+\def\extractmathfunctionname@#1(#2)#3\tmpb{\def\mathname{#1}}
+
+\def\extractmathoperatorname{\begingroup\def\mvar##1{}\def\ {}\extractmathoperatorname@}
+\def\extractmathoperatorname@#1{\xdef\mathname{#1}\endgroup}
+
+\makeatother
+	
+\newenvironment{math-function}[1]{
+	\begin{pgfmanualentry}
+		\extractmathfunctionname{#1}
+		\pgfmanualentryheadline{\texttt{#1}}%
+		\index{\mathname @\protect\texttt{\mathname} math function}%
+		\index{Math functions!\mathname @\protect\texttt{\mathname}}
+		\pgfmanualbody
+}
+{
+	\end{pgfmanualentry}
+}
+
+\newenvironment{math-operator}[1]{	
+	\begin{pgfmanualentry}
+		\extractmathoperatorname{#1}
+		\pgfmanualentryheadline{\texttt{#1}}%
+		\index{\mathname @\protect\texttt{\mathname} math operator}%
+		\index{Math operators!\mathname @\protect\texttt{\mathname}}
+    	\pgfmanualbody
+}
+{%
+	\end{pgfmanualentry}
+}
+
+\newenvironment{math-constant}[1]{
+	\begin{pgfmanualentry}
+		\pgfmanualentryheadline{\texttt{#1}}%
+		\index{#1@\protect\texttt{#1} math constant}%
+		\index{Math constants!#1@\protect\texttt{#1}}
+		\pgfmanualbody
+}
+{
+	\end{pgfmanualentry}
+}
+\def\calcname{\textsc{calc}}
+%% MW: END MATH MACROS
+
+
+\def\extractcommand#1#2\@@{%
+  \pgfmanualentryheadline{\declare{\texttt{\string#1}}#2}%
+  \removeats{#1}%
+  \index{\strippedat @\protect\myprintocmmand{\strippedat}}}
+
+
+% \begin{environment}{{name}\marg{arguments}}
+\renewenvironment{environment}[1]{
+  \begin{pgfmanualentry}
+    \extractenvironement#1\@@
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\extractenvironement#1#2\@@{%
+  \pgfmanualentryheadline{{\ttfamily\char`\\begin\char`\{\declare{#1}\char`\}}#2}%
+  \pgfmanualentryheadline{{\ttfamily\ \ }\meta{environment contents}}%
+  \pgfmanualentryheadline{{\ttfamily\char`\\end\char`\{\declare{#1}\char`\}}}%
+  \index{#1@\protect\texttt{#1} environment}%
+  \index{Environments!#1@\protect\texttt{#1}}}
+
+
+\newenvironment{plainenvironment}[1]{
+  \begin{pgfmanualentry}
+    \extractplainenvironement#1\@@
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\extractplainenvironement#1#2\@@{%
+  \pgfmanualentryheadline{{\ttfamily\declare{\char`\\#1}}#2}%
+  \pgfmanualentryheadline{{\ttfamily\ \ }\meta{environment contents}}%
+  \pgfmanualentryheadline{{\ttfamily\declare{\char`\\end#1}}}%
+  \index{#1@\protect\texttt{#1} environment}%
+  \index{Environments!#1@\protect\texttt{#1}}}
+
+
+\newenvironment{contextenvironment}[1]{
+  \begin{pgfmanualentry}
+    \extractcontextenvironement#1\@@
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\extractcontextenvironement#1#2\@@{%
+  \pgfmanualentryheadline{{\ttfamily\declare{\char`\\start#1}}#2}%
+  \pgfmanualentryheadline{{\ttfamily\ \ }\meta{environment contents}}%
+  \pgfmanualentryheadline{{\ttfamily\declare{\char`\\stop#1}}}%
+  \index{#1@\protect\texttt{#1} environment}%
+  \index{Environments!#1@\protect\texttt{#1}}}
+
+
+\newenvironment{shape}[1]{
+  \begin{pgfmanualentry}
+  	\pgfmanualentryheadline{Shape {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} shape}%
+    \index{Shapes!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+\newenvironment{handler}[1]{
+  \begin{pgfmanualentry}
+    \extracthandler#1\@nil%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\gobble#1{}
+\def\extracthandler#1#2\@nil{%
+  \pgfmanualentryheadline{Key handler \meta{key}{\ttfamily/\declare{#1}}#2}%
+  \index{\gobble#1@\protect\texttt{#1} handler}%
+  \index{Key handlers!#1@\protect\texttt{#1}}
+}
+
+
+\makeatletter
+
+
+\newenvironment{stylekey}[1]{
+  \begin{pgfmanualentry}
+    \def\extrakeytext{style, }
+    \extractkey#1\@nil%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+% \begin{key}{/path/x=value}
+% \begin{key}{/path/x=value (initially XXX)}
+% \begin{key}{/path/x=value (default XXX)}
+\newenvironment{key}[1]{
+  \begin{pgfmanualentry}
+    \def\extrakeytext{}
+    %\def\altpath{\emph{\color{gray}or}}%
+    \extractkey#1\@nil%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\extractkey#1\@nil{%
+  \pgfutil@in@={#1}%
+  \ifpgfutil@in@%
+    \extractkeyequal#1\@nil
+  \else%
+    \pgfutil@in@{(initial}{#1}%
+    \ifpgfutil@in@%
+      \extractequalinitial#1\@nil%
+    \else
+      \pgfmanualentryheadline{{\ttfamily\declare{#1}}\hfill(\extrakeytext no value)}%
+      \def\mykey{#1}%
+      \def\mypath{}%
+      \def\myname{}%
+      \firsttimetrue%
+      \decompose#1/\nil%
+    \fi
+  \fi%
+}
+
+\def\extractkeyequal#1=#2\@nil{%
+  \pgfutil@in@{(default}{#2}%
+  \ifpgfutil@in@%
+    \extractdefault{#1}#2\@nil%
+  \else%
+    \pgfutil@in@{(initial}{#2}%
+    \ifpgfutil@in@%
+      \extractinitial{#1}#2\@nil%
+    \else
+      \pgfmanualentryheadline{{\ttfamily\declare{#1}=}#2\hfill(\extrakeytext no default)}%
+    \fi%
+  \fi%
+  \def\mykey{#1}%
+  \def\mypath{}%
+  \def\myname{}%
+  \firsttimetrue%
+  \decompose#1/\nil%
+}
+
+\def\extractdefault#1#2(default #3)\@nil{%
+  \pgfmanualentryheadline{{\ttfamily\declare{#1}\opt{=}}\opt{#2}\hfill (\extrakeytext default {\ttfamily#3})}%
+}
+
+\def\extractinitial#1#2(initially #3)\@nil{%
+  \pgfmanualentryheadline{{\ttfamily\declare{#1}=}#2\hfill (\extrakeytext no default, initially {\ttfamily#3})}%
+}
+
+\def\extractequalinitial#1 (initially #2)\@nil{%
+  \pgfmanualentryheadline{{\ttfamily\declare{#1}}\hfill (\extrakeytext initially {\ttfamily#2})}%
+  \def\mykey{#1}%
+  \def\mypath{}%
+  \def\myname{}%
+  \firsttimetrue%
+  \decompose#1/\nil%
+}
+
+% Introduces a key alias '/#1/<name of current key>'
+% to be used inside of \begin{key} ... \end{key}
+\def\keyalias#1{\vspace{-3pt}\item{\small alias {\ttfamily/#1/\myname}}\vspace{-2pt}\par}
+
+\newif\iffirsttime
+
+\makeatother
+
+\def\decompose/#1/#2\nil{%
+  \def\test{#2}%
+  \ifx\test\empty%
+    % aha.
+    \index{#1@\protect\texttt{#1} key}%
+    \index{\mypath#1@\protect\texttt{#1}}%
+    \def\myname{#1}%
+  \else%
+    \iffirsttime
+      \def\mypath{#1@\protect\texttt{/#1/}!}%
+      \firsttimefalse
+    \else
+      \expandafter\def\expandafter\mypath\expandafter{\mypath#1@\protect\texttt{#1/}!}%
+    \fi
+    \def\firsttime{}
+    \decompose/#2\nil%
+  \fi%
+}
+
+\newenvironment{predefinedmethod}[1]{
+  \begin{pgfmanualentry}
+    \extractpredefinedmethod#1\@nil
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+\def\extractpredefinedmethod#1(#2)\@nil{%
+  \pgfmanualentryheadline{Method \declare{\ttfamily #1}\texttt(#2\texttt) \hfill(predefined for all classes)}
+  \index{#1@\protect\texttt{#1} method}%
+  \index{Methods!#1@\protect\texttt{#1}}
+}
+
+
+\newenvironment{ooclass}[1]{
+  \begin{pgfmanualentry}
+    \def\currentclass{#1}
+    \pgfmanualentryheadline{Class \declare{\texttt{#1}}}
+    \index{#1@\protect\texttt{#1} class}%
+    \index{Class #1@Class \protect\texttt{#1}}%
+    \index{Classes!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{method}[1]{
+  \begin{pgfmanualentry}
+    \extractmethod#1\@nil
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+\def\extractmethod#1(#2)\@nil{%
+  \def\test{#1}
+  \ifx\test\currentclass
+    \pgfmanualentryheadline{Constructor \declare{\ttfamily #1}\texttt(#2\texttt)}
+  \else
+    \pgfmanualentryheadline{Method \declare{\ttfamily #1}\texttt(#2\texttt)}
+  \fi
+  \index{#1@\protect\texttt{#1} method}%
+  \index{Methods!#1@\protect\texttt{#1}}
+  \index{Class \currentclass!#1@\protect\texttt{#1}}%
+}
+
+\newenvironment{attribute}[1]{
+  \begin{pgfmanualentry}
+    \extractattribute#1\@nil
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+\def\extractattribute#1=#2;\@nil{%
+  \def\test{#2}%
+  \ifx\test\@empty
+    \pgfmanualentryheadline{Private attribute \declare{\ttfamily #1} \hfill (initially empty)}
+  \else
+    \pgfmanualentryheadline{Private attribute \declare{\ttfamily #1} \hfill (initially {\ttfamily #2})}
+  \fi
+  \index{#1@\protect\texttt{#1} attribute}%
+  \index{Attributes!#1@\protect\texttt{#1}}
+  \index{Class \currentclass!#1@\protect\texttt{#1}}%
+}
+
+
+
+\newenvironment{predefinednode}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{Predefined node {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} node}%
+    \index{Predefined node!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{coordinatesystem}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{Coordinate system {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} coordinate system}%
+    \index{Coordinate systems!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{snake}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{Snake {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} snake}%
+    \index{Snakes!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{decoration}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{Decoration {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} decoration}%
+    \index{Decorations!#1@\protect\texttt{#1}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+\def\pgfmanualbar{\char`\|}
+\makeatletter
+\newenvironment{pathoperation}[3][]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{\textcolor{gray}{{\ttfamily\char`\\path}\
+        \ \dots}
+      \declare{\texttt{#2}}#3\ \textcolor{gray}{\dots\texttt{;}}}%
+    \def\pgfmanualtest{#1}%
+    \ifx\pgfmanualtest\@empty%
+      \index{#2@\protect\texttt{#2} path operation}%
+      \index{Path operations!#2@\protect\texttt{#2}}%
+    \fi%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+\makeatother
+
+\def\extractcommand#1#2\@@{%
+  \pgfmanualentryheadline{\declare{\texttt{\string#1}}#2}%
+  \removeats{#1}%
+  \index{\strippedat @\protect\myprintocmmand{\strippedat}}}
+
+\def\doublebs{\texttt{\char`\\\char`\\}}
+
+
+\newenvironment{package}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepackage\char`\{\declare{#1}\char`\}\space\space \char`\%\space\space  \LaTeX}}
+    \index{#1@\protect\texttt{#1} package}%
+    \index{Packages and files!#1@\protect\texttt{#1}}%
+    \pgfmanualentryheadline{{\ttfamily\char`\\input \declare{#1}.tex\space\space\space \char`\%\space\space  plain \TeX}}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usemodule[\declare{#1}]\space\space \char`\%\space\space  Con\TeX t}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+\newenvironment{pgfmodule}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepgfmodule\char`\{\declare{#1}\char`\}\space\space\space
+        \char`\%\space\space  \LaTeX\space and plain \TeX\space and pure pgf}}
+    \index{#1@\protect\texttt{#1} module}%
+    \index{Modules!#1@\protect\texttt{#1}}%
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepgfmodule[\declare{#1}]\space\space \char`\%\space\space  Con\TeX t\space and pure pgf}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{pgflibrary}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepgflibrary\char`\{\declare{#1}\char`\}\space\space\space
+        \char`\%\space\space  \LaTeX\space and plain \TeX\space and pure pgf}}
+    \index{#1@\protect\texttt{#1} library}%
+    \index{Libraries!#1@\protect\texttt{#1}}%
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepgflibrary[\declare{#1}]\space\space \char`\%\space\space  Con\TeX t\space and pure pgf}}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usetikzlibrary\char`\{\declare{#1}\char`\}\space\space
+        \char`\%\space\space  \LaTeX\space and plain \TeX\space when using \tikzname}}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usetikzlibrary[\declare{#1}]\space
+        \char`\%\space\space  Con\TeX t\space when using \tikzname}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{tikzlibrary}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usetikzlibrary\char`\{\declare{#1}\char`\}\space\space \char`\%\space\space  \LaTeX\space and plain \TeX}}
+    \index{#1@\protect\texttt{#1} library}%
+    \index{Libraries!#1@\protect\texttt{#1}}%
+    \pgfmanualentryheadline{{\ttfamily\char`\\usetikzlibrary[\declare{#1}]\space \char`\%\space\space Con\TeX t}}
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+
+\newenvironment{filedescription}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{File {\ttfamily\declare{#1}}}%
+    \index{#1@\protect\texttt{#1} file}%
+    \index{Packages and files!#1@\protect\texttt{#1}}%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+\newenvironment{packageoption}[1]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{{\ttfamily\char`\\usepackage[\declare{#1}]\char`\{pgf\char`\}}}
+    \index{#1@\protect\texttt{#1} package option}%
+    \index{Package options for \textsc{pgf}!#1@\protect\texttt{#1}}%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+
+
+\newcommand\opt[1]{{\color{black!50!green}#1}}
+\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}}
+
+\def\opt{\afterassignment\pgfmanualopt\let\next=}
+\def\pgfmanualopt{\ifx\next\bgroup\bgroup\color{black!50!green}\else{\color{black!50!green}\next}\fi}
+
+
+
+\def\beamer{\textsc{beamer}}
+\def\pdf{\textsc{pdf}}
+\def\pgfname{\textsc{pgf}}
+\def\tikzname{Ti\emph{k}Z}
+\def\pstricks{\textsc{pstricks}}
+\def\prosper{\textsc{prosper}}
+\def\seminar{\textsc{seminar}}
+\def\texpower{\textsc{texpower}}
+\def\foils{\textsc{foils}}
+
+{
+  \makeatletter
+  \global\let\myempty=\@empty
+  \global\let\mygobble=\@gobble
+  \catcode`\@=12
+  \gdef\getridofats#1@#2\relax{%
+    \def\getridtest{#2}%
+    \ifx\getridtest\myempty%
+      \expandafter\def\expandafter\strippedat\expandafter{\strippedat#1}
+    \else%
+      \expandafter\def\expandafter\strippedat\expandafter{\strippedat#1\protect\printanat}
+      \getridofats#2\relax%
+    \fi%
+  }
+
+  \gdef\removeats#1{%
+    \let\strippedat\myempty%
+    \edef\strippedtext{\stripcommand#1}%
+    \expandafter\getridofats\strippedtext @\relax%
+  }
+  
+  \gdef\stripcommand#1{\expandafter\mygobble\string#1}
+}
+
+\def\printanat{\char`\@}
+
+\def\declare{\afterassignment\pgfmanualdeclare\let\next=}
+\def\pgfmanualdeclare{\ifx\next\bgroup\bgroup\color{red!75!black}\else{\color{red!75!black}\next}\fi}
+
+
+\let\textoken=\command
+\let\endtextoken=\endcommand
+
+\def\myprintocmmand#1{\texttt{\char`\\#1}}
+
+\def\example{\par\smallskip\noindent\textit{Example: }}
+\def\themeauthor{\par\smallskip\noindent\textit{Theme author: }}
+
+
+\def\indexoption#1{%
+  \index{#1@\protect\texttt{#1} option}%
+  \index{Graphic options and styles!#1@\protect\texttt{#1}}%
+}
+
+\def\itemcalendaroption#1{\item \declare{\texttt{#1}}%
+  \index{#1@\protect\texttt{#1} date test}%
+  \index{Date tests!#1@\protect\texttt{#1}}%
+}
+
+
+
+\def\class#1{\list{}{\leftmargin=2em\itemindent-\leftmargin\def\makelabel##1{\hss##1}}%
+\extractclass#1@\par\topsep=0pt}
+\def\endclass{\endlist}
+\def\extractclass#1#2@{%
+\item{{{\ttfamily\char`\\documentclass}#2{\ttfamily\char`\{\declare{#1}\char`\}}}}%
+  \index{#1@\protect\texttt{#1} class}%
+  \index{Classes!#1@\protect\texttt{#1}}}
+
+\def\partname{Part}
+
+\makeatletter
+\def\index@prologue{\section*{Index}\addcontentsline{toc}{section}{Index}
+  This index only contains automatically generated entries. A good
+  index should also contain carefully selected keywords. This index is
+  not a good index.
+  \bigskip
+}
+\c@IndexColumns=2
+  \def\theindex{\@restonecoltrue
+    \columnseprule \z@  \columnsep 29\p@
+    \twocolumn[\index@prologue]%
+       \parindent -30pt
+       \columnsep 15pt
+       \parskip 0pt plus 1pt
+       \leftskip 30pt
+       \rightskip 0pt plus 2cm
+       \small
+       \def\@idxitem{\par}%
+    \let\item\@idxitem \ignorespaces}
+  \def\endtheindex{\onecolumn}
+\def\noindexing{\let\index=\@gobble}
+
+
+
+\newcommand\symarrow[1]{
+  \index{#1@\protect\texttt{#1} arrow tip}%
+  \index{Arrow tips!#1@\protect\texttt{#1}}
+  \texttt{#1}& yields thick  
+  \begin{tikzpicture}[arrows={#1-#1},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture} and thin
+  \begin{tikzpicture}[arrows={#1-#1},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}
+}
+\newcommand\symarrowdouble[1]{
+  \index{#1@\protect\texttt{#1} arrow tip}%
+  \index{Arrow tips!#1@\protect\texttt{#1}}
+  \texttt{#1}& yields thick  
+  \begin{tikzpicture}[arrows={#1-#1},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}
+  and thin
+  \begin{tikzpicture}[arrows={#1-#1},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}, double 
+  \begin{tikzpicture}[arrows={#1-#1},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw[double,double equal sign distance] (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture} and 
+  \begin{tikzpicture}[arrows={#1-#1},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw[double,double equal sign distance] (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}
+}
+
+\newcommand\sarrow[2]{
+  \index{#1@\protect\texttt{#1} arrow tip}%
+  \index{Arrow tips!#1@\protect\texttt{#1}}
+  \index{#2@\protect\texttt{#2} arrow tip}%
+  \index{Arrow tips!#2@\protect\texttt{#2}}
+  \texttt{#1-#2}& yields thick  
+  \begin{tikzpicture}[arrows={#1-#2},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture} and thin
+  \begin{tikzpicture}[arrows={#1-#2},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}
+}
+
+\newcommand\sarrowdouble[2]{
+  \index{#1@\protect\texttt{#1} arrow tip}%
+  \index{Arrow tips!#1@\protect\texttt{#1}}
+  \index{#2@\protect\texttt{#2} arrow tip}%
+  \index{Arrow tips!#2@\protect\texttt{#2}}
+  \texttt{#1-#2}& yields thick  
+  \begin{tikzpicture}[arrows={#1-#2},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture} and thin
+  \begin{tikzpicture}[arrows={#1-#2},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}, double 
+  \begin{tikzpicture}[arrows={#1-#2},thick,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw[double,double equal sign distance] (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture} and 
+  \begin{tikzpicture}[arrows={#1-#2},thin,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1cm,2ex);
+    \draw[double,double equal sign distance] (0pt,.5ex) -- (1cm,.5ex);
+  \end{tikzpicture}
+}
+
+\newcommand\carrow[1]{
+  \index{#1@\protect\texttt{#1} arrow tip}%
+  \index{Arrow tips!#1@\protect\texttt{#1}}
+  \texttt{#1}& yields for line width 1ex
+  \begin{tikzpicture}[arrows={#1-#1},line width=1ex,baseline]
+    \useasboundingbox (0pt,-0.5ex) rectangle (1.5cm,2ex);
+    \draw (0pt,.5ex) -- (1.5cm,.5ex);
+  \end{tikzpicture}
+}
+\def\myvbar{\char`\|}
+\newcommand\plotmarkentry[1]{%
+  \index{#1@\protect\texttt{#1} plot mark}%
+  \index{Plot marks!#1@\protect\texttt{#1}}
+  \texttt{\char`\\pgfuseplotmark\char`\{\declare{#1}\char`\}} &
+  \tikz\draw[color=black!25] plot[mark=#1,mark options={fill=examplefill,draw=black}] coordinates{(0,0) (.5,0.2) (1,0) (1.5,0.2)};\\
+}
+\newcommand\plotmarkentrytikz[1]{%
+  \index{#1@\protect\texttt{#1} plot mark}%
+  \index{Plot marks!#1@\protect\texttt{#1}}
+  \texttt{mark=\declare{#1}} & \tikz\draw[color=black!25]
+  plot[mark=#1,mark options={fill=examplefill,draw=black}] 
+    coordinates {(0,0) (.5,0.2) (1,0) (1.5,0.2)};\\
+}
+
+
+
+\ifx\scantokens\@undefined
+  \PackageError{pgfmanual-macros}{You need to use extended latex
+    (elatex) or (pdfelatex) to process this document}{}
+\fi
+
+% Define \find@example such that it doesn't destroy catcodes:
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@example#1\end{codeexample}[|endofcodeexample[#1]]
+|endgroup
+
+% define \returntospace.
+%
+% It should define NEWLINE as {}, spaces and tabs as \space.
+\begingroup
+\catcode`\^=7
+\catcode`\^^M=13
+\catcode`\^^I=13
+\catcode`\ =13%
+\gdef\returntospace{\catcode`\ =13\def {\space}\catcode`\^^I=13\def^^I{\space}\catcode`\^^M=13\def^^M{}}%
+\endgroup
+
+\begingroup
+\catcode`\%=13
+\catcode`\^^M=13
+\gdef\commenthandler{\catcode`\%=13\def%{\@gobble@till@return}}
+\gdef\@gobble@till@return#1^^M{}
+\gdef\@gobble@till@return@ignore#1^^M{\ignorespaces}
+\gdef\typesetcomment{\catcode`\%=13\def%{\@typeset@till@return}}
+\gdef\@typeset@till@return#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}}\par}
+\endgroup
+
+% Define tab-implementation functions
+%   \codeexample@tabinit@replacementchars@
+% and
+%   \codeexample@tabinit@catcode@
+%
+% They should ONLY be used in case that tab replacement is active.
+%
+% This here is merely a preparation step.
+%
+% Idea:
+% \codeexample@tabinit@catcode@ will make TAB active
+% and
+% \codeexample@tabinit@replacementchars@ will insert as many spaces as
+% /codeexample/tabsize contains.
+{
+\catcode`\^^I=13
+% ATTENTION: do NOT use tabs in these definitions!!
+\gdef\codeexample@tabinit@replacementchars@{%
+ \begingroup
+ \count0=\pgfkeysvalueof{/codeexample/tabsize}\relax
+ \toks0={}%
+ \loop
+ \ifnum\count0>0
+  \advance\count0 by-1
+  \toks0=\expandafter{\the\toks0\ }%
+ \repeat
+ \xdef\codeexample@tabinit@replacementchars@@{\the\toks0}%
+ \endgroup
+ \let^^I=\codeexample@tabinit@replacementchars@@
+}%
+\gdef\codeexample@tabinit@catcode@{\catcode`\^^I=13}%
+}%
+
+% Called after any options have been set. It assigns
+%   \codeexample@tabinit@catcode
+% and
+%   \codeexample@tabinit@replacementchars
+% which are used inside of 
+%\begin{codeexample}
+% ...
+%\end{codeexample}
+%
+% \codeexample@tabinit@catcode  is either \relax or it makes tab
+% active.
+%
+% \codeexample@tabinit@replacementchars is either \relax or it inserts
+% a proper replacement sequence for tabs (as many spaces as
+% configured)
+\def\codeexample@tabinit{%
+	\ifnum\pgfkeysvalueof{/codeexample/tabsize}=0\relax
+		\let\codeexample@tabinit@replacementchars=\relax
+		\let\codeexample@tabinit@catcode=\relax
+	\else
+		\let\codeexample@tabinit@catcode=\codeexample@tabinit@catcode@
+		\let\codeexample@tabinit@replacementchars=\codeexample@tabinit@replacementchars@
+	\fi
+}
+
+\pgfqkeys{/codeexample}{%
+	width/.code=	{\setlength\codeexamplewidth{#1}},
+	graphic/.code=	{\colorlet{graphicbackground}{#1}},
+	code/.code=	{\colorlet{codebackground}{#1}},
+	execute code/.is if=code@execute,
+	code only/.code=	{\code@executefalse},
+	pre/.code=	{\def\code@pre{#1}},
+	post/.code=	{\def\code@post{#1}},
+	vbox/.code=	{\def\code@pre{\vbox\bgroup\setlength{\hsize}{\linewidth-6pt}}\def\code@post{\egroup}},
+	ignorespaces/.code=	{\let\@gobble@till@return=\@gobble@till@return@ignore},
+	leave comments/.code=	{\def\code@catcode@hook{\catcode`\%=12}\let\commenthandler=\relax\let\typesetcomment=\relax},
+	tabsize/.initial=0,
+	every codeexample/.style={width=4cm+7pt},
+}
+
+\def\code@pre{}
+\def\code@post{}
+\def\code@catcode@hook{}
+
+\newdimen\codeexamplewidth
+\newif\ifcode@execute
+\newbox\codeexamplebox
+\def\codeexample[#1]{%
+  \begingroup%
+  \code@executetrue
+  \pgfqkeys{/codeexample}{every codeexample,#1}%
+  \codeexample@tabinit% assigns \codeexample@tabinit@[catcode,replacementchars]
+  \parindent0pt
+  \begingroup%
+  \par%
+  \medskip%
+  \let\do\@makeother%
+  \dospecials%
+  \obeylines%
+  \@vobeyspaces%
+  \catcode`\%=13%
+  \catcode`\^^M=13%
+  \code@catcode@hook%
+  \codeexample@tabinit@catcode
+  \relax%
+  \find@example}
+\def\endofcodeexample#1{%
+  \endgroup%
+  \ifcode@execute%
+    \setbox\codeexamplebox=\hbox{%
+      {%
+        {%
+          \returntospace%
+          \commenthandler%
+          \xdef\code@temp{#1}% removes returns and comments
+        }%
+        \colorbox{graphicbackground}{\color{black}\ignorespaces%
+          \code@pre\expandafter\scantokens\expandafter{\code@temp\ignorespaces}\code@post\ignorespaces}%
+      }%
+    }%
+    \ifdim\wd\codeexamplebox>\codeexamplewidth%
+      \def\code@start{\par}%
+      \def\code@flushstart{}\def\code@flushend{}%
+      \def\code@mid{\parskip2pt\par\noindent}%
+      \def\code@width{\linewidth-6pt}%
+      \def\code@end{}%
+    \else%
+      \def\code@start{%
+        \linewidth=\textwidth%
+        \parshape \@ne 0pt \linewidth
+        \leavevmode%
+        \hbox\bgroup}%
+      \def\code@flushstart{\hfill}%
+      \def\code@flushend{\hbox{}}%
+      \def\code@mid{\hskip6pt}%
+      \def\code@width{\linewidth-12pt-\codeexamplewidth}%
+      \def\code@end{\egroup}%
+    \fi%
+    \code@start%
+    \noindent%
+    \begin{minipage}[t]{\codeexamplewidth}\raggedright
+      \hrule width0pt%
+      \footnotesize\vskip-1em%
+      \code@flushstart\box\codeexamplebox\code@flushend%
+      \vskip-1ex
+      \leavevmode%
+    \end{minipage}%
+  \else%
+    \def\code@mid{\par}
+    \def\code@width{\linewidth-6pt}
+    \def\code@end{}
+  \fi%
+  \code@mid%  
+  \colorbox{codebackground}{%
+    \begin{minipage}[t]{\code@width}%
+      {%
+        \let\do\@makeother
+        \dospecials
+        \frenchspacing\@vobeyspaces
+        \normalfont\ttfamily\footnotesize
+        \typesetcomment%
+		\codeexample@tabinit@replacementchars
+        \@tempswafalse
+        \def\par{%
+          \if@tempswa
+          \leavevmode \null \@@par\penalty\interlinepenalty
+          \else
+          \@tempswatrue
+          \ifhmode\@@par\penalty\interlinepenalty\fi
+          \fi}%
+        \obeylines
+        \everypar \expandafter{\the\everypar \unpenalty}%
+        #1}
+    \end{minipage}}%
+  \code@end%
+  \par%
+  \medskip
+  \end{codeexample}
+}
+
+\def\endcodeexample{\endgroup}
+
+
+\makeatother
+
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "beameruserguide"
+%%% End: 
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfmathlogtest.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfmathlogtest.tex
deleted file mode 100644
index 86fa5795a87..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfmathlogtest.tex
+++ /dev/null
@@ -1,333 +0,0 @@
-\documentclass[a4paper]{article}
-
-\usepackage[intlimits]{amsmath}
-\usepackage{amssymb}
-\usepackage{amsfonts}
-\usepackage{ifpdf}
-
-\ifpdf
-\else
-\def\pgfsysdriver{pgfsys-dvipdfm.def}
-\fi
-\usepackage{pgfmathlog}
-
-\parindent=0pt
-
-
-\author{Christian Feuers\"anger}
-\title{Test cases for pgfmathlog.sty}
-
-\begin{document}
-\maketitle
-
-\def\vgl#1#2{%
-	\begingroup
-	\message{COMPUTING LOG(#1)}%
-	\pgfmathlog{#1}%
-	\let\actual=\pgfmathresult
-	\def\expected{#2}%
-	\pgfmathsubtract\actual\expected%
-	\let\abserr=\pgfmathresult
-	\pgfmathdivide\abserr\expected
-	\let\relerr=\pgfmathresult
-	\noindent
-	log(#1)\hfill=
-	\expected;\hfill%
-	actual=\actual;\hfill%
-	abserr=\abserr;\hfill%
-	relerr=\relerr;\hfill%
-	\endgroup
-	\par
-}%
-\def\normalize#1{%
-	\begingroup
-	\message{NORMALISING #1...}%
-	\sciparse#1\to\M\powten\E
-	\sciparsesign{#1}\S\MM\EE
-	\[ #1 \mapsto \M \cdot 10^{\E}\quad \bigl( = \MM\cdot 10^{\EE}\quad [S=\S]\, \bigr) \]
-	\endgroup
-}
-
-\def\pretty#1{%
-	\message{Pretty-printing #1...}%
-	\[ #1 \mapsto \prettyprintnumber{#1} \]
-}
-
-
-
-%--------------------------------------------------
-% \showit{2.8128}
-% log(12)=\pgfmathlog{1.2}\pgfmathadd{\pgfmathresult}{2.30258}\pgfmathresult\par
-% \showit{1.2}
-% \showit{4.0}
-% log(1200)=\pgfmathlog{1.2}\pgfmathadd{\pgfmathresult}{6.9077}\pgfmathresult\par
-% log(6.241e-7)=\pgfmathlog{6.241}\pgfmathadd{\pgfmathresult}{-16.11809}\pgfmathresult\par
-%-------------------------------------------------- 
-
-\section{logarithms, compared with PGF arithmetics}
-
-\vgl{0.1}{-2.30259}
-\vgl{0.12}{-2.12026}
-\vgl{0.2}{-1.60944}
-\vgl{0.3}{-1.20397}
-\vgl{0.4}{-0.916291}
-\vgl{0.5}{-0.693147}
-\vgl{0.6}{-0.510826}
-\vgl{0.7}{-0.356675}
-\vgl{0.75}{-0.287682}
-\vgl{0.8}{-0.223144}
-\vgl{0.823}{-0.194799}
-\vgl{0.9}{-0.105361}
-\vgl{0.96}{-0.040822}
-\vgl{1.2}{0.182322}
-\vgl{1.5}{0.405465}
-\vgl{1.6}{0.470004}
-\vgl{9.0}{2.1972245773}
-\vgl{9.2}{2.2192034}
-\vgl{9.3}{2.23001440}
-\vgl{9.7}{2.27212588}
-\vgl{10.0}{2.302585092}
-\vgl{100.0}{4.605170185}
-\vgl{1351.0}{7.208600337}
-\vgl{9752.0}{9.185227671}
-\vgl{9600.0}{9.169518377}
-
-\vskip1cm
-\vgl{0.000142}{-8.8596835}
-\vgl{0.0054124}{-5.219062661}
-\vgl{0.000912697124}{-6.9991064}
-
-\vskip1cm
-\vgl{8.31160034e-02}{-2.48751801563782}%
-\vgl{2.54685628e-02}{-3.67031041875206}%
-\vgl{7.40715288e-03}{-4.90530914022879}%
-\vgl{2.10192154e-03}{-6.16490333357987}%
-\vgl{5.87352989e-04}{-7.43988457474844}%
-\vgl{1.62269942e-04}{-8.72624930084187}%
-\vgl{4.44248889e-05}{-10.0217106847708}%
-\vgl{1.20714122e-05}{-11.3246705288704}%
-\vgl{3.26101452e-06}{-12.6334722085451}%
-
-\vskip1cm
-\vgl{5}{1.6094379124341}%
-\vgl{17}{2.83321334405622}%
-\vgl{39}{3.66356164612965}%
-\vgl{49}{3.89182029811063}%
-\vgl{129}{4.85981240436167}%
-\vgl{321}{5.77144112313002}%
-\vgl{769}{6.64509096950564}%
-\vgl{1793}{7.49164547360513}%
-\vgl{4097}{8.31801027754687}%
-\vgl{9217}{9.12880488399366}%
-
-
-\section{Conversion to normalised floating point numbers basis 10}
-\normalize{123.41251}%
-\normalize{123412.51}%
-\normalize{12341251.0}%
-\tracingmacros=2\tracingcommands=2
-\normalize{-12341251.0}%
-\tracingmacros=0\tracingcommands=0
-\normalize{1.2341251}%
-\normalize{0.12341251}%
-\normalize{0.0012341251}%
-\normalize{0.00000012341251}%
-\normalize{-0.00000012341251}%
-
-\normalize{8.31160034e-02}%
-\normalize{2.54685628e-02}%
-\normalize{7.40715288e-03}%
-\normalize{2.10192154e-03}%
-\normalize{5.87352989e-04}%
-\normalize{-1.62269942e-04}%
-\normalize{4.44248889e-05}%
-\normalize{1.20714122e-05}%
-\normalize{3.26101452e-06}%
-\normalize{3261.01452e-06}%
-\normalize{0.000326101452e-06}%
-
-\message{SPECIAL CASE 0}%
-\normalize{0}
-\normalize{-0}
-\normalize{-0.000}
-\normalize{+0.000}
-\normalize{+0}
-\normalize{-1}
-\normalize{1.0e1}
-\tracingmacros=2\tracingcommands=2
-\normalize{1e1}
-\tracingmacros=0\tracingcommands=0
-\normalize{1141}
-\normalize{-53e-5}
-
-\section{Test for prettyprinter}
-\message{PRETTY PRINTING}
-\pretty{1}
-\pretty{1.0}
-\pretty{-1.02311}
-\pretty{-11241.02311}
-\pretty{-11241}
-\pretty{8124.99999}
-\pretty{8124.849999}
-\pretty{8124.843333}
-\pretty{8.82}
-\pretty{8.5}
-\pretty{9.}
-\pretty{-0.559}
-\pretty{-0.554}
-
-\section{testing scimathlessthan}
-\def\testsci#1#2{%
-	\sciparsesign{#1}\S\M\E
-	\sciparsesign{#2}\SS\MM\EE
-	\message{checking #1 <= #2;  [\S] \M * 10^\E <= [\SS] \MM * 10^\EE}%
-	\scimathlessthan\S\M\E\and\SS\MM\EE
-	\ifscimathlessthan
-		\def\result{<}%
-	\else
-		\def\result{\ge}%
-	\fi
-	\[ \text{scimathlessthan: } \bigl( [\S]\, \M \cdot 10^{\E} \bigr)\; = #1 \result #2\; \bigl( = [\SS]\, \MM \cdot 10^{\EE} \big). \]
-}%
-
-\testsci{4}{5}
-\testsci{0}{2}
-\testsci{91751123}{241924}
-\testsci{-1}{-1}
-\testsci{-1231}{0}
-\testsci{10}{-5}
-\testsci{0}{0}
-\testsci{-0}{-0}
-\testsci{0}{14}
-\testsci{114812}{-123124123}
-\testsci{114812}{1241231451}
-\testsci{-141285}{29}
-\testsci{-141285}{0}
-\testsci{-141285}{-50}
-\testsci{-141285}{-12498149012}
-
-\section{Sci to fixed test}
-\def\testscitofixed#1{%
-	\sciparsesign{#1}\S\M\E
-%\tracingmacros=2\tracingcommands=2
-	\message{converting #1 = [\S] \M * 10^\E\  to fixed point}%
-	\scitofixed\S\M\E\result
-	\message{-> \result}%
-%\tracingmacros=0\tracingcommands=0
-	\[ \bigl( [\S]\, \M \cdot 10^{\E} \bigr)\; = #1 \mapsto \result \]
-}%
-\testscitofixed{0}
-\testscitofixed{5}
-\testscitofixed{5.520241}
-\testscitofixed{124.10241}
-\testscitofixed{-121.248}
-\testscitofixed{-12e-5}
-\testscitofixed{412e3}
-\testscitofixed{0.0001}
-\testscitofixed{0.0}
-\testscitofixed{-0.012125}
-\testscitofixed{1.2e-1}
-\testscitofixed{1.2e-2}
-\testscitofixed{1.2e4}
-\testscitofixed{1.2345e4}
-\testscitofixed{1.234567e4}
-\testscitofixed{1.51234e0}
-\testscitofixed{15}
-\testscitofixed{-20}
-
-\section{Testing scimathmax and scimathmin}
-\def\testscimathminmax#1#2{%
-	\sciparsesign{#1}\S\M\E
-	\sciparsesign{#2}\SS\MM\EE
-%\tracingmacros=2\tracingcommands=2
-	\message{computing min/max #1 and #2}%
-	\scimathmin\S\M\E\and\SS\MM\EE\to\SSS\MMM\EEE
-	\scitofixed\SSS\MMM\EEE\result
-	\[ \min\{#1,#2\} = \min\{ [\S]\, \M \cdot 10^{\E}, [\SS]\, \MM\cdot 10^{\EE}\} \; = [\SSS]\; \MMM\cdot10^{\EEE} = \result \]
-	%
-	\scimathmax\S\M\E\and\SS\MM\EE\to\SSS\MMM\EEE
-	\scitofixed\SSS\MMM\EEE\result
-	\[ \max\{#1,#2\} = \max\{ [\S]\, \M \cdot 10^{\E}, [\SS]\, \MM\cdot 10^{\EE}\} \; = [\SSS]\; \MMM\cdot10^{\EEE} = \result \]
-}%
-\testscimathminmax{42}{56}
-\testscimathminmax{-4122}{1256}
-\testscimathminmax{1e12}{5.235412e24}
-\testscimathminmax{-12}{-145}
-
-\section{Testing scimathshift}
-\def\testscimathshift#1#2{%
-	\sciparsesign{#1}\S\M\E
-	\message{computing mathshift #1 by #2}%
-	\let\SS=\S\let\MM=\M\let\EE=\E
-	\scimathshift\S\M\E{#2}%
-	\scitofixed\S\M\E\result
-	\[ #1 \cdot 10^{#2} = [\SS]\, \MM \cdot 10^{\EE}  \cdot 10^{#2} = [\S]\, \M \cdot 10^{\E} = \result \]
-}%
-\testscimathshift{4}{1}
-\testscimathshift{4}{2}
-\testscimathshift{4}{-1}
-\testscimathshift{4}{-2}
-\testscimathshift{0}{-2}
-\testscimathshift{1.1415130}{-2}
-\testscimathshift{1.1415130}{5}
-
-\section{Testing name floating point data structure}
-\let\SS=\empty
-\let\MM=\empty
-\let\EE=\empty
-\def\testsciDS#1#2{%
-	\sciparsesign{#1}\S\M\E
-	\message{assigning #1=(\S,\M,\E) to single-name-macro ... }%
-	\scisetcomponents{#2}\S\M\E
-	\scigetcomponents{#2}\SS\MM\EE
-	\message{result: (\SS,\MM,\EE)}%
-	\edef\expandedtest{{\noexpand #2}{\S}{\M}{\E}}%
-	\message{now with raw-numbers to single-name-macro ... }%
-	\expandafter\scisetcomponents\expandedtest
-	\scigetcomponents{#2}\SSS\MMM\EEE
-	\message{result: (\SSS,\MMM,\EEE)}%
-	\scitofixed\SS\MM\EE\result
-	\scitofixed\SSS\MMM\EEE\resultX
-	\[ #1 = [\S]\, \M \cdot 10^{\E}\text{ re-extracted }\to[\SS]\, \MM \cdot 10^{\EE} = \result\; [ \text{again: }\resultX ] \]
-}%
-\testsciDS{141.241}\test
-\testsciDS{141.241}{test}
-\testsciDS{141.241}{341}
-\def\test{eins zwei drei}
-\testsciDS{141.241}\test
-
-
-\scitofixed{1}{1.0}{2}\result\result
-
-\section{Testing fixedpointround}
-\def\testfpround#1#2{%
-\tracingmacros=2\tracingcommands=2
-	\message{computing fixedpointround(#1):}%
-	\fixedpointround#1\prec#2\to\result
-	\message{fixedpointround(#1) -> \result}%
-	\[ \text{rnd }#1 \text{ to }#2 \to \result \]
-\tracingmacros=0\tracingcommands=0
-}%
-\testfpround{1.0000}{2}
-\testfpround{-1.0000}{2}
-\testfpround{+1.0000}{2}
-\testfpround{1.003}{2}
-\testfpround{-1.003}{2}
-\testfpround{1.123}{2}
-\testfpround{1.12300012}{5}
-\testfpround{9}{2}
-\testfpround{1341}{2}
-\testfpround{0.996}{2}
-\testfpround{19999.9996}{2}
-\testfpround{-19999.9996}{2}
-\testfpround{+19999.9996}{2}
-\testfpround{9999.9996}{2}
-\testfpround{0.0004982}{3}
-\testfpround{0.0004982}{4}
-\testfpround{0.0004982}{5}
-\testfpround{0.0004982}{6}
-\testfpround{0.0004982}{7}
-\testfpround{0.0004982}{8}
-\testfpround{0.0004982}{9}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots-macros.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots-macros.tex
new file mode 100644
index 00000000000..5c0e4fa1215
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots-macros.tex
@@ -0,0 +1,251 @@
+
+\input pgfmanual-en-macros.tex
+
+\def\pgfmanualbar{\char`\|}
+\makeatletter
+\newenvironment{addplotoperation}[3][]{
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{\textcolor{gray}{{\ttfamily\char`\\addplot\ }}%
+      \declare{\texttt{#2}} \texttt{#3;}}%
+	  \unskip
+	 \nobreak
+    \pgfmanualentryheadline{\textcolor{gray}{{\ttfamily\char`\\addplot[\meta{style options}] {\small plot[\meta{behavior options}]}}\ }%
+      \declare{\texttt{#2}} \texttt{#3}\ \textcolor{gray}{\meta{trailing path commands}\texttt{;}}}%
+    \def\pgfmanualtest{#1}%
+    \ifx\pgfmanualtest\@empty%
+      \index{#2@\protect\texttt{#2} path operation}%
+      \index{Path operations!#2@\protect\texttt{#2}}%
+    \fi%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{codekey}[1]{%
+  \begin{pgfmanualentry}
+ 	\pgfmanualentryheadline{{\ttfamily\declare{#1}\textcolor{gray}{/.code}=\marg{...}}\hfill}%
+	\def\mykey{#1}%
+	\def\mypath{}%
+	\def\myname{}%
+	\firsttimetrue%
+	\decompose#1/\nil%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{pgfplotscodekey}[1]{%
+	\begin{codekey}{/pgfplots/#1}%
+}
+{
+  \end{codekey}
+}
+\newenvironment{pgfplotscodetwokey}[1]{%
+  \begin{pgfmanualentry}
+ 	\pgfmanualentryheadline{{\ttfamily\declare{/pgfplots/#1}\textcolor{gray}{/.code 2 args}=\marg{...}}\hfill}%
+	\def\mykey{/pgfplots/#1}%
+	\def\mypath{}%
+	\def\myname{}%
+	\firsttimetrue%
+	\decompose/pgfplots/#1/\nil%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\newenvironment{pgfplotskey}[1]{%
+  \begin{key}{/pgfplots/#1}%
+}
+{
+  \end{key}
+}
+
+\def\choicesep{$\vert$}%
+\def\choicearg#1{\texttt{#1}}
+
+\newif\iffirstchoice
+\newcommand\mchoice[1]{%
+	\begingroup
+	\firstchoicetrue
+	\foreach \mchoice@ in {#1} {%
+		\iffirstchoice
+			\global\firstchoicefalse
+		\else
+			\choicesep
+		\fi
+		\choicearg{\mchoice@}%
+	}%
+	\endgroup
+}%
+
+% \begin{xykey}{/path/\x label=value}
+% \end{xykey}
+%
+% has same features with 'default', 'initially' etc as key environment
+\newenvironment{xykey}[2][]{%
+	\begin{pgfmanualentry}
+    \def\extrakeytext{}
+	\insertpathifneeded{#2}{#1}%
+	\expandafter\pgfutil@in@\expandafter=\expandafter{\mykey}%
+	\ifpgfutil@in@%
+		\expandafter\xykey@eq\mykey\@nil
+	\else
+		\expandafter\xykey@noeq\mykey\@nil
+	\fi
+	\pgfmanualbody
+}{%
+	\end{pgfmanualentry}
+}%
+
+% \insertpathifneeded{a key}{/pgfplots} -> assign mykey={/pgfplots/a key}
+% \insertpathifneeded{/tikz/a key}{/pgfplots} -> assign mykey={/tikz/a key}
+%
+% #1: the key
+% #2: a default path (or empty)
+\def\insertpathifneeded#1#2{%
+	\def\insertpathifneeded@@{#2}%
+	\ifx\insertpathifneeded@@\empty
+		\def\mykey{#1}%
+	\else
+		\insertpathifneeded@#2\@nil
+		\ifpgfutil@in@
+			\def\mykey{#2/#1}%
+		\else
+			\def\mykey{#1}%
+		\fi
+	\fi
+}%
+\def\insertpathifneeded@#1#2\@nil{%
+	\def\insertpathifneeded@@{#1}%
+	\def\insertpathifneeded@@@{/}%
+	\ifx\insertpathifneeded@@\insertpathifneeded@@@
+		\pgfutil@in@true
+	\else
+		\pgfutil@in@false
+	\fi
+}%
+
+% \begin{keylist}[default path]
+% 	{/path/option 1=value,/path/option 2=value2}
+% \end{keylist}
+\newenvironment{keylist}[2][]{%
+	\begin{pgfmanualentry}
+    \def\extrakeytext{}%
+	\foreach \xx in {#2} {%
+		\expandafter\insertpathifneeded\expandafter{\xx}{#1}%
+		\expandafter\extractkey\mykey\@nil%
+	}%
+	\pgfmanualbody
+}{%
+  \end{pgfmanualentry}
+}%
+
+\newenvironment{pgfplotskeylist}[1]{%
+	\begin{keylist}[/pgfplots]{#1}%
+}{%
+	\end{keylist}%
+}
+
+% \begin{xykeylist}[default path]
+% 	{/path/option \x1=value,/path/option \x2=value2,/path/option \x3=value}
+% \end{xykeylist}
+\newenvironment{xykeylist}[2][]{%
+	\begin{pgfmanualentry}
+    \def\extrakeytext{}
+	\foreach \xx in {#2} {%
+		\expandafter\insertpathifneeded\expandafter{\xx}{#1}%
+		\expandafter\pgfutil@in@\expandafter=\expandafter{\mykey}%
+		\ifpgfutil@in@%
+			\expandafter\xykey@eq\mykey\@nil
+		\else
+			\expandafter\xykey@noeq\mykey\@nil
+		\fi
+	}%
+	\pgfmanualbody
+}{%
+  \end{pgfmanualentry}
+}%
+
+\newif\ifxykeyfound
+
+\def\xykey@eq#1=#2\@nil{%
+	\def\x{x}%
+	\xdef\mykey{#1}%
+	\def\xykey@@{#1}%
+	\ifx\xykey@@\mykey
+		\xykeyfoundfalse
+	\else
+		\xykeyfoundtrue
+	\fi
+    \expandafter\extractkey\mykey=#2\@nil%
+	\ifxykeyfound
+		\def\x{y}%
+		\xdef\mykey{#1}%
+		\expandafter\extractkey\mykey=#2\@nil%
+	\fi
+}
+\def\xykey@noeq#1\@nil{%
+	\def\x{x}%
+	\xdef\mykey{#1}%
+	\def\xykey@@{#1}%
+	\ifx\xykey@@\mykey
+		\xykeyfoundfalse
+	\else
+		\xykeyfoundtrue
+	\fi
+    \expandafter\extractkey\mykey\@nil%
+	\ifxykeyfound
+		\def\x{y}%
+		\xdef\mykey{#1}%
+		\expandafter\extractkey\mykey\@nil%
+	\fi
+}
+
+% \begin{pgfplotsxykey}{\x label=value}
+% \end{pgfplotsxykey}
+%
+% It introduces the path /pgfplots/ automatically.
+%
+% has same features with 'default', 'initially' etc as key environment
+\newenvironment{pgfplotsxykey}[1]{%
+	\begin{xykey}[/pgfplots]{#1}%
+}{%
+	\end{xykey}%
+}
+
+
+\newenvironment{pgfplotsxykeylist}[1]{%
+	\begin{xykeylist}[/pgfplots]{#1}%
+}{%
+	\end{xykeylist}%
+}
+
+
+\newenvironment{plottype}[1]{%
+	\begin{key}{/tikz/#1}%
+	\end{key}
+  \begin{pgfmanualentry}
+    \pgfmanualentryheadline{\textcolor{gray}{{\ttfamily\char`\\addplot+[\declare{#1}]}}}%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+
+\def\index@prologue{\section*{Index}\addcontentsline{toc}{section}{Index}
+}
+
+\newenvironment{pgfplotstablecolumnkey}{%
+  \begin{pgfmanualentry}
+ 	\pgfmanualentryheadline{{\ttfamily\textcolor{gray}{/pgfplots/table/}\declare{columns/\meta{column name}}\textcolor{gray}{/.style}=\marg{key-value-list}}\hfill}%
+    \pgfmanualbody
+}
+{
+  \end{pgfmanualentry}
+}
+\makeatother
+
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.bib b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.bib
index 4eb003d9fe0..43aa22c2596 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.bib
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.bib
@@ -2,8 +2,8 @@
 @misc{tikz,
 	author	=	{Till Tantau},
 	title	=	{{\Tikz\ and \PGF\ manual}},
-	howpublished	=	{\url{http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=pgf}},
-	note	=	{v. $\ge$ 1.18}
+	howpublished	=	{\url{http://sourceforge.net/projects/pgf}},
+	note	=	{$v.\ge 2.00$}
 }
 
 
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.examples.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.examples.tex
deleted file mode 100644
index fb3e8706368..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.examples.tex
+++ /dev/null
@@ -1,899 +0,0 @@
-% main=manual.tex
-
-
-\section{More examples}
-This section contains a catalogue of different \PGFPlots\ features by example.
-\label{sec:examples}%
-\begingroup
-\subsection{Legend position and appearance}
-\subsubsection{Legend in the lower left corner}
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=
-	[at={(0.03,0.03)},anchor=south west]%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	....
-
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-\def\plots{%
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,	7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-}%
-{%
-\tikzstyle{every axis legend}+=
-	[at={(0.03,0.03)},anchor=south west]%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}
-
-\subsubsection{Horizontal Legends}
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=
-	[at={(0.5,0.98)},anchor=north]%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=2,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	....
-
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-{%
-\tikzstyle{every axis legend}+=
-	[at={(0.5,0.98)},anchor=north]%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=2,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}
-
-\subsubsection{Horizontal Legends (2)}
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=
-	[at={(0.5,-0.2)},anchor=north]%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=-1,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	....
-
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-{%
-\tikzstyle{every axis legend}+=
-	[at={(0.5,-0.2)},anchor=north]%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=-1,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}
-
-\subsubsection{Modifying legend spacing}
-\label{sec:legendexamples:cols}%
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=
-	[at={(0.5,1.02)},anchor=south,inner sep=0pt]%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=-1,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	....
-
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-{%
-\tikzstyle{every axis legend}+=
-	[at={(0.5,0.98)},anchor=north,inner sep=0pt]%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend columns=-1,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}
-
-\subsubsection{Modifying legend's small plots}
-\label{sec:legendexamples:plotpos}%
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend plot pos=right,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	....
-
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-{%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		legend plot pos=right,
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}
-
-\subsection{Font size and line width}
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=%
-	[at={(0.03,0.03)},anchor=south west]%
-\tikzstyle{every tick}+=[line width=0.6pt]%
-\begin{tikzpicture}[font=\large,line width=1pt]
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\addplot ....
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-
-{%
-\tikzstyle{every axis legend}+=
-	[at={(0.03,0.03)},anchor=south west]%
-\tikzstyle{every tick}+=[line width=0.6pt]
-\begin{center}
-\begin{tikzpicture}[font=\large,line width=1pt]
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}%
-
-\subsection{Changing line specifications}
-\subsubsection{Using another, predefined list}
-{%
-\begin{lstlisting}
-\listcopy\blackwhiteplotspeclist\to\autoplotspeclist%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-
-\listcopy\blackwhiteplotspeclist\to\autoplotspeclist%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-
-\subsubsection{Defining new lists}
-\begin{lstlisting}
-% will cycle through these three elements:
-\listnew{\autoplotspeclist}{%
-	red,dotted,mark=-,mark options={solid}\\%
-	black,dashed,mark=pentagon,mark options={solid}\\%
-	mark options={fill=blue!40},mark=diamond*,blue\\%
-}%
-\tikzstyle{every axis legend}+=%
-	[at={(1.03,1)},anchor=north west]%
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-
-\listnew{\autoplotspeclist}{%
-	red,dotted,mark=-,mark options={solid}\\%
-	black,dashed,mark=pentagon,mark options={solid}\\%
-	mark options={fill=blue!40},mark=diamond*,blue\\%
-}%
-\tikzstyle{every axis legend}+=%
-	[at={(1.03,1)},anchor=north west]%
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-}%
-
-\subsection{Changing the ticks}
-\subsubsection{Placing ticks at $10^i$}
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xtickten={0,2,3,4,6,...,10},% place tickmarks at 10^0, 10^2,...
-		ytickten={-6,-4,...,2},
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	....
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xtickten={0,2,3,4,6,...,10},
-		ytickten={-6,-4,...,2},
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-
-\subsubsection{Placing ticks anywhere}
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xtick={12,9897,1468864}
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	....
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xtick={12,9897,1468864},%2.5,9.2,14.2},
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-
-\subsection{Annotating plots}
-\label{sec:annot:plot}%
-\subsubsection{Example: Placing Data Cursors}
-\begin{lstlisting}
-\tikzstyle{every pin}=[fill=white,draw=black,font=\footnotesize]
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-
-	....
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-	...
-
-	\axispath\node[coordinate,pin=above:Bad!] 
-		at (axis cs:5503,2.027e-03) {};
-	\axispath\node[coordinate,pin=above right:Good!] 
-		at (axis cs:187903,9.063e-05)	{};
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-\begin{center}
-{
-\tikzstyle{every pin}=[fill=white,draw=black,font=\footnotesize]
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error}
-	]
-	\plots
-
-	\axispath\node[coordinate,pin=above:Bad!] 
-		at (axis cs:5503,2.027e-03) {};
-	\axispath\node[coordinate,pin=above right:Good!] 
-		at (axis cs:187903,9.063e-05)	{};
-	\end{loglogaxis}
-\end{tikzpicture}
-}
-\end{center}
-
-One remark: the \lstinline!\axispath! prefix is necessary because neither axis nor plots will be drawn until the $x$- and $y$-limits have been determined. All drawing commands are postponed until \lstinline!\end{axis}! (unless you explicitly provide the options \lstinline!xmin!, \lstinline!xmax!, \lstinline!ymin! and \lstinline!ymax!).
-
-\subsubsection{Example: Slopes of line segments}
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel=\textsc{Dof},
-		ylabel=$L_2$ Error
-	]
-	\axispath\draw 
-			(axis cs:1793,4.442e-05)
-		|-	(axis cs:4097,1.207e-05)
-		node[near start,left] {$\frac{dy}{dx} = -1.58$};
-
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel=\textsc{Dof},
-		ylabel=$L_2$ Error
-	]
-	\axispath\draw 
-			(axis cs:1793,4.442e-05)
-		|-	(axis cs:4097,1.207e-05)
-		node[near start,left] {$\frac{dy}{dx} = -1.58$};
-	\plots
-	
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-
-\subsection{Vertical alignment with the \texttt{baseline} option}
-\label{sec:align}%
-The default axis anchor is \texttt{south west}, which means that the picture coordinate $(0,0)$ is the lower left corner of the axis. As a consequence, the \Tikz\ option ``\texttt{baseline}'' allows vertical alignment of adjacent plots, see figure~\ref{fig:baseline:example} for an example.
-\begin{figure}
-	\centering
-		\noindent
-		\lstinline!\begin{tikzpicture}...\end{tikzpicture}!:\par
-		\noindent
-		\begin{tikzpicture}%
-		\begin{axis}[width=0.4\linewidth,xlabel=A normal sized $x$ label]
-		\addplot[smooth,blue,mark=*] plot coordinates {
-			(-1,	1)
-			(-0.75,	0.5625)
-			(-0.5,	0.25)
-			(-0.25,	0.0625)
-			(0,		0)
-			(0.25,	0.0625)
-			(0.5,	0.25)
-			(0.75,	0.5625)
-			(1,		1)
-		};
-		\end{axis}
-		\end{tikzpicture}%
-		\hspace{0.15cm}
-		\begin{tikzpicture}%
-		\begin{axis}[width=0.4\linewidth,xlabel={xlabel: $\displaystyle \sum_{i=0}^N n_i $ }]
-		\addplot[smooth,blue,mark=*] plot coordinates {
-			(-1,	1)
-			(-0.75,	0.5625)
-			(-0.5,	0.25)
-			(-0.25,	0.0625)
-			(0,		0)
-			(0.25,	0.0625)
-			(0.5,	0.25)
-			(0.75,	0.5625)
-			(1,		1)
-		};
-		\end{axis}
-		\end{tikzpicture}
-		\hfill
-		\vskip 0.3cm%
-		\noindent
-		\lstinline!\begin{tikzpicture}[baseline]...\end{tikzpicture}!:\par
-		\noindent
-		\begin{tikzpicture}[baseline]%
-		\begin{axis}[width=0.4\linewidth,xlabel=A normal sized $x$ label]
-		\addplot[smooth,blue,mark=*] plot coordinates {
-			(-1,	1)
-			(-0.75,	0.5625)
-			(-0.5,	0.25)
-			(-0.25,	0.0625)
-			(0,		0)
-			(0.25,	0.0625)
-			(0.5,	0.25)
-			(0.75,	0.5625)
-			(1,		1)
-		};
-		\end{axis}
-		\end{tikzpicture}%
-		\hspace{0.15cm}
-		\begin{tikzpicture}[baseline]%
-		\begin{axis}[width=0.4\linewidth,xlabel={xlabel: $\displaystyle \sum_{i=0}^N n_i $ }]
-		\addplot[smooth,blue,mark=*] plot coordinates {
-			(-1,	1)
-			(-0.75,	0.5625)
-			(-0.5,	0.25)
-			(-0.25,	0.0625)
-			(0,		0)
-			(0.25,	0.0625)
-			(0.5,	0.25)
-			(0.75,	0.5625)
-			(1,		1)
-		};
-		\end{axis}
-		\end{tikzpicture}
-		\hfill
-
-	\caption{An example of the \Tikz-``\texttt{baseline}'' option for vertical alignment. Top row: without ``\texttt{baseline}'', bottom row: with ``\texttt{baseline}''.}
-	\label{fig:baseline:example}
-\end{figure}
-
-\subsection{Horizontal Alignment}
-{%
-\label{sec:halign}%
-The last subsection used the \texttt{baseline}-option to allow \emph{vertical} alignment of plots. You can also apply \emph{horizontal} alignment, if you place multiple \texttt{axes} into a single \texttt{tikzpicture} and use the `\texttt{anchor}'-option:
-\def\plots{
-\addplot[red,only marks,mark options={fill=red,scale=0.8},mark=*] plot coordinates {
-	(0.190600,	0.860900)
-	(0.194400,	0.908000)
-	(0.179900,	0.140700)
-	(0.212400,	0.294200)
-	(0.218900,	0.779100)
-	(0.201700,	0.388400)
-	(0.209100,	0.679900)
-	(0.196200,	0.470800)
-	(0.199900,	0.812700)
-	(0.199300,	0.850500)
-	(0.204300,	0.980300)
-	(0.209500,	0.953000)
-	(0.176200,	0.145300)
-	(0.207400,	0.351900)
-	(0.199000,	0.304500)
-	(0.202200,	0.256300)
-	(0.197000,	0.744300)
-	(0.181100,	0.998900)
-	(0.193400,	0.554900)
-	(0.218300,	0.506500)
-	(0.193800,	0.201000)
-	(0.208100,	0.531900)
-	(0.204100,	0.635500)
-	(0.217000,	0.069800)
-	(0.196100,	0.710300)
-	(0.198900,	0.440900)
-	(0.213000,	0.591900)
-	(0.206000,	0.030700)
-	(0.186000,	0.395900)
-	(0.206500,	0.082500)
-	(0.195500,	0.672000)
-	(0.221400,	-0.013500)
-	(0.202300,	0.222300)
-	(0.193300,	0.959700)
-};
-\addplot[black,only marks,mark options={fill=black,scale=0.8},mark=square*] plot coordinates {
-	(0.005300,	0.369500)
-	(-0.016100,	0.610000)
-	(-0.007400,	0.252100)
-	(0.002900,	0.699600)
-	(0.010900,	0.232000)
-	(-0.014100,	0.152400)
-	(-0.008000,	-0.003100)
-	(-0.009100,	0.639900)
-	(-0.008700,	0.125800)
-	(-0.003700,	0.897400)
-	(0.009600,	0.432200)
-	(-0.009100,	0.770800)
-	(-0.030300,	0.974200)
-	(-0.004000,	0.675900)
-	(-0.002100,	0.089500)
-	(0.003300,	0.319700)
-	(0.006100,	0.863300)
-	(0.000600,	0.263700)
-	(-0.008900,	0.471500)
-	(0.016000,	0.505700)
-	(0.000000,	0.602600)
-	(-0.012300,	0.404400)
-	(-0.007000,	0.911900)
-	(0.006700,	0.747200)
-	(0.009000,	0.825300)
-	(-0.001500,	0.534400)
-	(-0.020600,	0.336300)
-	(0.012600,	0.039800)
-	(0.011600,	0.944100)
-	(-0.003600,	0.068000)
-	(-0.022400,	0.575400)
-	(-0.002900,	0.184500)
-};
-\addplot[blue] plot coordinates {
-	(0.093947,	-0.011481)
-	(0.101957,	0.494273)
-	(0.109967,	1.000027)
-};
-}%
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{axis}[width=4cm,scale only axis]
-	\addplot[red,only marks,mark options={fill=red,scale=0.8},mark=*] plot coordinates {
-		(0.190600,	0.860900)
-		(0.194400,	0.908000)
-		(0.179900,	0.140700)
-		(0.212400,	0.294200)
-		....
-		(0.202300,	0.222300)
-		(0.193300,	0.959700)
-	};
-	\addplot[black,only marks,mark options={fill=black,scale=0.8},mark=square*] plot coordinates {
-		(0.005300,	0.369500)
-		(-0.016100,	0.610000)
-		(-0.007400,	0.252100)
-		(0.002900,	0.699600)
-		(0.010900,	0.232000)
-		....
-		(-0.003600,	0.068000)
-		(-0.022400,	0.575400)
-		(-0.002900,	0.184500)
-	};
-	\addplot[blue] plot coordinates {
-		(0.093947,	-0.011481)
-		(0.101957,	0.494273)
-		(0.109967,	1.000027)
-	};
-	\end{axis}
-
-	\draw[thick,gray,->] 
-		(0,0) -- (0cm,-0.6cm) 
-		node[black,midway,left] {0.6cm$\to$};
-
-	\begin{scope}[yshift=-0.6cm]
-	\begin{axis}[%
-		anchor=north west,
-		width=4cm,scale only axis,
-		height=0.8cm,
-		ytick=\empty
-	]
-
-	\addplot[red,only marks,mark options={fill=red,scale=0.8},mark=*] plot coordinates {
-		(0.968555,	0)
-		(0.030884,	0)
-		...
-		(0.468750,	0)
-		(0,	0)
-	};
-	\addplot[black,only marks,mark options={fill=black,scale=0.8},mark=square*] plot coordinates {
-		(0.367188,	0)
-		(0.312500,	0)
-		...
-		(0.125000,	0)
-		(0.156250,	0)
-	};
-	\end{axis}
-	\end{scope}
-\end{tikzpicture}
-\end{lstlisting}
-The result of this alignment is shown in figure~\ref{fig:halign}.
-
-\begin{figure}
-{\centering
-\begin{minipage}[t]{4.4cm}%
-\vspace{0pt}%
-\centering
-\begin{tikzpicture}
-	\begin{axis}[width=4cm,scale only axis]
-	\plots
-	\end{axis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{axis}[%
-		width=4cm,scale only axis,
-		height=0.8cm,
-		ytick=\empty
-	]
-
-	\addplot[red,only marks,mark options={fill=red,scale=0.8},mark=*] plot coordinates {
-		(0.968555,	0)
-		(0.030884,	0)
-		(0.750000,	0)
-		(0.468750,	0)
-		(1.000000,	0)
-		(0.030176,	0)
-		(0.750000,	0)
-		(0.468750,	0)
-		(0,	0)
-	};
-	\addplot[black,only marks,mark options={fill=black,scale=0.8},mark=square*] plot coordinates {
-		(0.367188,	0)
-		(0.312500,	0)
-		(0.136719,	0)
-		(0.828125,	0)
-		(0.656250,	0)
-		(0.343750,	0)
-		(0.125000,	0)
-		(0.156250,	0)
-	};
-	\end{axis}
-\end{tikzpicture}
-\end{minipage}
-\hspace{1cm}
-\begin{minipage}[t]{4.4cm}%
-\vspace{0pt}%
-\centering
-\begin{tikzpicture}
-	\begin{axis}[width=4cm,scale only axis]
-	\plots
-	\end{axis}
-
-	\draw[thick,gray,->] 
-		(0,0) -- (0cm,-0.6cm) 
-		node[black,midway,left] {0.6cm$\to$};
-
-	\begin{scope}[yshift=-0.6cm]
-	\begin{axis}[%
-		anchor=north west,
-		width=4cm,scale only axis,
-		height=0.8cm,
-		ytick=\empty
-	]
-
-	\addplot[red,only marks,mark options={fill=red,scale=0.8},mark=*] plot coordinates {
-		(0.968555,	0)
-		(0.030884,	0)
-		(0.750000,	0)
-		(0.468750,	0)
-		(1.000000,	0)
-		(0.030176,	0)
-		(0.750000,	0)
-		(0.468750,	0)
-		(0,	0)
-	};
-	\addplot[black,only marks,mark options={fill=black,scale=0.8},mark=square*] plot coordinates {
-		(0.367188,	0)
-		(0.312500,	0)
-		(0.136719,	0)
-		(0.828125,	0)
-		(0.656250,	0)
-		(0.343750,	0)
-		(0.125000,	0)
-		(0.156250,	0)
-	};
-	\end{axis}
-	\end{scope}
-\end{tikzpicture}
-\end{minipage}
-
-}
-	\caption{Demonstration of horizontal alignment with the `\texttt{anchor}' option. Left: two \texttt{tikzpicture}s placed above each other; right: one \texttt{tikzpicture} with horizontal alignment using the `\texttt{anchor}'-option. The source code is in the text.}
-	\label{fig:halign}
-\end{figure}
-}
-
-\subsection{Gridlines}
-\label{sec:gridlines}%
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error},
-		grid=major
-	]
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-	
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error},
-		grid=both
-	]
-	...
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-\begin{center}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error},
-		grid=major
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\hfill
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={\textsc{Dof}},
-		ylabel={$L_2$ Error},
-		grid=both
-	]
-	\plots
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{center}
-
-\endgroup
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.idx b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.idx
new file mode 100644
index 00000000000..d023926e878
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.idx
@@ -0,0 +1,457 @@
+\indexentry{axis@\texttt {axis} environment|hyperpage}{11}
+\indexentry{Environments!axis@\texttt {axis}|hyperpage}{11}
+\indexentry{semilogxaxis@\texttt {semilogxaxis} environment|hyperpage}{11}
+\indexentry{Environments!semilogxaxis@\texttt {semilogxaxis}|hyperpage}{11}
+\indexentry{semilogyaxis@\texttt {semilogyaxis} environment|hyperpage}{11}
+\indexentry{Environments!semilogyaxis@\texttt {semilogyaxis}|hyperpage}{11}
+\indexentry{loglogaxis@\texttt {loglogaxis} environment|hyperpage}{11}
+\indexentry{Environments!loglogaxis@\texttt {loglogaxis}|hyperpage}{11}
+\indexentry{addplot@\myprintocmmand {addplot}|hyperpage}{12}
+\indexentry{domain@\texttt {domain} key|hyperpage}{16}
+\indexentry{tikz@\texttt {/tikz/}!domain@\texttt {domain}|hyperpage}{16}
+\indexentry{id@\texttt {id} key|hyperpage}{16}
+\indexentry{tikz@\texttt {/tikz/}!id@\texttt {id}|hyperpage}{16}
+\indexentry{prefix@\texttt {prefix} key|hyperpage}{16}
+\indexentry{tikz@\texttt {/tikz/}!prefix@\texttt {prefix}|hyperpage}{16}
+\indexentry{samples@\texttt {samples} key|hyperpage}{16}
+\indexentry{tikz@\texttt {/tikz/}!samples@\texttt {samples}|hyperpage}{16}
+\indexentry{raw gnuplot@\texttt {raw gnuplot} key|hyperpage}{16}
+\indexentry{tikz@\texttt {/tikz/}!raw gnuplot@\texttt {raw gnuplot}|hyperpage}{16}
+\indexentry{addplot@\myprintocmmand {addplot}|hyperpage}{17}
+\indexentry{axis cs@\texttt {axis cs} coordinate system|hyperpage}{18}
+\indexentry{Coordinate systems!axis cs@\texttt {axis cs}|hyperpage}{18}
+\indexentry{current plot begin@\texttt {current plot begin} node|hyperpage}{19}
+\indexentry{Predefined node!current plot begin@\texttt {current plot begin}|hyperpage}{19}
+\indexentry{current plot end@\texttt {current plot end} node|hyperpage}{19}
+\indexentry{Predefined node!current plot end@\texttt {current plot end}|hyperpage}{19}
+\indexentry{addlegendentry@\myprintocmmand {addlegendentry}|hyperpage}{19}
+\indexentry{legend@\myprintocmmand {legend}|hyperpage}{20}
+\indexentry{every axis legend@\texttt {every axis legend} key|hyperpage}{20}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis legend@\texttt {every axis legend}|hyperpage}{20}
+\indexentry{autoplotspeclist@\myprintocmmand {autoplotspeclist}|hyperpage}{21}
+\indexentry{pgfmathlogtologten@\myprintocmmand {pgfmathlogtologten}|hyperpage}{21}
+\indexentry{logten@\myprintocmmand {logten}|hyperpage}{21}
+\indexentry{pgfmathprintnumber@\myprintocmmand {pgfmathprintnumber}|hyperpage}{21}
+\indexentry{closedcycle@\myprintocmmand {closedcycle}|hyperpage}{21}
+\indexentry{plotnum@\myprintocmmand {plotnum}|hyperpage}{22}
+\indexentry{numplots@\myprintocmmand {numplots}|hyperpage}{22}
+\indexentry{coordindex@\myprintocmmand {coordindex}|hyperpage}{22}
+\indexentry{pgfplotstableread@\myprintocmmand {pgfplotstableread}|hyperpage}{23}
+\indexentry{pgfplotstabletypeset@\myprintocmmand {pgfplotstabletypeset}|hyperpage}{23}
+\indexentry{pgfplotstabletypesetfile@\myprintocmmand {pgfplotstabletypesetfile}|hyperpage}{23}
+\indexentry{sharp plot@\texttt {sharp plot} key|hyperpage}{24}
+\indexentry{tikz@\texttt {/tikz/}!sharp plot@\texttt {sharp plot}|hyperpage}{24}
+\indexentry{smooth@\texttt {smooth} key|hyperpage}{24}
+\indexentry{tikz@\texttt {/tikz/}!smooth@\texttt {smooth}|hyperpage}{24}
+\indexentry{const plot@\texttt {const plot} key|hyperpage}{24}
+\indexentry{tikz@\texttt {/tikz/}!const plot@\texttt {const plot}|hyperpage}{24}
+\indexentry{const plot mark left@\texttt {const plot mark left} key|hyperpage}{25}
+\indexentry{tikz@\texttt {/tikz/}!const plot mark left@\texttt {const plot mark left}|hyperpage}{25}
+\indexentry{const plot mark right@\texttt {const plot mark right} key|hyperpage}{25}
+\indexentry{tikz@\texttt {/tikz/}!const plot mark right@\texttt {const plot mark right}|hyperpage}{25}
+\indexentry{jump mark left@\texttt {jump mark left} key|hyperpage}{25}
+\indexentry{tikz@\texttt {/tikz/}!jump mark left@\texttt {jump mark left}|hyperpage}{25}
+\indexentry{jump mark right@\texttt {jump mark right} key|hyperpage}{26}
+\indexentry{tikz@\texttt {/tikz/}!jump mark right@\texttt {jump mark right}|hyperpage}{26}
+\indexentry{xbar@\texttt {xbar} key|hyperpage}{26}
+\indexentry{tikz@\texttt {/tikz/}!xbar@\texttt {xbar}|hyperpage}{26}
+\indexentry{xbar@\texttt {xbar} key|hyperpage}{27}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xbar@\texttt {xbar}|hyperpage}{27}
+\indexentry{ybar@\texttt {ybar} key|hyperpage}{27}
+\indexentry{tikz@\texttt {/tikz/}!ybar@\texttt {ybar}|hyperpage}{27}
+\indexentry{ybar@\texttt {ybar} key|hyperpage}{28}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ybar@\texttt {ybar}|hyperpage}{28}
+\indexentry{bar width@\texttt {bar width} key|hyperpage}{28}
+\indexentry{tikz@\texttt {/tikz/}!bar width@\texttt {bar width}|hyperpage}{28}
+\indexentry{bar shift@\texttt {bar shift} key|hyperpage}{28}
+\indexentry{tikz@\texttt {/tikz/}!bar shift@\texttt {bar shift}|hyperpage}{28}
+\indexentry{ybar interval@\texttt {ybar interval} key|hyperpage}{28}
+\indexentry{tikz@\texttt {/tikz/}!ybar interval@\texttt {ybar interval}|hyperpage}{28}
+\indexentry{ybar interval@\texttt {ybar interval} key|hyperpage}{29}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ybar interval@\texttt {ybar interval}|hyperpage}{29}
+\indexentry{xbar interval@\texttt {xbar interval} key|hyperpage}{29}
+\indexentry{tikz@\texttt {/tikz/}!xbar interval@\texttt {xbar interval}|hyperpage}{29}
+\indexentry{xbar interval@\texttt {xbar interval} key|hyperpage}{30}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xbar interval@\texttt {xbar interval}|hyperpage}{30}
+\indexentry{xticklabel interval boundaries@\texttt {xticklabel interval boundaries} key|hyperpage}{30}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xticklabel interval boundaries@\texttt {xticklabel interval boundaries}|hyperpage}{30}
+\indexentry{yticklabel interval boundaries@\texttt {yticklabel interval boundaries} key|hyperpage}{30}
+\indexentry{pgfplots@\texttt {/pgfplots/}!yticklabel interval boundaries@\texttt {yticklabel interval boundaries}|hyperpage}{30}
+\indexentry{xcomb@\texttt {xcomb} key|hyperpage}{30}
+\indexentry{tikz@\texttt {/tikz/}!xcomb@\texttt {xcomb}|hyperpage}{30}
+\indexentry{ycomb@\texttt {ycomb} key|hyperpage}{30}
+\indexentry{tikz@\texttt {/tikz/}!ycomb@\texttt {ycomb}|hyperpage}{30}
+\indexentry{stack plots@\texttt {stack plots} key|hyperpage}{31}
+\indexentry{pgfplots@\texttt {/pgfplots/}!stack plots@\texttt {stack plots}|hyperpage}{31}
+\indexentry{stack dir@\texttt {stack dir} key|hyperpage}{32}
+\indexentry{pgfplots@\texttt {/pgfplots/}!stack dir@\texttt {stack dir}|hyperpage}{32}
+\indexentry{reverse stacked plots@\texttt {reverse stacked plots} key|hyperpage}{32}
+\indexentry{pgfplots@\texttt {/pgfplots/}!reverse stacked plots@\texttt {reverse stacked plots}|hyperpage}{32}
+\indexentry{xbar stacked@\texttt {xbar stacked} key|hyperpage}{32}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xbar stacked@\texttt {xbar stacked}|hyperpage}{32}
+\indexentry{ybar stacked@\texttt {ybar stacked} key|hyperpage}{33}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ybar stacked@\texttt {ybar stacked}|hyperpage}{33}
+\indexentry{xbar interval stacked@\texttt {xbar interval stacked} key|hyperpage}{33}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xbar interval stacked@\texttt {xbar interval stacked}|hyperpage}{33}
+\indexentry{ybar interval stacked@\texttt {ybar interval stacked} key|hyperpage}{33}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ybar interval stacked@\texttt {ybar interval stacked}|hyperpage}{33}
+\indexentry{solid@\texttt {solid} key|hyperpage}{36}
+\indexentry{tikz@\texttt {/tikz/}!solid@\texttt {solid}|hyperpage}{36}
+\indexentry{dotted@\texttt {dotted} key|hyperpage}{36}
+\indexentry{tikz@\texttt {/tikz/}!dotted@\texttt {dotted}|hyperpage}{36}
+\indexentry{densely dotted@\texttt {densely dotted} key|hyperpage}{36}
+\indexentry{tikz@\texttt {/tikz/}!densely dotted@\texttt {densely dotted}|hyperpage}{36}
+\indexentry{loosely dotted@\texttt {loosely dotted} key|hyperpage}{36}
+\indexentry{tikz@\texttt {/tikz/}!loosely dotted@\texttt {loosely dotted}|hyperpage}{36}
+\indexentry{dashed@\texttt {dashed} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!dashed@\texttt {dashed}|hyperpage}{37}
+\indexentry{densely dashed@\texttt {densely dashed} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!densely dashed@\texttt {densely dashed}|hyperpage}{37}
+\indexentry{loosely dashed@\texttt {loosely dashed} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!loosely dashed@\texttt {loosely dashed}|hyperpage}{37}
+\indexentry{font@\texttt {font} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!font@\texttt {font}|hyperpage}{37}
+\indexentry{line width@\texttt {line width} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!line width@\texttt {line width}|hyperpage}{37}
+\indexentry{ultra thin@\texttt {ultra thin} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!ultra thin@\texttt {ultra thin}|hyperpage}{37}
+\indexentry{very thin@\texttt {very thin} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!very thin@\texttt {very thin}|hyperpage}{37}
+\indexentry{semithick@\texttt {semithick} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!semithick@\texttt {semithick}|hyperpage}{37}
+\indexentry{thick@\texttt {thick} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!thick@\texttt {thick}|hyperpage}{37}
+\indexentry{very thick@\texttt {very thick} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!very thick@\texttt {very thick}|hyperpage}{37}
+\indexentry{ultra thick@\texttt {ultra thick} key|hyperpage}{37}
+\indexentry{tikz@\texttt {/tikz/}!ultra thick@\texttt {ultra thick}|hyperpage}{37}
+\indexentry{cycle list@\texttt {cycle list} key|hyperpage}{38}
+\indexentry{pgfplots@\texttt {/pgfplots/}!cycle list@\texttt {cycle list}|hyperpage}{38}
+\indexentry{cycle list name@\texttt {cycle list name} key|hyperpage}{38}
+\indexentry{pgfplots@\texttt {/pgfplots/}!cycle list name@\texttt {cycle list name}|hyperpage}{38}
+\indexentry{xlabel@\texttt {xlabel} key|hyperpage}{40}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xlabel@\texttt {xlabel}|hyperpage}{40}
+\indexentry{ylabel@\texttt {ylabel} key|hyperpage}{40}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ylabel@\texttt {ylabel}|hyperpage}{40}
+\indexentry{title@\texttt {title} key|hyperpage}{40}
+\indexentry{pgfplots@\texttt {/pgfplots/}!title@\texttt {title}|hyperpage}{40}
+\indexentry{legend columns@\texttt {legend columns} key|hyperpage}{41}
+\indexentry{pgfplots@\texttt {/pgfplots/}!legend columns@\texttt {legend columns}|hyperpage}{41}
+\indexentry{legend plot pos@\texttt {legend plot pos} key|hyperpage}{41}
+\indexentry{pgfplots@\texttt {/pgfplots/}!legend plot pos@\texttt {legend plot pos}|hyperpage}{41}
+\indexentry{legend image code@\texttt {legend image code} key|hyperpage}{41}
+\indexentry{pgfplots@\texttt {/pgfplots/}!legend image code@\texttt {legend image code}|hyperpage}{41}
+\indexentry{axis x line@\texttt {axis x line} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!axis x line@\texttt {axis x line}|hyperpage}{42}
+\indexentry{axis y line@\texttt {axis y line} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!axis y line@\texttt {axis y line}|hyperpage}{42}
+\indexentry{axis x discontinuity@\texttt {axis x discontinuity} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!axis x discontinuity@\texttt {axis x discontinuity}|hyperpage}{42}
+\indexentry{axis y discontinuity@\texttt {axis y discontinuity} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!axis y discontinuity@\texttt {axis y discontinuity}|hyperpage}{42}
+\indexentry{hide axis@\texttt {hide axis} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!hide axis@\texttt {hide axis}|hyperpage}{42}
+\indexentry{width@\texttt {width} key|hyperpage}{42}
+\indexentry{pgfplots@\texttt {/pgfplots/}!width@\texttt {width}|hyperpage}{42}
+\indexentry{height@\texttt {height} key|hyperpage}{43}
+\indexentry{pgfplots@\texttt {/pgfplots/}!height@\texttt {height}|hyperpage}{43}
+\indexentry{scale only axis@\texttt {scale only axis} key|hyperpage}{43}
+\indexentry{pgfplots@\texttt {/pgfplots/}!scale only axis@\texttt {scale only axis}|hyperpage}{43}
+\indexentry{x@\texttt {x} key|hyperpage}{43}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x@\texttt {x}|hyperpage}{43}
+\indexentry{y@\texttt {y} key|hyperpage}{43}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y@\texttt {y}|hyperpage}{43}
+\indexentry{x\ dir@\texttt {x\ dir} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!x\ dir@\texttt {x\ dir}|hyperpage}{45}
+\indexentry{y\ dir@\texttt {y\ dir} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!y\ dir@\texttt {y\ dir}|hyperpage}{45}
+\indexentry{x\ fixed@\texttt {x\ fixed} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!x\ fixed@\texttt {x\ fixed}|hyperpage}{45}
+\indexentry{y\ fixed@\texttt {y\ fixed} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!y\ fixed@\texttt {y\ fixed}|hyperpage}{45}
+\indexentry{x\ fixed relative@\texttt {x\ fixed relative} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!x\ fixed relative@\texttt {x\ fixed relative}|hyperpage}{45}
+\indexentry{y\ fixed relative@\texttt {y\ fixed relative} key|hyperpage}{45}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!y\ fixed relative@\texttt {y\ fixed relative}|hyperpage}{45}
+\indexentry{x\ explicit@\texttt {x\ explicit} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!x\ explicit@\texttt {x\ explicit}|hyperpage}{46}
+\indexentry{y\ explicit@\texttt {y\ explicit} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!y\ explicit@\texttt {y\ explicit}|hyperpage}{46}
+\indexentry{x\ explicit relative@\texttt {x\ explicit relative} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!x\ explicit relative@\texttt {x\ explicit relative}|hyperpage}{46}
+\indexentry{y\ explicit relative@\texttt {y\ explicit relative} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!y\ explicit relative@\texttt {y\ explicit relative}|hyperpage}{46}
+\indexentry{error mark@\texttt {error mark} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!error mark@\texttt {error mark}|hyperpage}{46}
+\indexentry{error mark options@\texttt {error mark options} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!error mark options@\texttt {error mark options}|hyperpage}{46}
+\indexentry{error bar style@\texttt {error bar style} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!error bar style@\texttt {error bar style}|hyperpage}{46}
+\indexentry{draw error bar@\texttt {draw error bar} key|hyperpage}{46}
+\indexentry{pgfplots@\texttt {/pgfplots/}!error bars@\texttt {error bars/}!draw error bar@\texttt {draw error bar}|hyperpage}{46}
+\indexentry{pgfmathprintnumber@\myprintocmmand {pgfmathprintnumber}|hyperpage}{47}
+\indexentry{log identify minor tick positions@\texttt {log identify minor tick positions} key|hyperpage}{47}
+\indexentry{pgfplots@\texttt {/pgfplots/}!log identify minor tick positions@\texttt {log identify minor tick positions}|hyperpage}{47}
+\indexentry{log number format code@\texttt {log number format code} key|hyperpage}{48}
+\indexentry{pgfplots@\texttt {/pgfplots/}!log number format code@\texttt {log number format code}|hyperpage}{48}
+\indexentry{log base 10 number format code@\texttt {log base 10 number format code} key|hyperpage}{48}
+\indexentry{pgfplots@\texttt {/pgfplots/}!log base 10 number format code@\texttt {log base 10 number format code}|hyperpage}{48}
+\indexentry{log plot exponent style@\texttt {log plot exponent style} key|hyperpage}{48}
+\indexentry{pgfplots@\texttt {/pgfplots/}!log plot exponent style@\texttt {log plot exponent style}|hyperpage}{48}
+\indexentry{xmin@\texttt {xmin} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xmin@\texttt {xmin}|hyperpage}{49}
+\indexentry{ymin@\texttt {ymin} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ymin@\texttt {ymin}|hyperpage}{49}
+\indexentry{xmax@\texttt {xmax} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xmax@\texttt {xmax}|hyperpage}{49}
+\indexentry{ymax@\texttt {ymax} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ymax@\texttt {ymax}|hyperpage}{49}
+\indexentry{xmode@\texttt {xmode} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xmode@\texttt {xmode}|hyperpage}{49}
+\indexentry{ymode@\texttt {ymode} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ymode@\texttt {ymode}|hyperpage}{49}
+\indexentry{clip limits@\texttt {clip limits} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!clip limits@\texttt {clip limits}|hyperpage}{49}
+\indexentry{enlargelimits@\texttt {enlargelimits} key|hyperpage}{49}
+\indexentry{pgfplots@\texttt {/pgfplots/}!enlargelimits@\texttt {enlargelimits}|hyperpage}{49}
+\indexentry{xtick@\texttt {xtick} key|hyperpage}{50}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xtick@\texttt {xtick}|hyperpage}{50}
+\indexentry{ytick@\texttt {ytick} key|hyperpage}{50}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ytick@\texttt {ytick}|hyperpage}{50}
+\indexentry{minor tick num@\texttt {minor tick num} key|hyperpage}{51}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor tick num@\texttt {minor tick num}|hyperpage}{51}
+\indexentry{minor x\unhbox \voidb@x \penalty \@M \ {}tick num@\texttt {minor x\unhbox \voidb@x \penalty \@M \ {}tick num} key|hyperpage}{51}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor x\unhbox \voidb@x \penalty \@M \ {}tick num@\texttt {minor x\unhbox \voidb@x \penalty \@M \ {}tick num}|hyperpage}{51}
+\indexentry{minor y\unhbox \voidb@x \penalty \@M \ {}tick num@\texttt {minor y\unhbox \voidb@x \penalty \@M \ {}tick num} key|hyperpage}{52}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor y\unhbox \voidb@x \penalty \@M \ {}tick num@\texttt {minor y\unhbox \voidb@x \penalty \@M \ {}tick num}|hyperpage}{52}
+\indexentry{extra x\ ticks@\texttt {extra x\ ticks} key|hyperpage}{52}
+\indexentry{pgfplots@\texttt {/pgfplots/}!extra x\ ticks@\texttt {extra x\ ticks}|hyperpage}{52}
+\indexentry{extra y\ ticks@\texttt {extra y\ ticks} key|hyperpage}{52}
+\indexentry{pgfplots@\texttt {/pgfplots/}!extra y\ ticks@\texttt {extra y\ ticks}|hyperpage}{52}
+\indexentry{space between ticks@\texttt {space between ticks} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!space between ticks@\texttt {space between ticks}|hyperpage}{53}
+\indexentry{try min ticks@\texttt {try min ticks} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!try min ticks@\texttt {try min ticks}|hyperpage}{53}
+\indexentry{try min ticks log@\texttt {try min ticks log} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!try min ticks log@\texttt {try min ticks log}|hyperpage}{53}
+\indexentry{tickwidth@\texttt {tickwidth} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!tickwidth@\texttt {tickwidth}|hyperpage}{53}
+\indexentry{major tick length@\texttt {major tick length} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major tick length@\texttt {major tick length}|hyperpage}{53}
+\indexentry{subtickwidth@\texttt {subtickwidth} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!subtickwidth@\texttt {subtickwidth}|hyperpage}{53}
+\indexentry{minor tick length@\texttt {minor tick length} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor tick length@\texttt {minor tick length}|hyperpage}{53}
+\indexentry{xtickten@\texttt {xtickten} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xtickten@\texttt {xtickten}|hyperpage}{53}
+\indexentry{ytickten@\texttt {ytickten} key|hyperpage}{53}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ytickten@\texttt {ytickten}|hyperpage}{53}
+\indexentry{xticklabels@\texttt {xticklabels} key|hyperpage}{54}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xticklabels@\texttt {xticklabels}|hyperpage}{54}
+\indexentry{yticklabels@\texttt {yticklabels} key|hyperpage}{54}
+\indexentry{pgfplots@\texttt {/pgfplots/}!yticklabels@\texttt {yticklabels}|hyperpage}{54}
+\indexentry{xticklabel@\texttt {xticklabel} key|hyperpage}{54}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xticklabel@\texttt {xticklabel}|hyperpage}{54}
+\indexentry{yticklabel@\texttt {yticklabel} key|hyperpage}{54}
+\indexentry{pgfplots@\texttt {/pgfplots/}!yticklabel@\texttt {yticklabel}|hyperpage}{54}
+\indexentry{x\ tick label as interval@\texttt {x\ tick label as interval} key|hyperpage}{55}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ tick label as interval@\texttt {x\ tick label as interval}|hyperpage}{55}
+\indexentry{y\ tick label as interval@\texttt {y\ tick label as interval} key|hyperpage}{55}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ tick label as interval@\texttt {y\ tick label as interval}|hyperpage}{55}
+\indexentry{scaled ticks@\texttt {scaled ticks} key|hyperpage}{56}
+\indexentry{pgfplots@\texttt {/pgfplots/}!scaled ticks@\texttt {scaled ticks}|hyperpage}{56}
+\indexentry{tick scale label code@\texttt {tick scale label code} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!tick scale label code@\texttt {tick scale label code}|hyperpage}{57}
+\indexentry{scale ticks below@\texttt {scale ticks below} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!scale ticks below@\texttt {scale ticks below}|hyperpage}{57}
+\indexentry{scale ticks above@\texttt {scale ticks above} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!scale ticks above@\texttt {scale ticks above}|hyperpage}{57}
+\indexentry{tickpos@\texttt {tickpos} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!tickpos@\texttt {tickpos}|hyperpage}{57}
+\indexentry{tick align@\texttt {tick align} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!tick align@\texttt {tick align}|hyperpage}{57}
+\indexentry{xminorticks@\texttt {xminorticks} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xminorticks@\texttt {xminorticks}|hyperpage}{57}
+\indexentry{yminorticks@\texttt {yminorticks} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!yminorticks@\texttt {yminorticks}|hyperpage}{57}
+\indexentry{xmajorticks@\texttt {xmajorticks} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xmajorticks@\texttt {xmajorticks}|hyperpage}{57}
+\indexentry{ymajorticks@\texttt {ymajorticks} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ymajorticks@\texttt {ymajorticks}|hyperpage}{57}
+\indexentry{ticks@\texttt {ticks} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ticks@\texttt {ticks}|hyperpage}{57}
+\indexentry{xminorgrids@\texttt {xminorgrids} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xminorgrids@\texttt {xminorgrids}|hyperpage}{57}
+\indexentry{yminorgrids@\texttt {yminorgrids} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!yminorgrids@\texttt {yminorgrids}|hyperpage}{57}
+\indexentry{xmajorgrids@\texttt {xmajorgrids} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!xmajorgrids@\texttt {xmajorgrids}|hyperpage}{57}
+\indexentry{ymajorgrids@\texttt {ymajorgrids} key|hyperpage}{57}
+\indexentry{pgfplots@\texttt {/pgfplots/}!ymajorgrids@\texttt {ymajorgrids}|hyperpage}{57}
+\indexentry{grids@\texttt {grids} key|hyperpage}{58}
+\indexentry{pgfplots@\texttt {/pgfplots/}!grids@\texttt {grids}|hyperpage}{58}
+\indexentry{@\texttt {.} handler|hyperpage}{58}
+\indexentry{Key handlers!.@\texttt {.}|hyperpage}{58}
+\indexentry{@\texttt {.} handler|hyperpage}{58}
+\indexentry{Key handlers!.@\texttt {.}|hyperpage}{58}
+\indexentry{pgfplotsset@\myprintocmmand {pgfplotsset}|hyperpage}{59}
+\indexentry{every axis@\texttt {every axis} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis@\texttt {every axis}|hyperpage}{59}
+\indexentry{every semilogx axis@\texttt {every semilogx axis} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every semilogx axis@\texttt {every semilogx axis}|hyperpage}{59}
+\indexentry{every semilogy axis@\texttt {every semilogy axis} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every semilogy axis@\texttt {every semilogy axis}|hyperpage}{59}
+\indexentry{every loglog axis@\texttt {every loglog axis} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every loglog axis@\texttt {every loglog axis}|hyperpage}{59}
+\indexentry{every linear axis@\texttt {every linear axis} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every linear axis@\texttt {every linear axis}|hyperpage}{59}
+\indexentry{every axis plot@\texttt {every axis plot} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis plot@\texttt {every axis plot}|hyperpage}{59}
+\indexentry{every axis plot post@\texttt {every axis plot post} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis plot post@\texttt {every axis plot post}|hyperpage}{59}
+\indexentry{every axis plot no \#@\texttt {every axis plot no \#} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis plot no \#@\texttt {every axis plot no \#}|hyperpage}{59}
+\indexentry{every axis label@\texttt {every axis label} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis label@\texttt {every axis label}|hyperpage}{59}
+\indexentry{every axis x label@\texttt {every axis x label} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis x label@\texttt {every axis x label}|hyperpage}{59}
+\indexentry{every axis y label@\texttt {every axis y label} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis y label@\texttt {every axis y label}|hyperpage}{59}
+\indexentry{every axis title@\texttt {every axis title} key|hyperpage}{59}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis title@\texttt {every axis title}|hyperpage}{59}
+\indexentry{every tick@\texttt {every tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every tick@\texttt {every tick}|hyperpage}{60}
+\indexentry{every minor tick@\texttt {every minor tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor tick@\texttt {every minor tick}|hyperpage}{60}
+\indexentry{every major tick@\texttt {every major tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major tick@\texttt {every major tick}|hyperpage}{60}
+\indexentry{every x tick@\texttt {every x tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every x tick@\texttt {every x tick}|hyperpage}{60}
+\indexentry{every minor x tick@\texttt {every minor x tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor x tick@\texttt {every minor x tick}|hyperpage}{60}
+\indexentry{every major x tick@\texttt {every major x tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major x tick@\texttt {every major x tick}|hyperpage}{60}
+\indexentry{every y tick@\texttt {every y tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every y tick@\texttt {every y tick}|hyperpage}{60}
+\indexentry{every minor y tick@\texttt {every minor y tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor y tick@\texttt {every minor y tick}|hyperpage}{60}
+\indexentry{every major y tick@\texttt {every major y tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major y tick@\texttt {every major y tick}|hyperpage}{60}
+\indexentry{every axis grid@\texttt {every axis grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis grid@\texttt {every axis grid}|hyperpage}{60}
+\indexentry{every minor grid@\texttt {every minor grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor grid@\texttt {every minor grid}|hyperpage}{60}
+\indexentry{every major grid@\texttt {every major grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major grid@\texttt {every major grid}|hyperpage}{60}
+\indexentry{every axis x grid@\texttt {every axis x grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis x grid@\texttt {every axis x grid}|hyperpage}{60}
+\indexentry{every minor x grid@\texttt {every minor x grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor x grid@\texttt {every minor x grid}|hyperpage}{60}
+\indexentry{every major x grid@\texttt {every major x grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major x grid@\texttt {every major x grid}|hyperpage}{60}
+\indexentry{every axis y grid@\texttt {every axis y grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis y grid@\texttt {every axis y grid}|hyperpage}{60}
+\indexentry{every minor y grid@\texttt {every minor y grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every minor y grid@\texttt {every minor y grid}|hyperpage}{60}
+\indexentry{every major y grid@\texttt {every major y grid} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every major y grid@\texttt {every major y grid}|hyperpage}{60}
+\indexentry{every tick label@\texttt {every tick label} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every tick label@\texttt {every tick label}|hyperpage}{60}
+\indexentry{every x tick label@\texttt {every x tick label} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every x tick label@\texttt {every x tick label}|hyperpage}{60}
+\indexentry{every y tick label@\texttt {every y tick label} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every y tick label@\texttt {every y tick label}|hyperpage}{60}
+\indexentry{every x tick scale label@\texttt {every x tick scale label} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every x tick scale label@\texttt {every x tick scale label}|hyperpage}{60}
+\indexentry{every y tick scale label@\texttt {every y tick scale label} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every y tick scale label@\texttt {every y tick scale label}|hyperpage}{60}
+\indexentry{every extra x tick@\texttt {every extra x tick} key|hyperpage}{60}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every extra x tick@\texttt {every extra x tick}|hyperpage}{60}
+\indexentry{every error bar@\texttt {every error bar} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every error bar@\texttt {every error bar}|hyperpage}{61}
+\indexentry{every extra y tick@\texttt {every extra y tick} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every extra y tick@\texttt {every extra y tick}|hyperpage}{61}
+\indexentry{every axis legend@\texttt {every axis legend} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every axis legend@\texttt {every axis legend}|hyperpage}{61}
+\indexentry{x\ tick label style@\texttt {x\ tick label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ tick label style@\texttt {x\ tick label style}|hyperpage}{61}
+\indexentry{y\ tick label style@\texttt {y\ tick label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ tick label style@\texttt {y\ tick label style}|hyperpage}{61}
+\indexentry{x\ tick scale label style@\texttt {x\ tick scale label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ tick scale label style@\texttt {x\ tick scale label style}|hyperpage}{61}
+\indexentry{y\ tick scale label style@\texttt {y\ tick scale label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ tick scale label style@\texttt {y\ tick scale label style}|hyperpage}{61}
+\indexentry{label style@\texttt {label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!label style@\texttt {label style}|hyperpage}{61}
+\indexentry{x\ label style@\texttt {x\ label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ label style@\texttt {x\ label style}|hyperpage}{61}
+\indexentry{y\ label style@\texttt {y\ label style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ label style@\texttt {y\ label style}|hyperpage}{61}
+\indexentry{title style@\texttt {title style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!title style@\texttt {title style}|hyperpage}{61}
+\indexentry{tick style@\texttt {tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!tick style@\texttt {tick style}|hyperpage}{61}
+\indexentry{minor tick style@\texttt {minor tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor tick style@\texttt {minor tick style}|hyperpage}{61}
+\indexentry{major tick style@\texttt {major tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major tick style@\texttt {major tick style}|hyperpage}{61}
+\indexentry{x\ tick style@\texttt {x\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ tick style@\texttt {x\ tick style}|hyperpage}{61}
+\indexentry{y\ tick style@\texttt {y\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ tick style@\texttt {y\ tick style}|hyperpage}{61}
+\indexentry{minor x\ tick style@\texttt {minor x\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor x\ tick style@\texttt {minor x\ tick style}|hyperpage}{61}
+\indexentry{minor y\ tick style@\texttt {minor y\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor y\ tick style@\texttt {minor y\ tick style}|hyperpage}{61}
+\indexentry{major x\ tick style@\texttt {major x\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major x\ tick style@\texttt {major x\ tick style}|hyperpage}{61}
+\indexentry{major y\ tick style@\texttt {major y\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major y\ tick style@\texttt {major y\ tick style}|hyperpage}{61}
+\indexentry{grid style@\texttt {grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!grid style@\texttt {grid style}|hyperpage}{61}
+\indexentry{minor grid style@\texttt {minor grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor grid style@\texttt {minor grid style}|hyperpage}{61}
+\indexentry{major grid style@\texttt {major grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major grid style@\texttt {major grid style}|hyperpage}{61}
+\indexentry{x\ grid style@\texttt {x\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ grid style@\texttt {x\ grid style}|hyperpage}{61}
+\indexentry{y\ grid style@\texttt {y\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ grid style@\texttt {y\ grid style}|hyperpage}{61}
+\indexentry{minor x\ grid style@\texttt {minor x\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor x\ grid style@\texttt {minor x\ grid style}|hyperpage}{61}
+\indexentry{minor y\ grid style@\texttt {minor y\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!minor y\ grid style@\texttt {minor y\ grid style}|hyperpage}{61}
+\indexentry{major x\ grid style@\texttt {major x\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major x\ grid style@\texttt {major x\ grid style}|hyperpage}{61}
+\indexentry{major y\ grid style@\texttt {major y\ grid style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!major y\ grid style@\texttt {major y\ grid style}|hyperpage}{61}
+\indexentry{extra x\ tick style@\texttt {extra x\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!extra x\ tick style@\texttt {extra x\ tick style}|hyperpage}{61}
+\indexentry{extra y\ tick style@\texttt {extra y\ tick style} key|hyperpage}{61}
+\indexentry{pgfplots@\texttt {/pgfplots/}!extra y\ tick style@\texttt {extra y\ tick style}|hyperpage}{61}
+\indexentry{anchor@\texttt {anchor} key|hyperpage}{62}
+\indexentry{pgfplots@\texttt {/pgfplots/}!anchor@\texttt {anchor}|hyperpage}{62}
+\indexentry{at@\texttt {at} key|hyperpage}{65}
+\indexentry{pgfplots@\texttt {/pgfplots/}!at@\texttt {at}|hyperpage}{65}
+\indexentry{disablelogfilter@\texttt {disablelogfilter} key|hyperpage}{65}
+\indexentry{pgfplots@\texttt {/pgfplots/}!disablelogfilter@\texttt {disablelogfilter}|hyperpage}{65}
+\indexentry{disabledatascaling@\texttt {disabledatascaling} key|hyperpage}{65}
+\indexentry{pgfplots@\texttt {/pgfplots/}!disabledatascaling@\texttt {disabledatascaling}|hyperpage}{65}
+\indexentry{.code@\texttt {.code} key|hyperpage}{66}
+\indexentry{pgfplots@\texttt {/pgfplots/}!x\ filter@\texttt {x\ filter/}!.code@\texttt {.code}|hyperpage}{66}
+\indexentry{.code@\texttt {.code} key|hyperpage}{66}
+\indexentry{pgfplots@\texttt {/pgfplots/}!y\ filter@\texttt {y\ filter/}!.code@\texttt {.code}|hyperpage}{66}
+\indexentry{skip coords between index@\texttt {skip coords between index} key|hyperpage}{66}
+\indexentry{pgfplots@\texttt {/pgfplots/}!skip coords between index@\texttt {skip coords between index}|hyperpage}{66}
+\indexentry{filter discard warning@\texttt {filter discard warning} key|hyperpage}{67}
+\indexentry{pgfplots@\texttt {/pgfplots/}!filter discard warning@\texttt {filter discard warning}|hyperpage}{67}
+\indexentry{execute at begin plot@\texttt {execute at begin plot} key|hyperpage}{67}
+\indexentry{pgfplots@\texttt {/pgfplots/}!execute at begin plot@\texttt {execute at begin plot}|hyperpage}{67}
+\indexentry{execute at end plot@\texttt {execute at end plot} key|hyperpage}{67}
+\indexentry{pgfplots@\texttt {/pgfplots/}!execute at end plot@\texttt {execute at end plot}|hyperpage}{67}
+\indexentry{before end axis@\texttt {before end axis} key|hyperpage}{67}
+\indexentry{pgfplots@\texttt {/pgfplots/}!before end axis@\texttt {before end axis}|hyperpage}{67}
+\indexentry{after end axis@\texttt {after end axis} key|hyperpage}{67}
+\indexentry{pgfplots@\texttt {/pgfplots/}!after end axis@\texttt {after end axis}|hyperpage}{67}
+\indexentry{extra description@\texttt {extra description} key|hyperpage}{68}
+\indexentry{pgfplots@\texttt {/pgfplots/}!extra description@\texttt {extra description}|hyperpage}{68}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.install.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.install.tex
index 0761f12be9c..13bb6c9afdd 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.install.tex
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.install.tex
@@ -19,33 +19,14 @@ doc/latex/pgfplots/gpl-3.0.txt
 You may also visit~\url{http://www.gnu.org/licenses}.
 
 \subsection{Prerequisites}
-\PGFPlots\ requires \PGF\ version $\ge 1.18$ and package \texttt{xkeyval}.
-
-\subsection{Files in the \PGFPlots-Bundle}
-The \PGFPlots\ package consists of the files
-\begin{lstlisting}
-latex/pgfplots/pgfplots.sty
-generic/pgfmathlog/pgfmathlog.sty
-generic/liststructure/liststructure.sty
-generic/sciformat/sciformat.sty
-generic/pgfplotshelpers/pgfplotshelpers.sty
-doc/latex/pgfplots/pgfplots.bib
-doc/latex/pgfplots/pgfplots.*tex
-doc/latex/pgfplots/pgfplots.pdf
-doc/latex/pgfplots/todo.txt
-doc/latex/pgfplots/changelog.txt
-test/liststructuretest/liststructuretest.tex
-test/pgfplotstest/pgfplotstest.tex
-test/pgfmathlogtest/pgfmathlogtest.tex
-ext_scripts/pgf2pdf.sh
-ext_scripts/matlab2pgfplots.m
-ext_scripts/matlab2pgfplots.sh
-\end{lstlisting}
-If is used with
+\PGFPlots\ requires \PGF\ with \textbf{at least version~$2.0$}. It is used with
 \begin{lstlisting}
 \usepackage{pgfplots}
 \end{lstlisting}
-in your preamble. There are several ways how to teach \LaTeX\ where to find the files. Choose the option which fits your needs best.
+in your preamble (see section~\ref{sec:tex:dialects} for information about how to use it with Con{\TeX}t and plain \TeX). There are several ways how to teach \TeX\ where to find the files. Choose the option which fits your needs best.
+
+\subsection{Installation in Windows}
+Windows users often use Mik\TeX\ which downloads the latest stable package versions automatically. As far as I know, you do not need to install anything manually here.
 
 \subsection{Assigning the \texttt{TEXINPUTS} Variable}
 You can simply install \PGFPlots\ anywhere on your disc, for example into
@@ -56,10 +37,16 @@ Then, you set the \texttt{TEXINPUTS} variable to
 \begin{lstlisting}
 TEXINPUTS=/foo/bar/pgfplots//:
 \end{lstlisting}
-The trailing~`\texttt{:}' tells \LaTeX\ to check the default search paths after \lstinline!/foo/bar/pgfplots!. The double slash~`\texttt{//}' tells \LaTeX\ to search all subdirectories.
+The trailing~`\texttt{:}' tells \TeX\ to check the default search paths after \lstinline!/foo/bar/pgfplots!. The double slash~`\texttt{//}' tells \TeX\ to search all subdirectories.
 
 If the \texttt{TEXINPUTS} variable already contains something, you can append the line above to the existing \texttt{TEXINPUTS} content.
 
+Furthermore, you should set |TEXDOCS| as well,
+\begin{lstlisting}
+TEXDOCS=/foo/bar/pgfplots//:
+\end{lstlisting}
+so that the \TeX-documentation system finds the files |pgfplots.pdf| and |pgfplotstable.pdf| (on some systems, it is then enough to use |texdoc pgfplots|).
+
 Please refer to your operating systems manual for how to set environment variables.
 
 \subsection{Installation into a local \texttt{texmf}-directory}
@@ -71,13 +58,14 @@ A TDS conforming installation will use the same base directory as in the last se
 Do not forget to run \lstinline!texhash!.
 
 \subsection{If everything else fails...}
-If \LaTeX\ still doesn't find your files, you can copy all \lstinline!.sty!-files into your current project's working directory.
+If \TeX\ still doesn't find your files, you can copy all \lstinline!.sty!-files into your current project's working directory.
 
 Please refer to \url{http://www.ctan.org/installationadvice/} for more information about package installation.
 
 
 
 \subsection{Restrictions for DVI-Viewers and \texttt{dvipdfm}}
+\label{sec:drivers}%
 \PGF\ is compatible with 
 \begin{itemize}
 	\item \lstinline!latex!/\lstinline!dvips!,
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.intro.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.intro.tex
index 0a1d34d2ccf..3cb4be4c2ab 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.intro.tex
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.intro.tex
@@ -1,38 +1,109 @@
-% main=manual.tex
+% main=pgfplots.tex
 
 \section{Drawing axes and plots}
-\subsection{A first plot}
-Plotting is done using \lstinline|\begin{axis} ... \addplot ...; \end{axis}|:
-
-\begin{figure}
-\centering
+\subsection{\TeX-dialects: \LaTeX, Con{\TeX}t, plain \TeX }
+\label{sec:tex:dialects}%
+\PGFPlots\ is compatible with \LaTeX, Con{\TeX}t and plain \TeX. The only difference is how to specify environments. This affects any \PGF/\Tikz-environments and all \PGFPlots-environments like axis, semilogxaxis, semilogyaxis and loglogaxis:
+\begin{description}
+\def\HEAD{%
+	\small
+	\lstset{boxpos=b,breaklines=false,aboveskip=3pt,belowskip=3pt}%
+	%\hspace{-1cm}%
+	\begin{tabular}{*{2}{p{4cm}}}%
+}%
+\item[\LaTeX:] \lstinline!\usepackage{pgfplots}! and
+
+{\HEAD
+\begin{lstlisting}
 \begin{tikzpicture}
-	\begin{axis}[
-		xlabel=Cost,
-		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
-		(2,-2.8559703)
-		(3,-3.5301677)
-		(4,-4.3050655)
-		(5,-5.1413136)
-		(6,-6.0322865)
-		(7,-6.9675052)
-		(8,-7.9377747)
-		(9,-9.9717663)
-	};
-	\end{axis}
+\begin{axis}
+...
+\end{axis}
 \end{tikzpicture}
+\end{lstlisting}
+&
+\begin{lstlisting}
+\begin{tikzpicture}
+\begin{semilogxaxis}
+...
+\end{semilogxaxis}
+\end{tikzpicture}
+\end{lstlisting}
+\\
+\end{tabular}%
+}
+
+A small \LaTeX--example file can be found in
+\begin{lstlisting}
+doc/latex/pgfplots/pgfplotsexample.tex.
+\end{lstlisting}
 
-\caption{An example for a normal plot. The coordinates are specified using the \Tikz-syntax ``\texttt{plot coordinates}'', optional labels can be provided with the ``\texttt{xlabel}'' and ``\texttt{ylabel}'' arguments.}
-\label{fig:firstplot}
-\end{figure}
+\item[Con{\TeX}t:] \lstinline!\usemodule[pgfplots]! and
 
+{\HEAD
 \begin{lstlisting}
+\starttikzpicture
+\startaxis
+...
+\stopaxis
+\stoptikzpicture
+\end{lstlisting}
+&
+\begin{lstlisting}
+\starttikzpicture
+\startsemilogxaxis
+...
+\stopsemilogxaxis
+\stoptikzpicture
+\end{lstlisting}
+\\
+\end{tabular}%
+}
+
+A small Con{\TeX}t--example file can be found in
+\begin{lstlisting}
+doc/context/pgfplots/pgfplotsexample.tex.
+\end{lstlisting}
+
+\item[plain \TeX:] \lstinline!\input pgfplots.tex! and
+
+{\HEAD
+\begin{lstlisting}
+\tikzpicture
+\axis
+...
+\endaxis
+\endtikzpicture
+\end{lstlisting}
+&
+\begin{lstlisting}
+\tikzpicture
+\semilogxaxis
+...
+\endsemilogxaxis
+\endtikzpicture
+\end{lstlisting}
+\\
+\end{tabular}%
+}
+
+A small plain--\TeX--example file can be found in
+\begin{lstlisting}
+doc/plain/pgfplots/pgfplotsexample.tex.
+\end{lstlisting}
+\end{description}
+You may need to set low--level drivers if you intend to use |dvipdfm|, see section~\ref{sec:drivers}.
+
+
+\subsection{A first plot}
+Plotting is done using \lstinline|\begin{axis} ... \addplot ...; \end{axis}|, where |\addplot| is an interface to the \Tikz\ |plot| commands.
+\begin{codeexample}[]
 \begin{tikzpicture}
 	\begin{axis}[
 		xlabel=Cost,
+		name=an axis,
 		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
+	\addplot[color=red,mark=x] coordinates {
 		(2,-2.8559703)
 		(3,-3.5301677)
 		(4,-4.3050655)
@@ -40,104 +111,62 @@ Plotting is done using \lstinline|\begin{axis} ... \addplot ...; \end{axis}|:
 		(6,-6.0322865)
 		(7,-6.9675052)
 		(8,-7.9377747)
-		(9,-9.9717663)
 	};
 	\end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-The outcome of this listing is shown in figure~\ref{fig:firstplot}. The \lstinline!plot coordinates! command is one of the \Tikz\ ways to create plots, see~\cite[Section~16]{tikz}. All other commands are used to create the axis.
+\end{codeexample}
 
-\subsection{Two plots in the same axis}
-Figure~\ref{fig:twoplots} shows the result of placing multiple~\lstinline!\addplot!-commands into a single axis:
-\begin{figure}
-\centering
-\begin{tikzpicture}
+\begin{codeexample}[]
+\begin{tikzpicture}%
 	\begin{axis}[
-		xlabel=Cost,
-		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
-		(2,-2.8559703)
-		(3,-3.5301677)
-		(4,-4.3050655)
-		(5,-5.1413136)
-		(6,-6.0322865)
-		(7,-6.9675052)
-		(8,-7.9377747)
-		(9,-9.9717663)
-		};
-	\addplot[color=blue,mark=*] plot coordinates {
-		(2,-2.83)
-		(3,-3.5167)
-		(4,-4.4050)
-		(5,-5.137)
-		(6,-6.4)
-		(7,-6.6750)
-		(8,-6.9377)
-		(9,-6.9717)
-		};
-	\legend{Case 1\\Case 2\\}
+		xlabel=$x$,
+		ylabel=$\sin(x)$,
+		name=an axis,
+	]
+	\addplot plot[id=sin] function{sin(x)};
 	\end{axis}
-\end{tikzpicture}
-
-\caption{Two plots in the same axis. A legend can be generated using the \texttt{\textbackslash legend{}}-command.}
-\label{fig:twoplots}
-\end{figure}
+\end{tikzpicture}%
+\end{codeexample}
+The \lstinline!plot coordinates! and \lstinline!plot function! commands are two of the several \Tikz\ ways to create plots, see section~\ref{sec:addplot} for more details\footnote{Please note that you need \lstinline{gnuplot} installed to use \lstinline{plot function}.}. The options `|xlabel|' and `|ylabel|' define axis descriptions.
 
-\begin{lstlisting}
+\subsection{Two plots in the same axis}
+Multiple \lstinline!\addplot!-commands can be placed into the same axis.
+	% generated with this statement:
+	%\addplot plot[id=filesuffix_noise,domain=-6:5,samples=10] function{(-x**5 - 242 + (-300 + 600*rand(0)))};
+\begin{codeexample}[leave comments]
 \begin{tikzpicture}
 	\begin{axis}[
-		xlabel=Cost,
-		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
-		(2,-2.8559703)
-		(3,-3.5301677)
-		(4,-4.3050655)
-		(5,-5.1413136)
-		(6,-6.0322865)
-		(7,-6.9675052)
-		(8,-7.9377747)
-		(9,-9.9717663)
-	};
-	\addplot[color=blue,mark=*] plot coordinates {
-		(2,-2.83)
-		(3,-3.5167)
-		(4,-4.4050)
-		(5,-5.137)
-		(6,-6.4)
-		(7,-6.6750)
-		(8,-6.9377)
-		(9,-6.9717)
-	};
-	\legend{Case 1\\Case 2\\}
+		height=9cm,
+		width=9cm,
+		grid=major,
+	]
+		
+	\addplot plot[id=filesuffix] function{(-x**5 - 242)};
+	\addlegendentry{model}
+
+	\addplot coordinates {
+		(-4.77778,2027.60977)
+		(-3.55556,347.84069)
+		(-2.33333,22.58953)
+		(-1.11111,-493.50066)
+		(0.11111,46.66082)
+		(1.33333,-205.56286)
+		(2.55556,-341.40638)
+		(3.77778,-1169.24780)
+		(5.00000,-3269.56775)
+	};
+	\addlegendentry{estimate}
 	\end{axis}
 \end{tikzpicture}
-\end{lstlisting}
+\end{codeexample}
+A legend entry is generated if there are |\addlegendentry| commands (or one |\legend| command).
 
 \subsection{Logarithmic plots}
-Logarithmic plots show $\log x$ versus $\log y$  (or just one logarithmic axis) as in figure~\ref{fig:firstloglog}. \PGFPlots\ always uses the natural logarithm, i.e. basis $e\approx2.718$. Now, the axis description also contains minor ticks and the labels are placed at $10^i$.
-\begin{figure}
-\centering
-	\begin{tikzpicture}
-	\begin{loglogaxis}[xlabel=Cost,ylabel=Gain]
-	\addplot[color=red,mark=x] plot coordinates {
-		(10,100)
-		(20,150)
-		(40,225)
-		(80,340)
-		(160,510)
-		(320,765)
-		(640,1150)
-	};
-	\end{loglogaxis}
-	\end{tikzpicture}
-
-\caption{A double--logarithmic plot.}
-\label{fig:firstloglog}
-\end{figure}
-\begin{lstlisting}
+Logarithmic plots show $\log x$ versus $\log y$  (or just one logarithmic axis). \PGFPlots\ always uses the natural logarithm, i.e. basis $e\approx2.718$. Now, the axis description also contains minor ticks and the labels are placed at $10^i$.
+\begin{codeexample}[]
 \begin{tikzpicture}
 \begin{loglogaxis}[xlabel=Cost,ylabel=Gain]
-\addplot[color=red,mark=x] plot coordinates {
+\addplot[color=red,mark=x] coordinates {
 	(10,100)
 	(20,150)
 	(40,225)
@@ -148,78 +177,49 @@ Logarithmic plots show $\log x$ versus $\log y$  (or just one logarithmic axis)
 };
 \end{loglogaxis}
 \end{tikzpicture}
-\end{lstlisting}
-A common application is to visualise scientific data. This is often provided in the format $1.42\cdot10^4$, usually written as 1.42e+04. An example is shown in the following listing and in figure~\ref{fig:example:sci:loglog}.
-\begin{figure}
-\centering
+\end{codeexample}
+A common application is to visualise scientific data. This is often provided in the format $1.42\cdot10^4$, usually written as 1.42e+04. Suppose we have a numeric table named |pgfplots.testtable|, containing
+\begin{codeexample}[code only,tabsize=6]
+Level Cost  Error
+1     7     8.471e-02
+2     31    3.044e-02
+3     111   1.022e-02
+4     351   3.303e-03
+5     1023  1.038e-03
+6     2815  3.196e-04
+7     7423  9.657e-05
+8     18943 2.873e-05
+9     47103 8.437e-06
+\end{codeexample}
+then we can plot |Cost| versus |Error| using
+\begin{codeexample}[]
 \begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel=Cost,
-		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
-		(5,		8.31160034e-02)
-		(17,	2.54685628e-02)
-		(49,	7.40715288e-03)
-		(129,	2.10192154e-03)
-		(321,	5.87352989e-04)
-		(769,	1.62269942e-04)
-		(1793,	4.44248889e-05)
-		(4097,	1.20714122e-05)
-		(9217,	3.26101452e-06)
-	};
-
-	\addplot[color=blue,mark=*] plot coordinates {
-		(7,		8.47178381e-02)
-		(31,	3.04409349e-02)
-		(111,	1.02214539e-02)
-		(351,	3.30346265e-03)
-		(1023,	1.03886535e-03)
-		(2815,	3.19646457e-04)
-		(7423,	9.65789766e-05)
-		(18943,	2.87339125e-05)
-		(47103,	8.43749881e-06)
-	};
-	\legend{Case 1\\Case 2\\}
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\caption{A double--logarithmic plot using scientific notation.}
-\label{fig:example:sci:loglog}
-\end{figure}
+\begin{loglogaxis}[
+	xlabel=Cost,
+	ylabel=Error]
+\addplot[color=red,mark=x] coordinates {
+	(5,    8.31160034e-02)
+	(17,   2.54685628e-02)
+	(49,   7.40715288e-03)
+	(129,  2.10192154e-03)
+	(321,  5.87352989e-04)
+	(769,  1.62269942e-04)
+	(1793, 4.44248889e-05)
+	(4097, 1.20714122e-05)
+	(9217, 3.26101452e-06)
+};
 
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel=Cost,
-		ylabel=Error]
-	\addplot[color=red,mark=x] plot coordinates {
-		(5,		8.31160034e-02)
-		(17,	2.54685628e-02)
-		(49,	7.40715288e-03)
-		(129,	2.10192154e-03)
-		(321,	5.87352989e-04)
-		(769,	1.62269942e-04)
-		(1793,	4.44248889e-05)
-		(4097,	1.20714122e-05)
-		(9217,	3.26101452e-06)
-	};
+\addplot[color=blue,mark=*] 
+	table[x=Cost,y=Error] {pgfplots.testtable};
 
-	\addplot[color=blue,mark=*] plot coordinates {
-		(7,		8.47178381e-02)
-		(31,	3.04409349e-02)
-		(111,	1.02214539e-02)
-		(351,	3.30346265e-03)
-		(1023,	1.03886535e-03)
-		(2815,	3.19646457e-04)
-		(7423,	9.65789766e-05)
-		(18943,	2.87339125e-05)
-		(47103,	8.43749881e-06)
-	};
-	\legend{Case 1\\Case 2\\}
-	\end{loglogaxis}
+\legend{Case 1,Case 2}
+\end{loglogaxis}
 \end{tikzpicture}
-\end{lstlisting}
-Besided the environment ``\texttt{loglogaxis}'' you can use
+\end{codeexample}
+The first plot employs inline coordinates; the second one reads numerical data from file and plots column `|Cost|' versus `|Error|'.
+
+\noindent
+Besided the environment ``|loglogaxis|'' you can use
 \begin{itemize}
 	\item \lstinline!\begin{axis}...\end{axis}! for normal plots,
 	\item \lstinline!\begin{semilogxaxis}...\end{semilogxaxis}! for plots which have a normal~$y$ axis and a logarithmic~$x$ axis,
@@ -228,32 +228,17 @@ Besided the environment ``\texttt{loglogaxis}'' you can use
 \end{itemize}
 You can also use
 \begin{lstlisting}
-	\begin{axis}[xmode=normal,ymode=log]
-	...
-	\end{axis}
-\end{lstlisting}
-which is the same as \lstinline!\begin{semilogyaxis}...\end{semilogyaxis}!. Example:
-\begin{lstlisting}
-\begin{tikzpicture}
-	\begin{semilogyaxis}[xlabel=Index,ylabel=Value]
-	\addplot[color=blue,mark=*] plot coordinates {
-		(1,8)
-		(2,16)
-		(3,32)
-		(4,64)
-		(5,128)
-		(6,256)
-		(7,512)
-	};
-	\end{semilogyaxis}
-\end{tikzpicture}
+\begin{axis}[xmode=normal,ymode=log]
+...
+\end{axis}
 \end{lstlisting}
-see figure~\ref{fig:semilogy}.
-\begin{figure}
-\centering
+which is the same as \lstinline!\begin{semilogyaxis}...\end{semilogyaxis}!.
+\begin{codeexample}[]
 \begin{tikzpicture}
-	\begin{semilogyaxis}[xlabel=Index,ylabel=Value]
-	\addplot[color=blue,mark=*] plot coordinates {
+	\begin{semilogyaxis}[
+		xlabel=Index,ylabel=Value]
+
+	\addplot[color=blue,mark=*] coordinates {
 		(1,8)
 		(2,16)
 		(3,32)
@@ -262,412 +247,100 @@ see figure~\ref{fig:semilogy}.
 		(6,256)
 		(7,512)
 	};
-	\end{semilogyaxis}
-\end{tikzpicture}
-
-\caption{A semi--logarithmic plot.}
-\label{fig:semilogy}
-\end{figure}
+	\end{semilogyaxis}%
+\end{tikzpicture}%
+\end{codeexample}
 
 \subsection{Cycling line styles}
-You can skip the style arguments for \lstinline!\addplot[...]! or \lstinline!\addplot[...]! to determine plot specifications from a predefined list:
-\begin{figure}
-\centering
+You can skip the style arguments for \lstinline!\addplot[...]! to determine plot specifications from a predefined list:
+\label{page:plotcoords:src}%
+\begin{codeexample}[width=4cm]
 \begin{tikzpicture}
-	\begin{loglogaxis}[
-		xlabel={Degrees of freedom},
-		ylabel={$L_2$ Error}
-	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
+\begin{loglogaxis}[
+	xlabel={Degrees of freedom},
+	ylabel={$L_2$ Error}
+]
+\addplot coordinates {
+	(5,8.312e-02)    (17,2.547e-02)   (49,7.407e-03)
+	(129,2.102e-03)  (321,5.874e-04)  (769,1.623e-04)
+	(1793,4.442e-05) (4097,1.207e-05) (9217,3.261e-06)
+};
 
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
+\addplot coordinates{
+	(7,8.472e-02)    (31,3.044e-02)    (111,1.022e-02)
+	(351,3.303e-03)  (1023,1.039e-03)  (2815,3.196e-04)
+	(7423,9.658e-05) (18943,2.873e-05) (47103,8.437e-06)
+};
 
-	\addplot plot coordinates {
-		(9,		7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
+\addplot coordinates{
+	(9,7.881e-02)     (49,3.243e-02)    (209,1.232e-02)
+	(769,4.454e-03)   (2561,1.551e-03)  (7937,5.236e-04)
+	(23297,1.723e-04) (65537,5.545e-05) (178177,1.751e-05)
+};
 
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
+\addplot coordinates{
+	(11,6.887e-02)    (71,3.177e-02)     (351,1.341e-02)
+	(1471,5.334e-03)  (5503,2.027e-03)   (18943,7.415e-04)
+	(61183,2.628e-04) (187903,9.063e-05) (553983,3.053e-05)
+};
 
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-	\end{loglogaxis}
+\addplot coordinates{
+	(13,5.755e-02)     (97,2.925e-02)     (545,1.351e-02)
+	(2561,5.842e-03)   (10625,2.397e-03)  (40193,9.414e-04)
+	(141569,3.564e-04) (471041,1.308e-04) (1496065,4.670e-05)
+};
+\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+\end{loglogaxis}
 \end{tikzpicture}
+\end{codeexample}
+\noindent
+The cycle list can be modified, see the reference below.
 
-\caption{Predefined line/marker combinations.}
-\label{fig:predefined:plotspec}
-\end{figure}
-
-\begin{lstlisting}
-\begin{tikzpicture}
+\subsection{Scaling plots}
+You can use any of the \Tikz\ options to modify the appearance. For example, the ``|scale|'' transformation takes the picture as such and scales it.
+{%
+\begin{codeexample}[]
+\begin{tikzpicture}[scale=0.5]
 	\begin{loglogaxis}[
 		xlabel={Degrees of freedom},
 		ylabel={$L_2$ Error}
 	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,		7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
 	\end{loglogaxis}
 \end{tikzpicture}
-\end{lstlisting}
-
-The result is shown in figure~\ref{fig:predefined:plotspec}. You can modify the list, see the reference below.
-
-\subsection{Scaling plots}
-You can use any of the \Tikz\ options to modify the appearance. For example the effect of the ``\texttt{scale}'' transformation is shown in figures \ref{fig:scale1}~and~\ref{fig:scale2}.
 
-\begin{figure}
-\begin{minipage}[c]{7.1cm}%
-\begin{tikzpicture}[scale=0.8]
+\begin{tikzpicture}[scale=1.1]
 	\begin{loglogaxis}[
 		xlabel={Degrees of freedom},
 		ylabel={$L_2$ Error}
 	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,		7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
 	\end{loglogaxis}
 \end{tikzpicture}
-\end{minipage}%
-\hfill
-\begin{minipage}[c]{8cm}%
-\begin{lstlisting}
-\begin{tikzpicture}[scale=0.8]
-\begin{loglogaxis}
-...
-\end{loglogaxis}
-\end{tikzpicture}
-\end{lstlisting}
-\end{minipage}
-\caption{An example of a scaled plot.}
-\label{fig:scale1}
-\end{figure}
-
-\begin{figure}
-\centering
-\begin{tikzpicture}[scale=1.3]
+\end{codeexample}
+However, you can also scale plots by assigning a |width=5cm| and/or |height=3cm| argument. This only affects the distance of point coordinates, no font sizes or axis descriptions:
+\begin{codeexample}[]
+\begin{tikzpicture}
 	\begin{loglogaxis}[
+		width=6cm,
 		xlabel={Degrees of freedom},
 		ylabel={$L_2$ Error}
 	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,		7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
 	\end{loglogaxis}
 \end{tikzpicture}
 
-\begin{lstlisting}
-			\begin{tikzpicture}[scale=1.3]
-			\begin{loglogaxis}
-			...
-			\end{loglogaxis}
-			\end{tikzpicture}
-\end{lstlisting}
-\caption{The effect of a ``\texttt{scale}'' transformation by~$30\%$.}
-\label{fig:scale2}
-\end{figure}
-
-You can scale plots either using the \texttt{width=5cm} and/or \texttt{height=3cm} options or by setting the dimension for each unit coordinate as is shown in figure~\ref{fig:scale:units}.
-
-More examples can be found in section~\ref{sec:examples}.
-
-\begin{figure}
-\centering
 \begin{tikzpicture}
-	\begin{loglogaxis}[%
-		x=0.4cm,y=0.7cm,
+	\begin{loglogaxis}[
+		width=8cm,
 		xlabel={Degrees of freedom},
 		ylabel={$L_2$ Error}
 	]
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,		7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
 	\end{loglogaxis}
-\end{tikzpicture}%
-
-\begin{lstlisting}
-		\begin{tikzpicture}
-		\begin{loglogaxis}[x=0.4cm,y=0.7cm,...]
-		...
-		\end{loglogaxis}
-		\end{tikzpicture}
-\end{lstlisting}
-\caption{The result of setting the unit vector for~$x$ to~0.4cm and for~$y$ to~0.7cm.}
-\label{fig:scale:units}
-\end{figure}
-
+\end{tikzpicture}
+\end{codeexample}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.pdf b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.pdf
index 824dd8fa874..8b25c545254 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.pdf
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.preamble.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.preamble.tex
new file mode 100644
index 00000000000..087d13237be
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.preamble.tex
@@ -0,0 +1,114 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Package pgfplots.sty documentation. 
+%
+% Copyright 2007/2008 by Christian Feuersaenger.
+%
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+% 
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+% 
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\documentclass[a4paper]{ltxdoc}
+
+\usepackage{ifpdf}
+\ifpdf
+	\usepackage[pdftex]{hyperref}
+\else
+	\usepackage[dvipdfm]{hyperref}
+\fi
+\hypersetup{pdfborder={0 0 0}}
+
+\newcommand{\R}{\mathbb{R}}
+\newcommand{\N}{\mathbb{N}}
+\newcommand{\Z}{\mathbb{Z}}
+
+\usepackage{calc}
+\usepackage[formats]{listings}
+\usepackage{courier}
+%--------------------------------------------------
+% \usepackage{array}
+%-------------------------------------------------- 
+\lstset{%
+	basicstyle=\ttfamily,
+	language=[LaTeX]tex, % Seems as if \lstset{language=tex} must be invoked BEFORE loading tikz!?
+	tabsize=4,
+	breaklines=true,
+	breakindent=0pt
+}
+
+\ifpdf
+	\pdfinfo {
+		/Author	(Christian Feuersaenger)
+	}
+
+\else
+	\def\pgfsysdriver{pgfsys-dvipdfm.def}
+\fi
+%\def\pgfsysdriver{pgfsys-pdftex.def}
+\usepackage{pgfplots}
+
+\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
+\usepackage{amsmath,amssymb}
+\usepackage{xxcolor}
+\usepackage{pifont}
+\usepackage{makeidx}
+\usepackage[latin1]{inputenc}
+\usepackage{amsmath}
+\input{pgfplots-macros}
+
+\pgfqkeys{/codeexample}{%
+	every codeexample/.style={
+		width=8cm,
+		/pgfplots/every axis/.append style={legend style={fill=graphicbackground}}
+	},
+	tabsize=4,
+}
+\pgfplotsset{every axis/.append style={width=7cm}}
+
+\usetikzlibrary{backgrounds,patterns}
+% Global styles:
+\tikzset{
+  shape example/.style={
+    color=black!30,
+    draw,
+    fill=yellow!30,
+    line width=.5cm,
+    inner xsep=2.5cm,
+    inner ysep=0.5cm}
+}
+
+\newcommand{\FIXME}[1]{\textcolor{red}{(FIXME: #1)}}
+
+% fuer endvironment 'sidewaysfigure' bspw
+% \usepackage{rotating}
+
+\newcommand\Tikz{Ti\textit kZ}
+\newcommand\PGF{\textsc{pgf}}
+\newcommand\PGFPlots{\textsc{pgfplots}}
+\def\PGFPlotstable{\textsc{PgfplotsTable}}
+
+
+\makeindex
+
+% Fix overful hboxes automatically:
+\tolerance=2000
+\emergencystretch=10pt
+
+\tikzset{prefix=gnuplot/pgfplots_} % prefix for 'plot function'
+
+\author{%
+	Christian Feuers\"anger\footnote{\url{http://wissrech.ins.uni-bonn.de/people/feuersaenger}}\\%
+	Institut f\"ur Numerische Simulation\\
+	Universit\"at Bonn, Germany}
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.reference.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.reference.tex
index e1afbddbef4..e2dd98148f5 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.reference.tex
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.reference.tex
@@ -1,50 +1,1291 @@
 % main=manual.tex
 
-\section{Reference}
-\subsection{The axis--environments}
-There are four axis environments,
-\begin{enumerate}
-\item The axis environment for normal plots,
-\begin{lstlisting}
-\begin{axis}
+\section{Command Reference}
+\subsection{The Axis-environments}
+There is an axis environment for linear scaling, two for semi-logarithmic scaling and one for double-logarithmic scaling.
+\begin{environment}{{axis}\marg{options}}
+	The axis environment for normal plots with linear axis scaling.
+
+	The `|every linear axis|' style key can be modified with
+\begin{codeexample}[code only]
+\pgfplotsset{every linear axis/.append style={...}}
+\end{codeexample}
+to install styles specifically for linear axes. These styles can contain both \Tikz- and \PGFPlots\ options.
+\end{environment}
+
+\begin{environment}{{semilogxaxis}\marg{options}}
+The axis environment for logarithmic scaling of~$x$ and normal scaling of~$y$.
+Use
+\begin{codeexample}[code only]
+\pgfplotsset{every semilogx axis/.append style={...}}
+\end{codeexample}
+to install styles specifically for the case with |xmode=log|, |ymode=normal|.
+\end{environment}
+
+\begin{environment}{{semilogyaxis}\marg{options}}
+The axis environment for normal scaling of~$x$ and logarithmic scaling of~$y$,
+
+The style `|every semilogy axis|' will be installed for each such plot.
+\end{environment}
+
+\begin{environment}{{loglogaxis}\marg{options}}
+The axis environment for logarithmic scaling of both, $x$~and~$y$ axes,
+As for the other axis possibilities, there is a style `|every loglog axis|' which is installed at the environment's beginning.
+\end{environment}
+
+\noindent
+They are all equivalent to
+\begin{codeexample}[code only]
+\begin{axis}[
+	xmode=log|normal,
+	ymode=log|normal]
 ...
 \end{axis}
-\end{lstlisting}
+\end{codeexample}
+\noindent
+with properly set variables `|xmode|' and `|ymode|' (see below).
+
+\subsection{The Plot Command}
+\label{sec:addplot}%
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[ymin=0,ymax=1,enlargelimits=false]
+\addplot
+	[blue!80!black,fill=blue,fill opacity=0.5] 
+coordinates
+{(0,0.1)    (0.1,0.15)  (0.2,0.5)   (0.3,0.62)
+ (0.4,0.56) (0.5,0.58)  (0.6,0.65)  (0.7,0.6)
+ (0.8,0.58) (0.9,0.55)  (1,0.52)} 
+|- (axis cs:0,0) -- cycle;
+
+\addplot
+	[red,fill=red!90!black,opacity=0.5]
+coordinates 
+{(0,0.25)   (0.1,0.27)  (0.2,0.24)  (0.3,0.24)
+ (0.4,0.26) (0.5,0.3)   (0.6,0.23)  (0.7,0.2)
+ (0.8,0.15) (0.9,0.1)   (1,0.1)}
+|- (axis cs:0,0) -- cycle;
+
+\addplot[green!20!black] coordinates
+	{(0,0.4) (0.2,0.75) (1,0.75)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot plot
+	[id=parable,domain=-5:5] 
+	function{4*x**2 - 5} 
+	node[pin=180:{$4x^2-5$}]{};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{command}{\addplot[\meta{style options}] \textcolor{gray}{plot[\meta{behavior options}]} \meta{input data} \meta{trailing path commands};}
+This is the main plotting command, available within each axis environment.
+
+It reads point coordinates from one of the available input sources specified by \meta{input data}, updates limits, remembers \meta{style options} for use in a legend (if any) and applies any necessary coordinate transformations (or logarithms).
+
+The \meta{style options} can be omitted in which case the next entry from the |cycle list| will be inserted as \meta{style options}. These keys characterize the plot's type like linear interpolation, smooth plot, constant interpolation or bar plot and define colors, markers and line specifications. 
+
+The optional \meta{behavior options} can be used to modify plot variants, for example to add error bars. They are described when needed.
+
+The \meta{input data} is one of several coordinate input tools which are described in more detail below. Finally, if |\addplot| successfully processed all coordinates from \meta{input data}, it generates \Tikz-drawing commands (for example |plot coordinate {...}|). If \meta{trailing path commands} is not empty, these arguments are appended to the final drawing command.
+
+\noindent
+Some more details:
+\begin{itemize}
+	\item The style |/pgfplots/every axis plot| will be installed at the beginning of \meta{style options}. That means you can use
+\begin{codeexample}[code only]
+\pgfplotsset{every axis plot/.append style={...}}
+\end{codeexample}
+	to add options to all your plots - maybe to set line widths to |thick|. Furthermore, if you have more than one plot inside of an axis, you can also use
+\begin{codeexample}[code only]
+\pgfplotsset{every axis plot no 3/.append style={...}}
+\end{codeexample}
+	to modify options for the plot with number~$3$ only. The first plot has number~$0$.
+	\item The \meta{style options} are remembered for the legend. Furthermore, they are available as `|current plot style|' as long as the path is not yet finished or in associated error bars.
+	\item See subsection~\ref{sec:markers} for a list of available markers and line styles.
+	\item For log plots, \PGFPlots\ will compute the natural logarithm $\log(\cdot)$ numerically. This works with normal fixed point numbers or in scientific notation. For example, the following numbers are valid input to \lstinline!\addplot!.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}
+\addplot coordinates {
+	(769,	1.6227e-04)
+	(1793,	4.4425e-05)
+	(4097,	1.2071e-05)
+	(9217,	3.2610e-06)
+	(2.2e5,	2.1E-6)
+	(1e6,	0.00003341)
+	(2.3e7,	0.00131415)
+};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+	You can represent arbitrarily small or very large numbers as long as its logarithm can be represented as a \TeX-length (up to about~$16384$). Of course, any coordinate~$x\le 0$ is not possible since the logarithm of a non-positive number is not defined. Such coordinates will be skipped automatically.
+
+	\item For normal plots, \PGFPlots\ applies floating point arithmetics to support large or small numbers like 0.00000001234 or $1.234\cdot 10^{24}$. Its number range is much larger than \TeX's native support for numbers. The relative precision is at least~$5$ significant decimal digits for the mantisse. As soon as the axes limits are completely known, \PGFPlots\ applies a transformation which maps these floating point numbers into \TeX-precision using transformations
+		\[ T_x(x) = 10^{s_x} \cdot x - a_x \text{ and } T_y(y) = 10^{s_y} \cdot y - a_y \]
+	with properly chosen integers $s_x, s_y \in \Z$ and shifts $a_x,a_y\in \R$. Section~\ref{sec:disabledatascaling} contains a description of |disabledatascaling| and provides more details about the transformation.
+
+	\item As a consequence of the coordinate parsing routines, you can't use the mathematical expression parsing method of \PGF\ as coordinates (that means: you will need to provide coordinates without suffixes like ``cm'' or ``pt'' and you can't invoke mathematical functions).
+	
+	\item If you did not specify axis limits for $x$ and $y$ manually, \lstinline!\addplot! will compute them automatically. 
+	The automatic computation of axis limits works as follows:
+		\begin{enumerate}
+			\item Every coordinate will be checked. Care has been taken to avoid \TeX's limited numerical capabilities.
+			\item Since more than one \lstinline!\addplot! command may be used inside an \lstinline!\begin{axis}...\end{axis}!, all drawing commands will be postponed until \lstinline!\end{axis}!.
+		\end{enumerate}
+\end{itemize}
+\end{command}
+
+\subsubsection{Providing Input Coordinates}
+
+\begin{addplotoperation}[noindex]{coordinates}{\marg{coordinate list}}
+The `|plot coordinates|' command is provided by \Tikz\ and reads its input data from a sequence of point coordinates.
+\begin{codeexample}[code only]
+\addplot plot coordinates {
+	(0,0)
+	(0.5,1)
+	(1,2)
+};
+\end{codeexample}
 
-\item The axis environment for logarithmic scaling of~$x$ and normal scaling of~$y$,
-\begin{lstlisting}
-\begin{semilogxaxis}
+You can also supply error coordinates (reliability bounds) if you are interested in error bars. Simply append the error coordinates with `|+- (|\marg{ex}|,|\marg{ey}|)|' to the associated coordinate:
+\begin{codeexample}[code only]
+\addplot plot coordinates {
+	(0,0)   +- (0.1,0)
+	(0.5,1) +- (0.4,0.2)
+	(1,2)
+	(2,5)   +- (1,0.1)
+};
+\end{codeexample}
+or 
+\begin{codeexample}[code only]
+\addplot plot coordinates {
+	(1300,1e-6) +- (0.1,0.2)
+	(2600,5e-7) +- (0.2,0.5)
+	(4000,1e-7) +- (0.1,0.01)
+};
+\end{codeexample}
+These error coordinates are only used in case of error bars, see section~\ref{sec:errorbars}. You will also need to configure whether these values denote absolute or relative errors.
+
+The coordinates as such can be numbers as |+5|, |-1.2345e3|, |35.0e2|, |0.00000123| or |1e2345e-8|. They are not limited to \TeX's precision.
+\end{addplotoperation}
+
+
+\begin{addplotoperation}[noindex]{file}{\marg{name}}
+\PGFPlots\ supports two ways to read plot coordinates of external files, and one of them is the \Tikz-command `|plot file|'. It is to be used like
+\begin{codeexample}[code only]
+\addplot plot file {datafile.dat};
+\end{codeexample}
+where \marg{name} is a text file with at least two columns which will be used as $x$ and $y$ coordinates. Such files are often generated by \textsc{gnuplot}:
+\begin{codeexample}[code only]
+#Curve 0, 20 points
+#x y type
+0.00000 0.00000 i
+0.52632 0.50235 i
+1.05263 0.86873 i
+1.57895 0.99997 i
 ...
-\end{semilogxaxis}
-\end{lstlisting}
+9.47368 -0.04889 i
+10.00000 -0.54402 i
+\end{codeexample}
+This listing has been copied from~\cite[section~16.4]{tikz}. The mentioned section also contains some more details about using |plot file|.
+\end{addplotoperation}
+
+\begin{addplotoperation}[noindex]{table}{[\meta{column selection}]\marg{file}}
+\PGFPlots\ comes with a new plotting command, the `|plot table|' macro. It's usage is similar in spirit to `|plot file|', but its flexibility is higher. Given a data file like
+\begin{codeexample}[code only]
+dof     L2              Lmax            maxlevel
+5       8.31160034e-02  1.80007647e-01  2
+17      2.54685628e-02  3.75580565e-02  3
+49      7.40715288e-03  1.49212716e-02  4
+129     2.10192154e-03  4.23330523e-03  5
+321     5.87352989e-04  1.30668515e-03  6
+769     1.62269942e-04  3.88658098e-04  7
+1793    4.44248889e-05  1.12651668e-04  8
+4097    1.20714122e-05  3.20339285e-05  9
+9217    3.26101452e-06  8.97617707e-06  10
+\end{codeexample}
+one may want to plot `|dof|' versus `|L2|' or `|dof|' versus `|Lmax|'. This can be done by
+\begin{codeexample}[code only]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	xlabel=Dof,
+	ylabel=$L_2$ error$]
+\addplot table[x=dof,y=L2] {datafile.dat};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+or
+\begin{codeexample}[code only]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	xlabel=Dof,
+	ylabel=$L_infty$ error$]
+\addplot table[x=dof,y=Lmax] {datafile.dat};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+Alternatively, you can load the table \emph{once} and use it \emph{multiple} times:
+\begin{codeexample}[code only]
+\pgfplotstableread{datafile.dat}\table
+...
+\addplot table[x=dof,y=L2] from \table;
+...
+\addplot table[x=dof,y=Lmax] from \table;
+...
+\end{codeexample}
+I am not really sure how much time can be saved, but it works anyway.
+
+If you do prefer to access columns by column indices instead of column names (or your tables do not have column names), you can also use
+\begin{codeexample}[code only]
+\addplot table[x index=2,y index=3] {datafile.dat};
+\addplot table[x=dof,y index=2] {datafile.dat};
+\end{codeexample}
 
-\item The axis environment for normal scaling of~$x$ and logarithmic scaling of~$y$,
-\begin{lstlisting}
+Summary and remarks:
+\begin{itemize}
+	\item Use |plot table[x=|\marg{column name}|,y=|\marg{column name}|]}| to access column names. Those names are case sensitive and need to exist.
+	\item Use |plot table[x index=|\marg{column index}|,y index=|\marg{column index}|]}| to access column indices. Indexing starts with~$0$. You may also use an index for~$x$ and a column name for~$y$.
+	\item Use |plot table[header=false] |\marg{file name} if your input file has no column names. Otherwise, the first non-comment line is checked for column names: if all entries are numbers, they are treated as numerical data; if one of them is not a number, all are treated as column names.
+	\item It is possible to read error coordinates from tables as well. Simply add options `|x error|', `|y error|' or `|x error index|'/`|y error index|' to \marg{source columns}. See section~\ref{sec:errorbars} for details about error bars.
+	\item Use |plot table[|\meta{source columns}|] from |\marg{\textbackslash macro} to use a pre--read table. Tables can be read using
+\begin{codeexample}[code only]
+\pgfplotstableread{datafile.dat}\macroname.
+\end{codeexample}
+	\item The accepted input format of those tables is as follows:
+		\begin{itemize}
+			\item Columns are usually separated by white spaces (at least one tab or space).
+
+			 If you need other column separation characters, you can use the 
+
+			\declare{col sep}|=|\mchoice{space,comma,colon,semicolon,braces} 
+
+			option which is documented in all detail in the manual for \PGFPlotstable\ which is part of \PGFPlots.
+			\item Any line starting with `\#' or `\%' is ignored.
+			\item The first line will be checked if it contains numerical data. If there is a column in the first line which is \emph{no} number, the complete line is considered to be a header which contains column names. Otherwise it belongs to the numerical data and you need to access column indices instead of names.
+
+			\item There is future support for a second header line which must start with `|$flags |'. Currently, such a line is ignored. It may be used to provide number formatting hints like precision and number format if those tables shall be typeset using |\pgfplotstabletypeset| (see the manual for \PGFPlotstable).
+			\item The accepted number format is the same as for `|plot coordinates|', see above.
+			\item If you omit column selectors, the default is to plot the first column against the second. That means |plot table| does exactly the same job as |plot file| for this case.
+		\end{itemize}
+\end{itemize}
+\end{addplotoperation}
+
+\begin{addplotoperation}[noindex]{function}{\marg{gnuplot code}}
+The plot function command uses the external program |gnuplot| to compute coordinates. The resulting coordinates are written to a text file which will be plotted with |plot file|. \PGF\ checks whether coordinates need to be re-generated and calls |gnuplot| whenever necessary (this is usually the case if you change the number of samples, the argument to |plot function| or the plotted domain\footnote{Please note that \PGFPlots\ produces slightly different files than \Tikz\ when used with |plot function| (it configures high precision output). You should use different ids to avoid conflicts in such a case.}).
+
+Since system calls are a potential danger, they need to be enabled explicitly using command line options, for example
+\begin{codeexample}[code only]
+pdflatex -shell-escape filename.tex.
+\end{codeexample}
+Sometimes it is called |shell-escape| or |enable-write18|.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot plot[id=sin] 
+	function{sin(x)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
 \begin{semilogyaxis}
-...
+\addplot plot[id=exp,domain=0:10] 
+	function{exp(x)};
 \end{semilogyaxis}
-\end{lstlisting}
+\end{tikzpicture}
+\end{codeexample}
 
-\item The axis environment for logarithmic scaling of both, $x$~and~$y$ axes,
-\begin{lstlisting}
-\begin{loglogaxis}
-...
+The \meta{style options} determine the appearance of the plotted function; these parameters also affect the legend. The \meta{behavior options} are specific to the gnuplot interface. These options are described in all detail in \cite[section~18.6]{tikz}. A short summary is shown below.
+\end{addplotoperation}
+
+\begin{key}{/tikz/domain=[\meta{start}:\meta{end}] (initially [-5:5])}
+	 Determines the plotted range. This is not necessarily the same as the axis limits (which are configured with the |xmin|/|xmax| options). 
+
+	 This option is also used for plot expression, see below.
+\end{key}
+
+\begin{key}{/tikz/id=\marg{unique string identifier}}
+	 A unique identifier for the current plot. It is used to generate temporary filenames for |gnuplot| output.
+\end{key}
+
+\begin{key}{/tikz/prefix=\marg{file name prefix}}
+	 A common path prefix for temporary filenames (see \cite[section~18.6]{tikz} for details).
+\end{key}
+
+\begin{key}{/tikz/samples=\marg{number}}
+	 Sets the number of sample points.
+\end{key}
+
+\begin{key}{/tikz/raw gnuplot}
+	 Disables the use of |samples| and |domain|.
+\end{key}
+
+\noindent
+Please refer to \cite[section~18.6]{tikz} for more details about |plot function| and the |gnuplot| interaction.
+
+\begin{addplotoperation}[noindex]{(\meta{$x$ expression},\meta{$y$ expression})}{}
+	Similar to |plot function|, this input method allows to provide expressions which will be sampled. But unlike |plot function|, the expressions are evaluated using the math parser of \PGF, no external program is required.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+	\addplot (\x,\x^2 + 4);
+	\addplot (\x,-5*\x^3 - \x^2);
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+The number of points and the sampled range is configured as for |plot function|, that means using |samples| and |domain|.
+
+Please note that \PGF's math parser uses degrees for trigonometric functions:
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+	\addplot plot[domain=0:360]
+		(\x,{sin(\x)});
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+the braces are necessary to delimit the $y$ argument here. If you want to use radians, use 
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+	\addplot plot[domain=-3.14159:3.14159] 
+		(\x,{sin(\x r)});
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+to convert the radians to degrees. The \Tikz\ plot expression parser also accepts some more options like |samples at=|\marg{coordinate list} or |variable=\t| which are described in the \Tikz\ manual.
+\end{addplotoperation}
+
+\begin{command}{\addplot+[\meta{style options}] \textcolor{gray}{\dots};}
+Does the same like |\addplot[|\meta{style options}|] ...;| except that \meta{style options} is \emph{appended} to the arguments which would have been taken for \lstinline!\addplot ...! (the element of the default list).
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot (\x,{sin(\x r)});
+\end{axis}
+\end{tikzpicture}
+
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[only marks] (\x,{sin(\x r)});
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{command}
+
+\subsection{Accessing Axis Coordinates for Annotations}
+\label{sec:axis:coords}%
+\begin{coordinatesystem}{axis cs}
+\PGFPlots\ provides a new coordinate system for use inside of an axis, the ``axis coordinate system'', |axis cs|.
+
+It can be used to draw any \Tikz-graphics at axis coordinates. It is used like
+\begin{codeexample}[code only]
+\draw 
+   (axis cs:18943,2.873391e-05) 
+|- (axis cs:47103,8.437499e-06);
+\end{codeexample}
+\begin{codeexample}[]
+\tikzstyle{every pin}=[fill=white,
+	draw=black,
+	font=\footnotesize]
+\begin{tikzpicture}
+	\begin{loglogaxis}[
+		xlabel={\textsc{Dof}},
+		ylabel={$L_2$ Error}]
+
+	\addplot coordinates {
+		(11,     6.887e-02)
+		(71,     3.177e-02)
+		(351,    1.341e-02)
+		(1471,   5.334e-03)
+		(5503,   2.027e-03)
+		(18943,  7.415e-04)
+		(61183,  2.628e-04)
+		(187903, 9.063e-05)
+		(553983, 3.053e-05)
+	};
+
+	\node[coordinate,pin=above:Bad!] 
+		at (axis cs:5503,2.027e-03) {};
+	\node[coordinate,pin=left:Good!] 
+		at (axis cs:187903,9.063e-05)	{};
+	\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	xlabel=\textsc{Dof},
+	ylabel=$L_2$ Error
+]
+\draw 
+		(axis cs:1793,4.442e-05)
+	|-  (axis cs:4097,1.207e-05)
+	node[near start,left] 
+	{$\frac{dy}{dx} = -1.58$};
+
+\addplot coordinates {
+	(5,    8.312e-02)
+	(17,   2.547e-02)
+	(49,   7.407e-03)
+	(129,  2.102e-03)
+	(321,  5.874e-04)
+	(769,  1.623e-04)
+	(1793, 4.442e-05)
+	(4097, 1.207e-05)
+	(9217, 3.261e-06)
+};
 \end{loglogaxis}
-\end{lstlisting}
-\end{enumerate}
-They are all equivalent to
-\begin{lstlisting}
+\end{tikzpicture}
+\end{codeexample}
+
+\paragraph{Attention:} Whenever you draw additional graphics, consider using |axis cs|! It applies any logarithms, data scaling transformations or whatever \PGFPlots\ usually does!
+\end{coordinatesystem}
+
+\begin{predefinednode}{current plot begin}
+	This coordinate will be defined for every plot and can be used is \meta{trailing path commands} or after a plot. It is the first coordinate of the current plot.	
+\end{predefinednode}
+
+\begin{predefinednode}{current plot end}
+	This coordinate will be defined for every plot. It is the last coordinate of the current plot.	
+\end{predefinednode}
+
+\subsection{Legend Commands}
+
+\begin{command}{\addlegendentry\marg{name}}
+Adds a single legend entry to the legend list. This will also enable legend drawing.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot[smooth,mark=*,blue] coordinates {
+	(0,2)
+	(2,3)
+	(3,1)
+};
+\addlegendentry{Case 1}
+
+\addplot[smooth,color=red,mark=x]
+	coordinates {
+		(0,0)
+		(1,1)
+		(2,1)
+		(3,2)
+	};
+\addlegendentry{Case 2}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+It does not matter where |\addlegendentry| commands are placed, only the sequence matters. You will need one |\addlegendentry| for every |\addplot| command.
+
+
+Optional argument are accepted with|\addlegendentry|[\meta{key-value-list}]|{...}|. This does mainly affect some keys affecting the legend layout, support is very limited.
+\end{command}
+
+
+
+\label{sec:legenddef}%
+\begin{command}{\legend\marg{list}}
+You can use |\legend|\marg{list} to assign a complete legend.
+\begin{codeexample}[code only]
+\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+\end{codeexample}
+The argument of |\legend| is a comma--separated list of entries, one for each plot. It is processed using the \PGF-foreach command\footnote{Older versions of \PGFPlots\ used \texttt{\textbackslash legend\{first\textbackslash\textbackslash second\textbackslash\textbackslash third\textbackslash\textbackslash\}} instead of comma--separated lists. This syntax is still accepted.}.
+The short marker/line combination shown in legends is acquired from the \marg{style options} argument of |\addplot|.
+\end{command}
+
+\subsubsection{Legend Appearance}
+{%
+\pgfplotsset{every axis/.append style={width=3cm,scale only axis,legend style={font=\footnotesize}}}%
+\begin{stylekey}{/pgfplots/every axis legend}
+The style ``|every axis legend|'' determines the legend's position and outer appearance:
+\begin{codeexample}[code only]
+\pgfplotsset{every axis legend/.append style={
+		at={(0,0)},
+		anchor=south west}}
+\end{codeexample}
+will draw it at the lower left corner of the axis while
+\begin{codeexample}[code only]
+\pgfplotsset{every axis legend/.append style={
+		at={(1,1)},
+		anchor=north east}}
+\end{codeexample}
+means the upper right corner. The `|anchor|' option determines which point \emph{of the legend} will be placed at $(0,0)$ or $(1,1)$.
+
+The legend is a \Tikz-matrix, so you can use any \Tikz\ option which affects
+nodes and matrizes (see~\cite[section 13~and~14]{tikz}). The matrix is created by something like
+\begin{codeexample}[code only]
+\matrix[style=every axis legend] {
+	draw plot specification 1 & \node{legend 1}\\
+	draw plot specification 2 & \node{legend 2}\\
+	...
+};
+\end{codeexample}
+
+\begin{codeexample}[]
+\pgfplotsset{every axis legend/.append style={
+		at={(1.02,1)},
+		anchor=north west}}
+\begin{tikzpicture}
+\begin{axis}
+\addplot coordinates {(0,0) (1,1)};
+\addplot coordinates {(0,1) (1,2)};
+\addplot coordinates {(0,2) (1,3)};
+\legend{$l_1$,$l_2$,$l_3$}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+Use |legend columns=|\marg{number} to configure the number of horizontal legend entries.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfplotsset{every axis legend/.append style={
+		at={(0.5,1.03)},
+		anchor=south}}
+\begin{axis}[legend columns=4]
+\addplot coordinates {(0,0) (1,1)};
+\addplot coordinates {(0,1) (1,2)};
+\addplot coordinates {(0,2) (1,3)};
+\legend{$l_1$,$l_2$,$l_3$}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\noindent
+Instead of the |.append style|, you can also use |legend style| as in the following example. It has the same effect.
+
+\begin{codeexample}[]
+\begin{tikzpicture}
 \begin{axis}[
-	xmode=log|normal,
-	ymode=log|normal]
+	legend style={
+		at={(1,0.5)},
+		anchor=east}]
+\addplot coordinates {(0,0) (1,1)};
+\addplot coordinates {(0,1) (1,2)};
+\addplot coordinates {(0,2) (1,3)};
+\legend{$l_1$,$l_2$,$l_3$}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\noindent
+The default |every axis legend| style is
+\begin{codeexample}[code only]
+\pgfplotsset{every axis legend/.style={%
+	cells={anchor=center},
+	inner xsep=3pt,inner ysep=2pt,nodes={inner sep=2pt,text depth=0.15em},
+	anchor=north east,%
+	shape=rectangle,%
+	fill=white,%
+	draw=black,
+	at={(0.98,0.98)}
+}}
+\end{codeexample}
+\paragraph{Attention:} you should \emph{not reset} the default style to stay compatible with future versions. If possible, use
+\begin{codeexample}[code only]
+\pgfplotsset{every axis legend/.append style={...}}
+\end{codeexample}
+\end{stylekey}
+
+}
+
+
+\begin{command}{\autoplotspeclist}
+This command should no longer be used, although it will be kept as technical implementation detail. Please use the `|cycle list|' option, section~\ref{sec:cycle:list}.
+\end{command}
+
+\begin{command}{\pgfmathlogtologten\meta{number}}
+Assigns the result of $\meta{number}/\log(10)$ to \lstinline!\pgfmathresult!.
+\end{command}
+
+\begin{command}{\logten}
+Expands to the constant $\log(10)$. Useful for logplots because $\log(10^i) = i\log(10)$. This command is only available inside of an \Tikz-picture.
+\end{command}
+
+\begin{command}{\pgfmathprintnumber\marg{number}}
+Generates pretty--printed output\footnote{This method was previously \texttt{\textbackslash prettyprintnumber}. It's functionality has been included into \PGF\ and the old command is now deprecated.} for \marg{number}. This method is used for every tick label.
+
+The number is printed using the current number printing options, see section~\ref{sec:number:printing} for the different number styles, rounding precision and rounding methods.
+\end{command}
+
+\subsection{Closing Plots}
+\begin{command}{\closedcycle}
+	Provide |\closedcycle| as \meta{trailing path commands} after |\addplot| to draw a closed line from the last plot coordinate to the first one.
+	
+	Use |\closedcycle| whenevery you intend to fill the area under a plot.
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}
+	\addplot (\x,\x^2+2) \closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}
+	\addplot+[fill] (\x,\x^2+2) \closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	In case of stacked plots, |\closedcycle| connects the current plot with the previous plot instead of connecting with the $x$~axis\footnote{The implementation for stacked plots requires some additional logic to determine the filled area: \lstinline{\\closedcycle} will produce a \lstinline!plot coordinates! command with \emph{reversed} coordinates of the previous plot. This is usually irrelevant for end users, but it assumes that the plot's type is symmetric. Since constant plots are inherently unsymmetric, \lstinline{\\closedcycle} will use \texttt{const plot mark right} as reversed sequence for \texttt{const plot mark left}.}.
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[stack plots=y]
+	\addplot+[fill] coordinates 
+		{(0,1) (1,1) (2,2) (3,2)} \closedcycle;
+	\addplot+[fill] coordinates 
+		{(0,1) (1,1) (2,2) (3,2)} \closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{command}
+
+\subsection{Other Commands}
+\begin{command}{\plotnum}
+	Inside of |\addplot| or any associated style, option or command, |\plotnum| expands to the current plot's number, starting with~$0$.
+\end{command}
+
+\begin{command}{\numplots}
+	Inside of any of the axis environments, associated style, option or command, |\numplots| expands to the total number of  plots.
+\end{command}
+
+\begin{command}{\coordindex}
+	Inside of an |\addplot| command, this macro expands to the number of the actual coordinate (starting with~$0$).
+
+	It is useful together with |x filter| or |y filter| to (de-)select coordinates.
+\end{command}
+
+\begin{command}{\pgfplotstableread\marg{file}}
+	Please refer to the manual of \PGFPlotstable, |pgfplotstable.pdf|, which is part of the \PGFPlots-bundle.
+\end{command}
+\begin{command}{\pgfplotstabletypeset\marg{\textbackslash macro}}
+	Please refer to the manual of \PGFPlotstable, |pgfplotstable.pdf|, which is part of the \PGFPlots-bundle.
+\end{command}
+\begin{command}{\pgfplotstabletypesetfile\marg{file}}
+	Please refer to the manual of \PGFPlotstable, |pgfplotstable.pdf|, which is part of the \PGFPlots-bundle.
+\end{command}
+
+\section{Option Reference}
+There are several required and even more optional arguments to modify axes. They are used like
+\begin{codeexample}[code only]
+\begin{tikzpicture}
+\begin{axis}[key=value,key2=value2]
 ...
 \end{axis}
-\end{lstlisting}
-with properly set variables `\texttt{xmode}' and `\texttt{ymode}' (see below).
+\end{tikzpicture}
+\end{codeexample}
+\noindent
+The overall appeareance can be changed with
+\begin{codeexample}[code only]
+\pgfplotsset{every axis/.append style={line width=1pt}}
+\end{codeexample}
+\noindent
+for example. There are several other styles predefined to modify the appearance, see section~\ref{sec:styles}.
+
+\subsection{Pgfplots Options and \Tikz\ Options}
+This section is more or less technical and can be skipped unless one really wants to know more about this topic.
+
+\Tikz\ options and \PGFPlots\ options can be mixed inside of the axis arguments and in any of the associated styles. For example,
+\begin{codeexample}[code only]
+\pgfplotsset{every axis legend/.append style={
+	legend columns=3,font=\Large}}
+\end{codeexample}
+\noindent
+assigns the `|legend columns|' option (a pgfplots option) and uses `|font|' for drawing the legend (a \Tikz\ option).
 
-\subsection{Available markers}
+The axis environments will process any known pgfplots options, and all `|every|'--styles will be parsed for pgfplots options. Every unknown option is supposed to be a \Tikz\ option and will be forward to the associated \Tikz\ drawing commands. For example, the `\lstinline{font=\Large}' above will be used as argument to the legend matrix, and the `\lstinline{font=\Large}' argument in 
+\begin{codeexample}[code only]
+\pgfplotsset{every axis label/.append style={
+	ylabel=Error,xlabel=Dof,font=\Large}}
+\end{codeexample}
+will be used in the nodes for axis labels (but not the axis title, for example).
+
+It is an error if you assign incompatible options to axis labels, for example `|xmin|' and `|xmax|' can't be set inside of `|every axis label|'.
+
+
+\subsection{Plot Types}
+\PGFPlots\ supports several two-dimensional line-plots like piecewise linear line plots, piecewise constant plots, smoothed plots, bar plots and comb plots. Most of them use the \PGF\ plot handler library directly, see \cite[section 18.8]{tikz}.
+
+Plot types are part of the plot style, so they are set with options. The following list contains a short summary of the \PGF\ plot library, \cite[section 18.8]{tikz}.
+
+
+\subsubsection{Linear Plots}
+\begin{plottype}{sharp plot}
+Linear (`sharp') plots are the default. Point coordinates are simply connected by straight lines. 
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+	\addplot+[sharp plot] coordinates 
+		{(0,0) (1,2) (2,3)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+The `|+|' here means to use the normal plot cycle list and append `|sharp plot|' to its option list.
+\end{plottype}
+
+\subsubsection{Smooth Plots}
+\begin{plottype}{smooth}
+Smooth plots interpolate smoothly between successive points.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+	\addplot+[smooth] coordinates 
+		{(0,0) (1,2) (2,3)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\subsubsection{Constant Plots}
+Constant plots draw lines parallel to the $x$-axis to connect coordinates. The discontinuos edges may be drawn or not, and marks may be placed on left or right ends.
+
+\begin{plottype}{const plot}
+Connects all points with horizontal and vertical lines. Marks are placed left-handed on horizontal line segments, causing the plot to be right-sided continuous at all data points.
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[const plot]
+coordinates
+{(0,0.1)    (0.1,0.15)  (0.2,0.5)   (0.3,0.62)
+ (0.4,0.56) (0.5,0.58)  (0.6,0.65)  (0.7,0.6)
+ (0.8,0.58) (0.9,0.55)  (1,0.52)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[ymin=0,ymax=1,enlargelimits=false]
+\addplot
+	[const plot,fill=blue,draw=black] 
+coordinates
+{(0,0.1)    (0.1,0.15)  (0.2,0.5)   (0.3,0.62)
+ (0.4,0.56) (0.5,0.58)  (0.6,0.65)  (0.7,0.6)
+ (0.8,0.58) (0.9,0.55)  (1,0.52)} 
+	\closedcycle;
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{plottype}{const plot mark left}
+An alias for `|const plot|'.
+\end{plottype}
+
+\begin{plottype}{const plot mark right}
+ A variant which places marks on the right of each line segment, causing plots to be left-sided continuous at coordinates.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[const plot mark right]
+coordinates
+{(0,0.1)    (0.1,0.15)  (0.2,0.5)   (0.3,0.62)
+ (0.4,0.56) (0.5,0.58)  (0.6,0.65)  (0.7,0.6)
+ (0.8,0.58) (0.9,0.55)  (1,0.52)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{plottype}{jump mark left}
+A variant of `|const plot mark left|' which does not draw vertical lines.
+\begin{codeexample}[]
+\begin{tikzpicture}[samples=8]
+\begin{axis}
+\addplot+[jump mark left] 
+	plot[id=parablex,domain=-5:0] 
+	function{4*x**2 - 5};
+
+\addplot+[jump mark right] 
+	plot[id=cubic,domain=-5:0] 
+	function{0.7*x**3 + 50};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{plottype}{jump mark right}
+A variant of `|const plot mark right|' which does not draw vertical lines.
+\end{plottype}
+
+\subsubsection{Bar Plots}
+Bar plots place horizontal or vertical bars at coordinates. Multiple bar plots in one axis can be stacked on top of each other or aligned next to each other.
+
+\begin{plottype}{xbar}
+	Places horizontal bars between the $(y=0)$ line and each coordinate.
+
+	This option is used on a per-plot basis and configures only the visualization of coordinates. The figure-wide style |/pgfplots/xbar| also sets reasonable options for ticks, legends and multiple plots.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[xbar] coordinates 
+	{(4,0) (1,1) (2,2) 
+	 (5,3) (6,4) (1,5)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	Bars are centered at plot coordinates with width |bar width|. Using bar plots usually means more than just a different way of how to connect coordinates, for example to draw ticks outside of the axis, change the legend's appearance or introduce shifts if multiple |\addplot| commands appear.
+
+	There is a preconfigured style for |xbar| which is installed automatically if you provide |xbar| as argument to the axis environment which provides this functionality.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[xbar,enlargelimits=0.15]
+\addplot
+[draw=blue,pattern=horizontal lines light blue] 
+coordinates
+	{(10,5) (15,10) (5,15) (24,20) (30,25)};
+
+\addplot
+[draw=black,pattern=horizontal lines dark blue] 
+coordinates 
+	{(3,5) (5,10) (15,15) (20,20) (35,25)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+Here |xbar| yields |/pgfplots/xbar| because it is an argument to the axis, not to a single plot.
+
+	Besides line-, fill- and colorstyles, bars can be configured with |bar width| and |bar shift|, see below.
+\end{plottype}
+
+\begin{stylekey}{/pgfplots/xbar=\marg{shift for multiple plots} (default 2pt)}
+	This style sets |/tikz/xbar| \emph{and} some commonly used options concerning horizontal bars for the complete axis. This is automatically done if you provide |xbar| as argument to an axis argument, see above.
+
+The |xbar| style defines shifts if multiple plots are placed into one axis. If draws bars adjacent to each other, separated by \marg{shift for multiple plots}. Furthermore, it sets the style |bar cycle list| and sets tick and legend appearance options.
+
+The style is defined as follows.
+\begin{codeexample}[code only]
+/pgfplots/xbar/.style={
+	bar cycle list,
+	tick align=outside,
+	/pgfplots/legend image code/.code=
+		{\draw[##1,bar width=3pt,yshift=-0.2em,bar shift=0pt]
+			plot coordinates {(0cm,0.8em) (2*\pgfplotbarwidth,0.6em)};},
+	/pgf/bar shift={%
+			-0.5*(\numplots*\pgfplotbarwidth + (\numplots-1)*#1)  + 
+			(.5+\plotnum)*\pgfplotbarwidth + \plotnum*#1},
+	/tikz/xbar},
+\end{codeexample}
+The formular for |bar shift| assigns shifts dependend on the total number of plots and the current plot's number. It is designed to fill a total width of $n \cdot $|bar width|$ + (n-1) \cdot $\marg{shift for multiple plots}. The $0.5$ compensates for centering.
+\end{stylekey}
+
+\begin{plottype}{ybar}
+	Like |xbar|, this option generates bar plots. It draws vertical bars between the ($x=0$) line and each input coordinate.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[ybar] plot coordinates
+	{(0,3) (1,2) (2,4) (3,1) (4,2)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	The example above simply changes how input coordinates shall be visualized. As mentioned for |xbar|, one usually needs modified legends and shifts for multiple bars in the same axis.
+
+	There is a predefined style which installs these customizations when provided to the axis-environment:
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	x tick label style={
+		/pgf/number format/1000 sep=},
+	ylabel=Population,
+	enlargelimits=0.15,
+	legend style={at={(0.5,-0.15)},
+		anchor=north,legend columns=-1},
+	ybar,
+	bar width=7pt,
+]
+\addplot 
+	coordinates {(1930,50e6) (1940,33e6)
+		 (1950,40e6) (1960,50e6) (1970,70e6)};
+
+\addplot 
+	coordinates {(1930,38e6) (1940,42e6) 
+		(1950,43e6) (1960,45e6) (1970,65e6)};
+
+\addplot 
+	coordinates {(1930,15e6) (1940,12e6) 
+		(1950,13e6) (1960,25e6) (1970,35e6)};
+\legend{Far,Near,Here}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+Here |ybar| yields |/pgfplots/ybar| because it is an argument to the axis, not to a single plot.
+
+	As for |xbar|, the bar width and shift can be configured with |bar width| and |bar shift|.
+\end{plottype}
+
+\begin{stylekey}{/pgfplots/ybar=\marg{shift for multiple plots} (default 2pt)}
+	As |/pgfplots/xbar|, this style sets the |/tikz/ybar| option to draw vertical bars, but it also provides commonly used options for vertical bars.
+
+	If you supply |ybar| to an axis environment, |/pgfplots/ybar| will be chosen instead of |/tikz/ybar|.
+
+	It changes the legend, draws ticks outside of the axis lines and draws multiple |\addplot| arguments adjacent to each other; block--centered at the $x$ coordinate and separated by \marg{shift for multiple plots}. Furthermore, it installs the style |bar cycle list|. It is defined similarly to |/pgfplots/xbar|.
+\end{stylekey}
+
+\begin{key}{/tikz/bar width=\marg{dimension} (initially 10pt)}
+	Configures the width used by |xbar| and |ybar|. It is accepted to provide mathematical expressions.
+\end{key}
+
+\begin{key}{/tikz/bar shift=\marg{dimension} (initially 0pt)}
+	Configures a shift for |xbar| and |ybar|. Use |bar shift| together with |bar width| to draw multiple bar plots into the same axis. It is accepted to provide mathematical expressions.
+\end{key}
+
+
+\begin{plottype}{ybar interval}
+	This plot type produces vertical bars with width (and shift) relatively to intervals of coordinates.
+
+	It is installed on a per-plot basis and configures \emph{only} the visualization of coordinates. See the style |/pgfplots/ybar interval| which configures the appearance of the complete figure.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[ybar interval] plot coordinates
+	{(0,2) (0.1,1) (0.3,0.5) (0.35,4) (0.5,3)
+	 (0.6,2) (0.7,1.5) (1,1.5)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[ybar interval,
+	xtick=data,
+	xticklabel interval boundaries,
+	x tick label style=
+		{rotate=90,anchor=east}
+	]
+\addplot coordinates
+	{(0,2) (0.1,1) (0.3,0.5) (0.35,4) (0.5,3)
+	 (0.6,2) (0.7,1.5) (1,1.5)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	x tick label style={
+		/pgf/number format/1000 sep=},
+	ylabel=Population,
+	enlargelimits=0.05,
+	legend style={at={(0.5,-0.1)},
+		anchor=north,legend columns=-1},
+	ybar interval=0.7,
+]
+\addplot 
+	coordinates {(1930,50e6) (1940,33e6)
+		 (1950,40e6) (1960,50e6) (1970,70e6)};
+
+\addplot 
+	coordinates {(1930,38e6) (1940,42e6) 
+		(1950,43e6) (1960,45e6) (1970,65e6)};
+
+\addplot 
+	coordinates {(1930,15e6) (1940,12e6) 
+		(1950,13e6) (1960,25e6) (1970,35e6)};
+\legend{Far,Near,Here}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{stylekey}{/pgfplots/ybar interval=\marg{relative width} (default 1)}
+	A style which is intended to install options for |ybar interval| for a complete figure. This includes tick and legend appearance, management of multiple bar plots in one figure and a more adequate |cycle list| using the style |bar cycle list|.
+\end{stylekey}
+
+\begin{plottype}{xbar interval}
+	As |ybar interval|, just for horizontal bars. 
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	xmin=0,xmax=53,
+	ylabel=Age,
+	xlabel=Quantity,
+	y label style={yshift=0.7cm},
+	enlargelimits=false,
+	ytick=data,
+	yticklabel interval boundaries,
+	xbar interval,
+]
+\addplot
+	coordinates {(10,5) (10.5,10) (15,13) 
+		(24,18) (50,21) (23,25) (10,30) 
+		(3,50) (3,70)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{stylekey}{/pgfplots/xbar interval=\marg{relative width} (default 1)}
+	A style which is intended to install options for |xbar interval| for a complete figure, see the style |/pgfplots/ybar interval| for details.
+\end{stylekey}
+
+\begin{pgfplotsxykey}{\x ticklabel interval boundaries}
+	These are style keys which set |x tick label as interval| and configure the tick appearance to be \marg{start} -- \marg{end} for each tick interval.
+\end{pgfplotsxykey}
+
+\subsubsection{Comb Plots}
+Comb plots are very similar to bar plots except that they emplot single horizontal/vertical lines instead of rectangles.
+
+\begin{plottype}{xcomb}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[xcomb] coordinates 
+	{(4,0) (1,1) (2,2) 
+	 (5,3) (6,4) (1,5)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\begin{plottype}{ycomb}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot+[ycomb] plot coordinates
+	{(0,3) (1,2) (2,4) (3,1) (4,2)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{plottype}
+
+\subsubsection{Stacked Plots}
+\begin{pgfplotskey}{stack plots=\mchoice{x,y,false} (initially false)}
+	Allows stacking of plots in either $x$ or $y$ direction. Stacking means add either $x$- or $y$ coordinates of successive |\addplot| commands on top of each other.
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[stack plots=y]
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)};
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+|stack plots| is particularly useful for bar plots. The following examples demonstrate its functionality. Normally, it is advisable to use the styles |ybar stacked| and |xbar stacked| which also set some other options.
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[stack plots=y,/tikz/ybar]
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[ybar stacked]
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\addplot coordinates
+		{(0,1) (1,1) (2,3) (3,2) (4,1.5)};
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[stack plots=x,/tikz/xbar]
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+
+\begin{tikzpicture}
+	\begin{axis}[xbar stacked]
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\addplot coordinates
+		{(1,0) (2,1) (2,2) (3,3)};
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{stack dir=\mchoice{plus,minus} (initially plus)}
+	Configures the direction of |stack plots|. The value |plus| will adds coordinates of successive plots while |minus| subtracts them.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{reverse stacked plots=\mchoice{true,false} (initially true, default true)}
+	Configures the sequence in which stacked plots are drawn. This is more or less a technical detail which should not be changed in any normal case.
+
+	The motivation is as follows: suppose multiple |\addplot| commands are stacked on top of each other and they are processed in the order of appearance. Than, the second plot could easily draw its lines (or fill area) on top of the first one - hiding its marker or line completely. Therefor, \PGFPlots\ reverses the sequence of drawing commands.
+
+	This has the side-effect that any normal \Tikz-paths inside of an axis will also be processed in reverse sequence.
+\end{pgfplotskey}
+
+\begin{stylekey}{/pgfplots/xbar stacked=\mchoice{plus,minus} (default plus)}
+	A figure-wide style which enables stacked horizontal bars (i.e. |xbar| and |stack plots=x|). It also adjusts the legend and tick appearance and assigns a useful |cycle list|.
+\end{stylekey}
+\begin{stylekey}{/pgfplots/ybar stacked=\mchoice{plus,minus} (default plus)}
+	A figure-wide style which enables stacked vertical bars (i.e. |ybar| and |stack plots=y|). It also adjusts the legend and tick appearance and assigns a useful |cycle list|.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/xbar interval stacked=\mchoice{plus,minus} (default plus)}
+	A sttyle similar to |/pgfplots/xbar stacked| for the interval based bar plot variant.
+\end{stylekey}
+\begin{stylekey}{/pgfplots/ybar interval stacked=\mchoice{plus,minus} (default plus)}
+	A sttyle similar to |/pgfplots/ybar stacked| for the interval based bar plot variant.
+\end{stylekey}
+
+\subsubsection{Area Plots}
+Area plots are a combination of |\closedcycle| and |stack plots|. They can be combined with any other plot type.
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[
+		stack plots=y,
+		area cycle list]
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)} 
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[
+		const plot,
+		stack plots=y,
+		area cycle list]
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)} 
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[
+		smooth,
+		stack plots=y,
+		area cycle list]
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)} 
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\addplot coordinates
+		{(0,1) (1,1) (2,2) (3,2)}
+		\closedcycle;
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\pgfplotstableread{pgfplots.timeseries.dat}\table
+\pgfplotstabletypeset\table
+\end{codeexample}
+\begin{codeexample}[]
+\pgfplotstableread
+	{pgfplots.timeseries.dat}
+	{\table}
+
+\begin{tikzpicture}
+	\begin{axis}[
+		ymin=0,ymax=210,
+		minor tick num=4,
+		enlargelimits=false,
+		tick align=outside,
+		every axis plot post/.append style=
+			{mark=none},
+		const plot,
+		legend style={
+			at={(0.5,-0.15)},
+			anchor=north,
+			legend columns=-1}]
+
+	\addplot[draw=blue,fill=blue!30!white]
+	 table[x=time,y=1minload] from \table
+		\closedcycle;
+	\addplot table[x=time,y=nodes] from \table;
+	\addplot table[x=time,y=cpus] from \table;
+	\addplot table[x=time,y=processes] 
+		from \table;
+	\legend{1min load,nodes,cpus,processes}
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[width=4cm]
+\pgfplotstableread{pgfplots.timeseries.dat}\table
+
+\begin{tikzpicture}
+	\begin{axis}[
+		ymin=0,ymax=160,
+		minor tick num=4,
+		enlargelimits=false,
+		tick align=outside,
+		const plot,
+		stack plots=y,
+		cycle list={%
+			{blue!70!black,fill=blue},%
+			{green,fill=green!50!black},%
+			{green!30!white,fill=green!80!white},%
+			{red,thick}%
+		},
+		ylabel={Mem [GB]},
+		legend style={
+			at={(0.5,-0.15)},
+			anchor=north,
+			legend columns=2}]
+
+	\addplot table[x=time,y=memused]      from \table \closedcycle;
+	\addplot table[x=time,y=memcached]    from \table \closedcycle;
+	\addplot table[x=time,y=membuf]       from \table \closedcycle;
+	\addplot plot[/pgfplots/stack plots=false]
+			 table[x=time,y=memtotal]     from \table;
+	\legend{Memory used,Memory cached,Memory buffered,Total memory}
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\subsection{Markers and Linestyles}
 \label{sec:markers}%
-The following options of \Tikz\ may be useful for plots.
+The following options of \Tikz\ are available to plots.
 \subsubsection{Markers}
 This list is copied from~\cite[section~29]{tikz}:
 \begingroup
@@ -70,12 +1311,12 @@ This list is copied from~\cite[section~29]{tikz}:
 	\item[mark=*] \showit{mark=*}
 	\item[mark=x] \showit{mark=x}
 	\item[mark=+] \showit{mark=+}
-	\item[mark=ball] \showit{mark=ball}
+%	\item[mark=ball] \showit{mark=ball}
 \end{longdescription}
 And with \lstinline!\usetikzlibrary{plotmarks}!:
 \begin{longdescription}
 	\item[mark=$-$] \showit{mark=-}
-	\item[mark=$|$] \showit{mark=|}
+	\item[mark=$\vert$] \showit{mark=|}
 	\item[mark=o] \showit{mark=o}
 	\item[mark=asterisk] \showit{mark=asterisk}
 	\item[mark=star] \showit{mark=star}
@@ -93,7 +1334,7 @@ And with \lstinline!\usetikzlibrary{plotmarks}!:
 	\item[mark=pentagon*] \showit{mark=pentagon*}
 \end{longdescription}
 All these options have been drawn with the additional options
-\begin{lstlisting}
+\begin{codeexample}[code only]
 \draw[
 	gray,
 	thin,
@@ -101,9 +1342,9 @@ All these options have been drawn with the additional options
 		scale=2,fill=yellow!80!black,draw=black
 	}
 ]
-\end{lstlisting}
+\end{codeexample}
 
-\subsubsection{Line styles}
+\subsubsection{Line Styles}
 \def\showit#1{%
 	\tikz\draw[%
 		black,
@@ -111,563 +1352,1090 @@ All these options have been drawn with the additional options
 		#1]
 	plot coordinates {(0,0) (1,1) (2,0) (3,1)};%
 }%
-The following line styles are predefined in \Tikz:
-\begin{longdescription}
-	\item[style=solid] \showit{style=solid}
-	\item[style=dotted] \showit{style=dotted}
-	\item[style=densely dotted] \showit{style=densely dotted}
-	\item[style=loosely dotted] \showit{style=loosely dotted}
-	\item[style=dashed] \showit{style=dashed}
-	\item[style=densely dashed] \showit{style=densely dashed}
-	\item[style=loosely dashed] \showit{style=loosely dashed}
-\end{longdescription}
-You may need the option \lstinline!mark options={solid}! to avoid dotted or dashed marker boundaries. The string ``\texttt{style=}'' can be omitted.
+The following line styles are predefined in \Tikz.
+\begin{stylekey}{/tikz/solid}
+	 \showit{style=solid}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/dotted}
+	 \showit{style=dotted}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/densely dotted}
+	 \showit{style=densely dotted}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/loosely dotted}
+	 \showit{style=loosely dotted}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/dashed}
+	 \showit{style=dashed}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/densely dashed}
+	 \showit{style=densely dashed}
+\end{stylekey}
+
+\begin{stylekey}{/tikz/loosely dashed}
+	 \showit{style=loosely dashed}
+\end{stylekey}
+You may need the option \lstinline!mark options={solid}! to avoid dotted or dashed marker boundaries.
 \endgroup
 
-\subsection{\texttt{\textbackslash addplot[OPTIONS] PATH}}
-This is the main plotting command. It is used as
-\begin{lstlisting}
-\addplot 
-	plot coordinates {
-		(0,0)
-		(1,1)
-	};
-\end{lstlisting}
-or
-\begin{lstlisting}
-\addplot[color=blue,mark=*]
-	plot coordinates {
-		(0,0)
-		(1,1)
-	};
-\end{lstlisting}
-The first syntax chooses the next unused plot specification of the list \lstinline!\autoplotspeclist! (see below) and the second syntax specifies a plot specification explicitly. This specification will be used inside of the legend (if any).
+\subsubsection{Font Size and Line Width}
+Often, one wants to change line width and font sizes for plots. This can be done using the following options of \Tikz.
+
+\begin{key}{/tikz/font=\marg{font name} (initially \textbackslash normalfont)}
+	Sets the font which is to be used for text in nodes (like tick labels, legends or descriptions).
+\end{key}
+
+\begin{key}{/tikz/line width=\marg{dimension} (initially 0.4pt)}
+	Sets the line width. Please note that line widths for tick lines and grid lines are predefined, so you may need to override the styles |every tick| and |every axis grid|.
+
+	The |line width| key is changed quite often in \Tikz. You should use
+\begin{codeexample}[code only]
+\pgfplotsset{every axis/.append style={line width=1pt}}
+\end{codeexample}
+	or
+\begin{codeexample}[code only]
+\pgfplotsset{every axis/.append style={thick}}
+\end{codeexample}
+	to change the overall line width. To also adjust ticks and grid lines, you can use
+\begin{codeexample}[code only]
+\pgfplotsset{every axis/.append style={
+	line width=1pt,
+	tick style={line width=0.6pt}}}
+\end{codeexample}
+	or styles like
+\begin{codeexample}[code only]
+\pgfplotsset{every axis/.append style={
+	thick,
+	tick style={semithick}}}
+\end{codeexample}
+	The `|every axis plot|' style can be used to change line widths for plots only.
+\end{key}
+
+\begin{keylist}[/tikz]{ultra thin,very thin,semithick,thick,very thick,ultra thick}
+	These \Tikz\ styles provide different predefined line widths.
+\end{keylist}
+
+This example shows the same plots as on page~\pageref{page:plotcoords:src} (using |\plotcoords| as place holder for the commands on page~\pageref{page:plotcoords:src}), with different line width and font size.
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={
+	font=\large,
+	line width=1pt,
+	tick style={line width=0.8pt}}}
+\begin{tikzpicture}
+	\begin{loglogaxis}[
+		legend style={at={(0.03,0.03)},
+			anchor=south west},
+		xlabel=\textsc{Dof},
+		ylabel=$L_2$ Error
+	]
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+	\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
 
-\noindent
-Some more details:
-\begin{itemize}
-	\item You can modify \texttt{OPTIONS} with
-	\begin{lstlisting}[gobble=1]
-	\tikzstyle{every axis plot}=[...]
-	\end{lstlisting}
-	or, even better, with
-	\begin{lstlisting}[gobble=1]
-	\tikzstyle{every axis plot}+=[...]
-	\end{lstlisting}
-	\item The \texttt{OPTIONS} are remembered for the legend.
-	\item See subsection~\ref{sec:markers} for a list of available markers and line styles.
-	\item For log plots, \PGFPlots\ will compute the natural logarithm $\log(\cdot)$ numerically. This works with normal fixed point numbers or in scientific notation. For example, the following numbers are valid input to \lstinline!\addplot!.
-\begin{lstlisting}
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={
+	font=\footnotesize,
+	thin,
+	tick style={ultra thin}}}
 \begin{tikzpicture}
-\begin{loglogaxis}
-\addplot plot coordinate {
-	(769,	1.6227e-04)
-	(1793,	4.4425e-05)
-	(4097,	1.2071e-05)
-	(9217,	3.2610e-06)
-	(1e6,	0.00003341)
-	(2.3e7,	0.00131415)
-;
-\end{loglogaxis}
+	\begin{loglogaxis}[
+		xlabel=\textsc{Dof},
+		ylabel=$L_2$ Error
+	]
+	\plotcoords
+	\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+	\end{loglogaxis}
 \end{tikzpicture}
-\end{lstlisting}
-	You can represent arbirtrarily small or very large numbers as long as its logarithm can be represented as a \TeX-length (up to about~$16384$). Of course, any coordinate~$x\le 0$ is not possible since the logarithm of a non-positive number is not defined. Such coordinates will be skipped automatically.
+\end{codeexample}
 
-	\item For normal plots, \PGFPlots\ understands arbirtrarily large or small numbers like 0.00000001234 or $1.234\cdot 10^{24}$. \PGFPlots\ has its own number parsing tools which are complete text based and do not rely on \TeX's limited numerical number representation. Before the plots are actually drawn, any input coordinate is transformed into \TeX-precision using transformations
-		\[ T_x(x) = 10^{s_x} \cdot x \text{ and } T_y(y) = 10^{s_y} \cdot y \]
-	with properly chosen integers $s_x, s_y \in \Z$. This ensures invariance of axis ranges. See section~\ref{sec:disabledatascaling} for more details.
+\subsubsection{Options Controlling Linestyles}
 
-	\item As a consequence of the coordinate parsing routines, you can't use the mathematical expression parsing method of \PGF\ as coordinates (that means: you will need to provide coordinates without suffixes like ``cm'' or ``pt'' and you can't invoke mathematical functions).
-	
-	\item If you did not specify axis limits for $x$ and $y$ manually, \lstinline!\addplot! will compute them automatically. 
+\label{sec:cycle:list}%
+\begin{pgfplotskeylist}{cycle list=\marg{list},cycle list name=\marg{\textbackslash macro}}
+Allows to specify a list of plot specifications which will be used for each \hbox{\lstinline!\addplot!}-command without explicit plot specification.
 
-	The automatic computation of axis limits works as follows:
-		\begin{enumerate}
-			\item In case of \lstinline!\addplot plot coordinates {...};!, every coordinate will be checked.
-			Any other \Tikz-plot mode is not (yet) supported (had no time yet).
-			\item Since more than one \lstinline!\addplot! command may be used inside an \lstinline!\begin{axis}...\end{axis}!, all drawing commands will be postponed until \lstinline!\end{axis}!.
+There are several possiblities to change it:
+\begin{enumerate}
+	\item Use one of the predefined lists,
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	cycle list name=\coloredplotspeclist]
+\plotcoords
+\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+These examples employs the same coords as in the example on page~\pageref{page:plotcoords:src}.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	cycle list name=\blackwhiteplotspeclist]
+\plotcoords
+\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+	\item Provide the list explicitly,
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[cycle list={%
+	{blue,mark=*},
+	{red,mark=square},
+	{dashed,mark=o},
+	{loosely dotted,mark=+},
+	{brown!60!black,
+		mark options={fill=brown!40},
+		mark=otimes*}}
+]
+\plotcoords
+\legend{$d=2$,$d=3$,$d=4$,$d=5$,$d=6$}
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+	(This example list requires \lstinline!\usetikzlibrary{plotmarks}!).
+	\item Define macro names and use them with `|cycle list name|':
+\begin{codeexample}[code only]
+\pgfcreateplotcyclelist{\mylist}{%
+	{blue,mark=*},
+	{red,mark=square},
+	{dashed,mark=o},
+	{loosely dotted,mark=+},
+	{brown!60!black,mark options={fill=brown!40},mark=otimes*}}
+}
+...
+\begin{axis}[cycle list name=\mylist]
+	...
+\end{axis}
+\end{codeexample}
+\end{enumerate}
 
-			See the \lstinline!\axispath!-command for more information about automatic axis limits and the postponed drawing.
-		\end{enumerate}
-\end{itemize}
+\paragraph{Remark:} You can also terminate single entries with `\lstinline!\\!' as in
+\begin{codeexample}[code only]
+\begin{axis}[cycle list={%
+	blue,mark=*\\%
+	red,mark=square\\%
+	dashed,mark=o\\%
+	loosely dotted,mark=+\\%
+	brown!60!black,
+		mark options={fill=brown!40},
+		mark=otimes*\\}
+]
+...
+\end{axis}
+\end{codeexample}
+In this case, the \emph{last} entry also needs a terminating `\lstinline!\\!', but you can omit braces around the single entries.
+\end{pgfplotskeylist}
 
-\subsection{\texttt{\textbackslash addplot+[OPTIONS] ...}}
-Does the same like \lstinline!\addplot[OPTIONS] ...! except that \texttt{OPTIONS} is \emph{appended} to the arguments which would have been taken for \lstinline!\addplot ...! (the element of the default list).
-
-Example:
-\begin{lstlisting}
-\addplot+[only marks] plot coordinates {...};
-\end{lstlisting}
-will use the same line style, markers, colors as
-\begin{lstlisting}
-\addplot plot coordinates {...};
-\end{lstlisting}
-but it will only draw markers, no lines.
-
-\subsection{\texttt{\textbackslash axispath...;}}
-\label{sec:axispath}%
-This command allows to draw custom content into an axis. The argument to \lstinline!\axispath! may be any \Tikz-command like 
-\begin{lstlisting}
-\axispath\node at (axis cs:12.14368,-9.30872) {};
-\end{lstlisting}
-or
-\begin{lstlisting}
-\axispath\draw 
-		(axis cs:12.14368,-9.30872) 
-	--	(axis cs:0,1);
-\end{lstlisting}
-A useful example is presented in section~\ref{sec:annot:plot} where annotations are placed near some data points.
 
-The \lstinline!\axispath! command is necessary to communicate drawing commands to \PGFPlots. If \PGFPlots\ needs to determine the $x$~and/or~$y$ limits automatically, any plotting commands (including those with \lstinline!\axispath!) will be postponed until \lstinline!\end{axis}!.
 
-A missing \lstinline!\axispath! may corrupt your graphics because the clipping area may not yet be known.
 
-The ``\texttt{axis cs}'' coordinate system allows you to access axis coordinates. You can use the same numbers as in \lstinline!\addplot! all required transformations like logarithms or data scaling transformations will be applied. All \lstinline!\axispath! commands should use these coordinate systems. See section~\ref{sec:axis:coords} for more information and section~\ref{sec:annot:plot} for examples. 
+\subsection{Axis Descriptions}
 
-\subsection{Accessing axis coordinates with \texttt{axis cs}}
-\label{sec:axis:coords}%
-\PGFPlots\ provides a new coordinate system for use inside of an axis, the ``axis coordinate system'', \texttt{axis cs}.
+\subsubsection{Labels}
 
-Its can be used in conjunction with \lstinline!\axispath! to draw any \Tikz-graphics at axis coordinates. It is used like
-\begin{lstlisting}
-	\axispath\draw 
-		(axis cs:18943,2.873391e-05) 
-	|-	(axis cs:47103,8.437499e-06);
-\end{lstlisting}
-see section~\ref{sec:annot:plot} for example graphics.
+\begin{pgfplotsxykey}{\x label=\marg{text}}
+The options |xlabel| and |ylabel| change axis labels to \marg{text} which is any \TeX\ text. Use |xlabel={, = characters}| if you need to include `|=|' or `|,|' literally.
 
-\paragraph{Attention:} Whenever you draw additional graphics, consider using \texttt{axis cs}! It applies any logarithms, data scaling transformations or whatever \PGFPlots\ usually does!
+Labels are \Tikz-Nodes which are placed with
+\begin{codeexample}[code only]
+\node 
+	[style=every axis label,
+	style=every axis x label]
+\node 
+	[style=every axis label,
+	style=every axis y label] 
+\end{codeexample}
+so their position and appearance can be customized. As for legends, the coordinate \lstinline!(0,0)! denotes the lower left axis corner and \lstinline!(1,1)! the upper right. 
 
-\subsection{\texttt{\textbackslash addlegendentry\{name\}}}
-Adds a single legend entry to the legend list. Example:
-\begin{lstlisting}
+The default styles are
+\begin{codeexample}[code only]
+\pgfplotsset{every axis label/.style={}}
+\pgfplotsset{every axis x label/.style={
+	at={(0.5,0)},
+	below,
+	yshift=-15pt}}
+\pgfplotsset{every axis y label/.style={
+	at={(0,0.5)},
+	xshift=-35pt,
+	rotate=90}}
+\end{codeexample}
+Please add options using |.append style| instead of overwriting the default styles to ensure compatibility with future versions.
+\begin{codeexample}[code only]
+\pgfplotsset{every axis label/.append style={...}}
+\pgfplotsset{every axis x label/.append style={...}}
+\pgfplotsset{every axis y label/.append style={...}}
+\end{codeexample}
+\end{pgfplotsxykey}
+
+\begin{pgfplotskey}{title=\marg{text}}
+Adds a caption to the plot. This will place a \Tikz-Node with
+\begin{codeexample}[code only]
+\node[style=every axis title] {text};
+\end{codeexample}
+to the current axis.
+\begin{codeexample}[]
 \begin{tikzpicture}
-\begin{axis}
-\addplot[smooth,mark=*,blue] plot coordinates {
-	(0,2)
-	(2,3)
-	(3,1)
-};
-\addlegendentry{Case 1}
-
-\addplot[smooth,color=red,mark=x]
-	plot coordinates {
-		(0,0)
-		(1,1)
-		(2,1)
-		(3,2)
+\begin{loglogaxis}[
+	xlabel=Dof,ylabel=Error,
+	title={$\mu=0.1$, $\sigma=0.2$}]
+
+	\addplot coordinates {
+		(5,    8.312e-02)
+		(17,   2.547e-02)
+		(49,   7.407e-03)
+		(129,  2.102e-03)
+		(321,  5.874e-04)
+		(769,  1.623e-04)
+		(1793, 4.442e-05)
+		(4097, 1.207e-05)
+		(9217, 3.261e-06)
 	};
-\addlegendentry{Case 2}
-\end{axis}
-\end{tikzpicture}
-\end{lstlisting}
-The outcome of this listing is shown in figure~\ref{fig:addlegendentry}.
-\begin{figure}
-	\centering
-	\begin{tikzpicture}
-	\begin{axis}
-	\addplot[smooth,mark=*,blue] plot coordinates {
-		(0,2)
-		(2,3)
-		(3,1)
-	};
-	\addlegendentry{Case 1}
+\end{loglogaxis}
+\end{tikzpicture}%
+\end{codeexample}
+%--------------------------------------------------
+% \hfill
+% \begin{tikzpicture}
+% \begin{loglogaxis}[
+% 	width=0.48\linewidth,
+% 	xlabel=Dof,ylabel=Error,
+% 	title={$\mu=1$, $\sigma=\frac{1}{2}$}]
+% 
+% 	\addplot[color=red,mark=*] coordinates {
+% 		(7,		8.472e-02)
+% 		(31,	3.044e-02)
+% 		(111,	1.022e-02)
+% 		(351,	3.303e-03)
+% 		(1023,	1.039e-03)
+% 		(2815,	3.196e-04)
+% 		(7423,	9.658e-05)
+% 		(18943,	2.873e-05)
+% 		(47103,	8.437e-06)
+% 	};
+% \end{loglogaxis}
+% \end{tikzpicture}
+%-------------------------------------------------- 
+ The title is placed in the middle of the axis (the placing does not incorporate any axis descriptions). You can reconfigure the appearance and/or placing of the title for example with
+\begin{codeexample}[code only]
+\pgfplotsset{every axis title/.append style={at={(0.75,1)}}}
+\end{codeexample}
+This will place the title at~75\% of the $x$-axis. The coordinate~$(0,0)$ is the lower left corner and~$(1,1)$ the upper right one.
+\end{pgfplotskey}
+
+\subsubsection{Legend}
+
+\begin{pgfplotskey}{legend columns=\marg{number} (default 1)}
+Allows to configure the maximum number of adjacent legend entries. The default value~|1| places legend entries vertically below each other. 
+
+Use |legend columns=-1| to draw all entries horizontally.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{legend plot pos=\mchoice{left,right,none} (initially left)}
+Configures where the small line specifications will be drawn: left of the description, right of the description or not at all.
+\end{pgfplotskey}
 
-	\addplot[smooth,color=red,mark=x]
+\begin{pgfplotscodekey}{legend image code}
+\label{opt:legend:image:code}
+Allows to replace the default images which are drawn inside of legends. The first argument to this option is the plot specification, a key-value list which has been determined by \lstinline!\addplot!.
+
+The default is
+\begin{codeexample}[code only]
+/pgfplots/legend image code/.code={%
+	\draw[#1,mark repeat=2,mark phase=2] 
 		plot coordinates {
-			(0,0)
-			(1,1)
-			(2,1)
-			(3,2)
-		};
-	\addlegendentry{Case 2}
-	\end{axis}
-	\end{tikzpicture}
+			(0cm,0cm) 
+			(0.3cm,0cm)
+			(0.6cm,0cm)%
+		};%
+}
+\end{codeexample}
+\end{pgfplotscodekey}
 
-	\caption{An example for the \texttt{\textbackslash addlegendentry} command}%
-	\label{fig:addlegendentry}%
-\end{figure}%
-It does not matter where \lstinline[breaklines=false]!\addlegendentry! commands are placed, only the sequence matters. You will need one \lstinline[breaklines=false]!\addlegendentry! for every \lstinline!\addplot! command.
+\subsubsection{Axis Lines}
+By default the axis lines are drawn as a |box|, but it is possible to change the appearance of the $x$~and~$y$ axis lines.
 
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	axis x line=middle,
+	axis y line=right,
+	tick align=center,
+	ymax=1.1, ymin=-1.1,
+	enlargelimits=false
+]
+	\addplot[blue,mark=none] 
+		plot[id=sinneg,domain=-10:0,samples=40]
+		function{sin(x)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
 
-\subsection{\texttt{\textbackslash legend[OPTIONS]\{LIST\}}}
-\label{sec:legenddef}%
-You can use
-\begin{lstlisting}
+\begin{codeexample}[]
 \begin{tikzpicture}
-\begin{axis}
-...
-\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-...
+\begin{axis}[
+	enlargelimits=false,
+	minor tick num=3,
+	axis y line=center,
+	axis x line=middle
+	]
+	\addplot[blue,mark=none] 
+		plot[domain=-5:5,samples=40] 
+		(\x,{sin(\x r)});
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-to assign a complete legend. \textbf{Attention:} the final \lstinline!\\! is necessary! The \lstinline[breaklines=false]!\legend! command takes the following arguments:
-\begin{lstlisting}
-\legend[OPTIONS]{TEXT1\\TEXT2\\TEXT3\\...\\}
-\end{lstlisting}
-where each legend element needs to be terminated by \lstinline[breaklines=false]!\\!. The short marker/line combination shown in legends is acquired from the argument to \lstinline[breaklines=false]!\addplot[...]!.
-
-\subsubsection{Legend appearance}
-The style ``\texttt{every axis legend}'' determines the legend's position and outer appearance:
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[
-		at={(0,0)},
-		anchor=south west]
-\end{lstlisting}
-will draw it at the lower left corner of the axis while
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[
-		at={(1,1)},
-		anchor=north east]
-\end{lstlisting}
-means the upper right corner. The `\texttt{anchor}' option determines which point \emph{of the legend} will be placed at $(0,0)$ or $(1,1)$ (see below for more examples).
+\end{codeexample}
 
-The legend is a \Tikz-matrix, so you can use any \Tikz\ option which affects
-nodes and matrizes (see~\cite[section 13~and~14]{tikz}). The matrix is created by something like
-\begin{lstlisting}
-\matrix[style=every axis legend] {
-	draw plot specification 1 & \node{legend 1}\\
-	draw plot specification 2 & \node{legend 2}\\
-	...
-};
-\end{lstlisting}
-You can configure the number of horizontal legend entries with the axis-option ``\texttt{legend columns=NUMBER}''. For example,
-\begin{lstlisting}
+In case the range of either of the axis do not include the zero value, it is possible to visualize this with a discontinuity decoration on the corresponding axis line.
+
+\begin{codeexample}[]
 \begin{tikzpicture}
-\begin{axis}[legend columns=4]
-...
-\legend{legend 1\\legend 2\\legend 3\\}
+\begin{axis}[
+	axis x line=bottom,
+	axis x discontinuity=parallel,
+	axis y line=left,
+	xmin=360, xmax=600,
+	ymin=0, ymax=7,
+ 	enlargelimits=false
+]
+	\addplot coordinates {
+		(420,2)
+		(500,6)
+		(590,4)
+	};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	axis x line=bottom,
+	axis y line=center,
+	tick align=outside,
+	axis y discontinuity=crunch,
+	ymin=95, enlargelimits=false
+]
+	\addplot[blue,mark=none] 
+		plot[id=square,domain=-4:4,samples=20] 
+		function{x*x+x+104};
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-would use (up to)~$4$ adjacent legend entries.
+\end{codeexample}
+
+\begin{pgfplotskey}{axis x line=\mchoice{box,top,middle,bottom,none} (initially box)}
+Allows to choose the location of the $x$ axis line(s).
+The labels and ticks are placed accordingly.
+Bottom will draw only a line at y=ymin, middle will draw a line at y=0, and top will draw only a line at y=ymax.
+Box is a combination of options top and bottom. 
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{axis y line=\mchoice{box,left,center,right,none} (initially box)}
+Allows to choose the location of the $y$ axis line(s).
+The labels and ticks are placed accordingly.
+Left will draw only a line at x=xmin, center will draw a line at x=0, and right will draw only a line at x=xmax.
+Box is a combination of options left and right. 
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{axis x discontinuity=\mchoice{crunch,parallel,none} (initially none)}
+Insert a discontinuity decoration on the $x$ axis. 
+This is to visualize that the $y$ axis does cross the $x$ axis at its 0 value, because the minimum $x$ axis value is positive or the maximum value is negative.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{axis y discontinuity=\mchoice{crunch,parallel,none} (initially none)}
+Similar to |axis x discontinuity|, but now for the $y$ axis.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{hide axis=\mchoice{true,false} (initially false)}
+Allows to hide the axis. No outer rectangle, no tick marks and no labels will be drawn. Only titles and legends will be processed as usual.
+
+Axis scaling and clipping will be done as if you did not use |hide axis|.
+\end{pgfplotskey}
+
 
-Examples:
+\subsection{Scaling Options}
+
+\begin{pgfplotskey}{width=\marg{dimen}}
+Sets the width of the final picture to \marg{dimen}. If no |height| is specified, scaling will respect aspect ratios.
+
+\noindent\underline{Remarks:} 
 \begin{itemize}
-\item 
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[
-		at={(1.02,1)},
-		anchor=north west]
-\end{lstlisting}
-draws the legend OUTSIDE TOP RIGHT.
+	\item The scaling only affects the width of one unit in $x$-direction or the height for one unit in $y$-direction. Axis labels and tick labels won't be resized, but their size is used to determine the axis scaling.
 
-\item
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[
-		at={(1,0.5)},
-		anchor=east,outer sep=0.5cm]
-\end{lstlisting}
-draws the legend INSIDE MIDDLE RIGHT, separated by 0.5cm from the axis.
-\end{itemize}
+	\item You can use the |scale=|\marg{number} option,
+\begin{codeexample}[code only]
+\begin{tikzpicture}[scale=2]
+\begin{axis}
+...
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	to scale the complete picture.
 
-\noindent
-The default is
-\begin{lstlisting}
-\tikzstyle{every axis legend}=[%
-		cells={anchor=center},
-		inner xsep=3pt,inner ysep=2pt,nodes={inner sep=2pt,text depth=0.15em},
-		anchor=north east,%
-		shape=rectangle,%
-		fill=white,%
-		draw=black,
-		at={(0.98,0.98)}
-		]
-\end{lstlisting}
-\paragraph{Attention:} you should \emph{not reset} the default style to stay compatible with future versions. If possible, use
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[...]
-\end{lstlisting}
+	\item The \Tikz-options \lstinline!x! and \lstinline!y! which set the unit dimensions in $x$ and $y$ directions can be specified as arguments to \lstinline!\begin{axis}[x=1.5cm,y=2cm]! if needed (see below). These settings override the \lstinline!width! and \lstinline!height! options.
 
+	\item You can also force a fixed width/height of the axis (without looking at labels) with
+	\begin{codeexample}[code only]
+\begin{tikzpicture}
+\begin{axis}[width=5cm,scale only axis]
+	...
+\end{axis}
+\end{tikzpicture}
+	\end{codeexample}
 
-\subsection{\texttt{\textbackslash autoplotspeclist}}
-Allows to specify a list of plot specifications which will be used for each \lstinline!\addplot!-command without explicit plot specification.
+	\item Please note that up to the writing of this manual, \PGFPlots\ only estimates the size needed for axis- and tick labels. It does not include legends which have been placed outside of the axis\footnote{I.e. the `|width|' option will not work as expected, but the bounding box is still ok.}. This may be fixed in future versions.
 
-There are several possiblities to change it:
-\begin{enumerate}
-	\item Use one of the predefined lists,
-\begin{lstlisting}
-\listcopy\coloredplotspeclist\to\autoplotspeclist%
-\listcopy\blackwhiteplotspeclist\to\autoplotspeclist%
-\end{lstlisting}
-	\item Define your own one,
-\begin{lstlisting}
-\listnew{\autoplotspeclist}{%
-	blue,mark=*\\%
-	red,mark=square\\%
-	dashed,mark=o\\%
-	loosely dotted,mark=+\\%
-	brown!60!black,mark options={fill=brown!40},mark=otimes*\\%
-}
-\end{lstlisting}
-	(This example list requires \lstinline!\usetikzlibrary{plotmarks}!).
-\end{enumerate}
-Please note that the `\lstinline!\\!' is required to separate each element. Please note that comment characters~`\%' are necessary if the elements are on different lines.
+	Use the |x=|\marg{dimension}, |y=|\marg{dimension} and |scale only axis| options if the scaling happens to be wrong.
+\end{itemize}
+\end{pgfplotskey}
 
-\subsection{\texttt{\textbackslash logtologten\{ARG\}}}
-Expands to the result of $\texttt{ARG}/\log(10)$. You can also use
-\begin{lstlisting}
-\logtologtentomacro{9.5}{\result}
-\end{lstlisting}
-and \lstinline!\result! will be filled with the result.
+\begin{pgfplotskey}{height=\marg{dimen}}
+	See |width|.
+\end{pgfplotskey}
 
-\subsection{\texttt{\textbackslash logten}}
-Expands to the constant $\log(10)$. Useful for logplots because $\log(10^i) = i\log(10)$.
+\begin{pgfplotskey}{scale only axis=\mchoice{true,false} (initially false)}
+If |scale only axis| is enabled, label, tick and legend dimensions won't influence the size of the axis rectangle, that means |width| and |height| apply only to the axis rectangle
 
-\subsection{\texttt{\textbackslash prettyprintnumber\{NUM\}}}
-Allows to generate pretty--printed output for the number \texttt{NUM}. Examples:
-\begin{lstlisting}
-\prettyprintnumber{1.0}
+If |scale only axis=false| (the default), \PGFPlots\ will try to produce the desired width \emph{including} labels, titles and ticks.
+\end{pgfplotskey}
 
-\prettyprintnumber{151.015341}
+\begin{pgfplotsxykey}{\x=\marg{dimen}}
+Sets the unit size for one $x$ (or $y$) coordinate to \marg{dimen}.
 
-\prettyprintnumber{90.99999}
-\end{lstlisting}
-results in
+	Setting $x$ explicitly overrides the \lstinline!width! option. Setting $y$ explicitly overrides the \lstinline!height! option.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[x=1cm,y=1cm]
+\addplot plot[domain=0:3] (\x,2*\x);
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	Setting |x| and/or |y| for logarithmic axis will set the dimension used for $1 \cdot e \approx 2.71828$.
 
-\prettyprintnumber{1.0},
+	Please note that it is \emph{not} possible to specify \lstinline!x! as argument to \lstinline!tikzpicture!. The option 
+\begin{codeexample}[code only]
+\begin{tikzpicture}[x=1.5cm]
+\begin{axis}
+	...
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	won't have any effect because an axis rescales its coordinates (see the \lstinline!width! option).
+\end{pgfplotsxykey}
 
-\prettyprintnumber{151.015341},
+\subsection{Error Bars}
+\label{sec:errorbars}
+{%
+\def\pgfplotserror#1{\ensuremath{\epsilon_{#1}}}%
+\PGFPlots\ supports error bars for normal and logarithmic plots. 
 
-\prettyprintnumber{90.99999}.
+Error bars are enabled for each plot separately, using \meta{behavior options} after \lstinline!\addplot!:
+\begin{codeexample}[code only]
+\addplot plot[/pgfplots/error bars/.cd,x dir=both,y dir=both] ...
+\end{codeexample}
+Error bars inherit all drawing options of the associated plot, but they use their own marker and style arguments additionally.
 
-It is used to display axis ticks. The default rounding precision is defined by
-\begin{lstlisting}
-\def\prettyprintnumberprecision{2}
-\end{lstlisting}
-and can be reconfigured if needed (the highest precision is~$5$ due to \TeX's restricted numerical capabilities).
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}
+\addplot plot[/pgfplots/error bars/.cd,
+	y dir=plus,y explicit]
+coordinates {
+	(0,0)     +- (0.5,0.1) 
+	(0.1,0.1) +- (0.05,0.2)
+	(0.2,0.2) +- (0,0.05)
+	(0.5,0.5) +- (0.1,0.2)
+	(1,1)     +- (0.3,0.1)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
 
-\subsection{\texttt{\textbackslash axispreset\{key=value,key=value\}}}
-Allows to define default options for any axis. For example,
-\begin{lstlisting}
-...
-\axispreset{width=\textwidth}%
-...
+\begin{codeexample}[]
 \begin{tikzpicture}
 \begin{axis}
-...
+\addplot plot[/pgfplots/error bars/.cd,
+	y dir=both,y explicit,
+	x dir=both,x fixed=0.05,
+	error mark=diamond*]
+coordinates {
+	(0,0)     +- (0.5,0.1) 
+	(0.1,0.1) +- (0.05,0.2)
+	(0.2,0.2) +- (0,0.05)
+	(0.5,0.5) +- (0.1,0.2)
+	(1,1)     +- (0.3,0.1)};
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-will produce a width of \lstinline!\textwidth! for any following axis. You can preset any of the \texttt{axis}-options described below.
+\end{codeexample}
+
+\begin{codeexample}[]
+\pgfplotstabletypesetfile{pgfplots.testtable2.dat}
 
-\subsection{Axis options}
-There are several required and even more optional arguments to modify axes. They are used like
-\begin{lstlisting}
 \begin{tikzpicture}
-\begin{axis}[key=value,key2=value2]
-...
+\begin{loglogaxis}
+\addplot plot[/pgfplots/error bars/.cd,
+	x dir=both,x fixed relative=0.5,
+	y dir=both,y explicit relative,
+	error mark=triangle*]
+	table[x=x,y=y,y error=errory] 
+	{pgfplots.testtable2.dat};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+%--------------------------------------------------
+% coordinates {
+% 	(32,32)
+% 	(64,64)
+% 	(128,128) +- (0,0.3)
+% 	(1024,1024) +- (0,0.2)
+% 	(32068,32068) +- (0,0.6)
+% 	(64000,64000) +- (0,0.6)
+% 	(128000,128000) +- (0,0.6)
+% };
+%-------------------------------------------------- 
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[enlargelimits=false]
+\addplot[red,mark=*] 
+	plot[/pgfplots/error bars/.cd,
+	y dir=minus,y fixed relative=1,
+	x dir=minus,x fixed relative=1,
+	error mark=none,
+	error bar style={dotted}]
+coordinates
+	{(0,0) (0.1,0.1) (0.2,0.2) 	
+	 (0.5,0.5) (1,1)};
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-The overall appeareance can be changed with
-\begin{lstlisting}
-\tikzstyle{every axis}+=[line width=1pt]
-\end{lstlisting}
-for example.
+\end{codeexample}
 
-\subsubsection{\texttt{[xy]min=COORD}, \texttt{[xy]max=COORD}}
-The options \texttt{xmin}, \texttt{xmax} and \texttt{ymin}, \texttt{ymax} allow to define the axis limits, i.e. the lower left and the upper right corner. Some remarks:
-\begin{itemize}
-	\item The axis limits determine the plotted range. Everything else will be clipped away.
-	\item The width of every unit $x$-coordinate will be scaled such that the plot has width \lstinline!\axisdefaultwidth! (including the tick- and axis labels). The height of every unit $y$-coordinate will be scaled such that the plot has height \lstinline!\axisdefaultheight!.
+\begin{pgfplotsxykey}{error bars/\x\ dir=\mchoice{none,plus,minus,both} (initially none)}
+Draws either no error bars at all, only marks at $x+\pgfplotserror x$, only marks at $x-\pgfplotserror x$ or marks at both, $x+\pgfplotserror x$ and $x-\pgfplotserror x$. The $x$-error $\pgfplotserror x$ is acquired using one of the following options.
+
+The same holds for the |y dir| option.
+\end{pgfplotsxykey}
+
+\begin{pgfplotsxykey}{error bars/\x\ fixed=\marg{value} (initially 0)}
+Provides a common, absolute error $\pgfplotserror x=\text{\meta{value}}$ for all input coordinates.
 
-	You can override this default behavior with the options \lstinline!width=DIMEN!, \lstinline!height=DIMEN!, \lstinline!x=DIMEN! and \lstinline!y=DIMEN!, see below.
-	\item If one of \lstinline!xmin! or \lstinline!xmax! is missing, the $x$-interval will be determined automatically (see \lstinline!\addplot!). The same holds true if one of \lstinline!ymin! or \lstinline!ymax! is missing: in this case, the $y$-interval will be determined automatically.
+For linear $x$~axes, the error mark is drawn at $x \pm \pgfplotserror x$ while for logarithmic $x$~axes, it is drawn at $\log( x \pm \pgfplotserror x)$. Computations are performed in \PGF's floating point arithmetics.
+\end{pgfplotsxykey}
 
-	\item The option \lstinline!enlargelimits! will automatically increase the plotted range.
+\begin{pgfplotsxykey}{error bars/\x\ fixed relative=\marg{percent} (initially 0)}
+Provides a common, relative error $\pgfplotserror x = \text{\meta{percent}} \cdot x$ for all input coordinates. The argument \meta{percent} is thus given relatively to input $x$ coordinates such that $\text{\meta{percent}} = 1$ means $100\%$.
+
+Error marks are thus placed at $x \cdot (1 \pm \pgfplotserror x)$ for linear axes and at $\log(x \cdot (1 \pm \pgfplotserror x))$ for logarithmic axes. Computations are performed in floating point for linear axis and using the identity $\log(x \cdot (1 \pm \pgfplotserror x)) = \log(x) + \log( 1 \pm \pgfplotserror x)$ for logarithmic scales.
+\end{pgfplotsxykey}
+
+\begin{pgfplotsxykey}{error bars/\x\ explicit}
+Configures the error bar algorithm to draw $x$-error bars at any input coordinate for which user-specified errors are available.
+ Each error is interpreted as absolute error, see |x fixed| for details.
+
+The different input formats of errors are described in section~\ref{sec:errorbar:input}.
+\end{pgfplotsxykey}
+
+\begin{pgfplotsxykey}{error bars/\x\ explicit relative}
+Configures the error bar algorithm to draw $x$-error bars at any input coordinate for which user-specified errors are available.
+ Each error is interpreted as relative error, that means error marks are placed at $x (1 \pm \text{\meta{value}}(x))$ (works as for |error bars/x fixed relative|).
+\end{pgfplotsxykey}
+
+
+\begin{pgfplotskey}{error bars/error mark=\meta{marker}}
+Sets an error marker for any error bar. \marg{marker} is expected to be a valid plot mark, see section~\ref{sec:markers}.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{error bars/error mark options=\marg{key-value-list}}
+Sets a key-value list of options for any error mark. This option works similary to the \Tikz\ `|mark options|' key.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{error bars/error bar style=\marg{key-value-list}}
+Appends the argument to `|/pgfplots/every error bar|' which is installed at the beginning of every error bar.
+\end{pgfplotskey}
+
+\begin{pgfplotscodetwokey}{error bars/draw error bar}
+Allows to change the default drawing commands for error bars. The two arguments are
+\begin{itemize} 
+\item the source point, $(x,y)$ and
+\item the target point, $(\tilde x,\tilde y)$.
 \end{itemize}
+Both are determined by \PGFPlots\ according to the options described above. The default code is
+\begin{codeexample}[code only][basicstyle=\footnotesize\ttfamily]
+/pgfplots/error bars/draw error bar/.code 2 args={%
+	\pgfkeysgetvalue{/pgfplots/error bars/error mark}%
+		{\pgfplotserrorbarsmark}%
+	\pgfkeysgetvalue{/pgfplots/error bars/error mark options}%
+		{\pgfplotserrorbarsmarkopts}%
+	\draw #1 -- #2 node[pos=1,sloped,allow upside down] {%
+		\expandafter\tikz\expandafter[\pgfplotserrorbarsmarkopts]{%
+			\expandafter\pgfuseplotmark\expandafter{\pgfplotserrorbarsmark}%
+			\pgfusepath{stroke}}%
+	};
+}
+\end{codeexample}
+\end{pgfplotscodetwokey}
+
+\subsubsection{Input Formats of Error Coordinates}
+\label{sec:errorbar:input}%
+Error bars with explicit error estimations for single data points require some sort of input format. This applies to `|error bars/|\meta{[xy]}| explizit|' and `|error bars/|\meta{[xy]}| explizit relative|'.
+
+Error bar coordinates can be read from `|plot coordinates|' or from `|plot table|'. The inline plot coordinates format is
+\begin{codeexample}[code only]
+\addplot coordinates {
+	(1,2) +- (0.4,0.2)
+	(2,4) +- (1,0)
+	(3,5)
+	(4,6) +- (0.3,0.001)
+}
+\end{codeexample}
+where $(1,2) \pm (0.4,0.2)$ is the first coordinate, $(2,4) \pm (1,0)$ the second and so forth. The point $(3,5)$ has no error coordinate.
 
-\subsubsection{\texttt{[xy]label=TEXT}}
-The options \texttt{xlabel} and \texttt{ylabel} change axis labels to `\texttt{TEXT}' which is any \LaTeX\ text. Use `\lstinline!{TEXT}!' if you need grouping.
+The `|plot table|' format is
+\begin{codeexample}[code only]
+\addplot table[x error=COLNAME,y error=COLNAME]
+\end{codeexample}
+or
+\begin{codeexample}[code only]
+\addplot table[x error index=COLINDEX,y error index=COLINDEX]
+\end{codeexample}
+These options are used as the `|x|' and `|x index|' options.
 
-Labels are \Tikz-Nodes which are placed with
-\begin{lstlisting}
-\node 
-	[style=every axis label,
-	style=every axis x label]
-\node 
-	[style=every axis label,
-	style=every axis y label] 
-\end{lstlisting}
-so you can reconfigure their position and appearance. As for legends, the coordinate \lstinline!(0,0)! denotes the lower left axis corner and \lstinline!(1,1)! the upper right. 
+You can supply error coordinates even if they are not used at all; they will be ignored silently in this case.
 
-The default styles are
-\begin{lstlisting}
-\tikzstyle{every axis label}=[]
-\tikzstyle{every axis x label}=[
-	at={(0.5,0)},
-	below,
-	yshift=-15pt]
-\tikzstyle{every axis y label}=[
-	at={(0,0.5)},
-	xshift=-35pt,
-	rotate=90]
-\end{lstlisting}
-You should use
-\begin{lstlisting}
-\tikzstyle{every axis label}+=[...]
-\tikzstyle{every axis x label}+=[...]
-\tikzstyle{every axis y label}+=[...]
-\end{lstlisting}
-to modify options to ensure compatibility with future versions.
-
-\subsubsection{\texttt{title=TEXT}}
-Adds a caption to the plot. This will place a \Tikz-Node with
-\begin{lstlisting}
-\node[style=every axis title] {TEXT};
-\end{lstlisting}
-to the current axis. An example is shown in figure~\ref{fig:titleexample}. The title is placed in the middle of the axis (the placing does not incorporate any axis descriptions). You can reconfigure the appearance and/or placing of the title for example with
-\begin{lstlisting}
-\tikzstyle{every axis title}+=[at={(0.75,1)}]
-\end{lstlisting}
-This will place the title at~75\% of the $x$-axis. The coordinate~$(0,0)$ is the lower left corner and~$(1,1)$ the upper right one.
+}%
 
-Please note that using the \LaTeX\ floating figures together with \lstinline!\caption{TEXT}! may be more appropriate in many situation. However, `\texttt{title}' allows access to the axis' size without any axis descriptions which is useful if more than one plot needs a caption.
-\begin{figure}
-	\centering
-	\begin{tikzpicture}
+\subsection{Number Formatting Options}
+\label{sec:number:printing}%
+\PGFPlots\ typeset tick labels rounded to given precision and in configurable number formats. The command to do so is |\pgfmathprintnumber|; it uses the current set of number formatting options.
+
+These options are described in all detail in the manual for \PGFPlotstable, which comes with \PGFPlots. Please refer to that manual.
+
+\begin{command}{\pgfmathprintnumber\marg{x}}
+Generates pretty-printed output for the (real) number \marg{x}. The input number \marg{x} is parsed using |\pgfmathfloatparsenumber| which allows arbitrary precision.
+
+Numbers are typeset in math mode using the current set of number printing options, see below. Optional arguments can also be provided using |\pgfmathprintnumber[|\meta{options}|]|\marg{x}.
+
+Please refer to the manual of \PGFPlotstable\ (shipped with this package) for details about the number options.
+\end{command}
+
+\label{sec:identify:minor:log}%
+\begin{pgfplotskey}{log identify minor tick positions=\mchoice{true,false} (initially true)}
+Set this to |true| if you want to identify log--plot tick labels at positions 
+\[ i \cdot 10^j \]
+with $i \in \{2,3,4,5,6,7,8,9\},\, j \in \Z$. This may be valueable in conjunction with the `|extra x ticks|' and `|extra y ticks|' options. An example is shown below: The axis range is so small that only one tick label $10^j$ is inside of it. Extra tick labels can be placed on top of the normal ticks, and placing ticks at $i \cdot 10^j $ may be appropriate.
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={%
+	width=6cm,
+	xmin=7e-3,xmax=7e-2,
+	extra x ticks={3e-2,6e-2},
+	extra x tick style={major tick length=0pt,font=\footnotesize}
+}}%
+\begin{tikzpicture}%
 	\begin{loglogaxis}[
-		width=0.48\textwidth,
-		xlabel=Dof,ylabel=Error,
-		title={$\mu=0.1$, $\sigma=0.2$}]
-
-		\addplot plot coordinates {
-			(5,		8.312e-02)
-			(17,	2.547e-02)
-			(49,	7.407e-03)
-			(129,	2.102e-03)
-			(321,	5.874e-04)
-			(769,	1.623e-04)
-			(1793,	4.442e-05)
-			(4097,	1.207e-05)
-			(9217,	3.261e-06)
-		};
-	\end{loglogaxis}
-	\end{tikzpicture}%
-	\hfill
-	\begin{tikzpicture}
-	\begin{loglogaxis}[
-		width=0.48\textwidth,
-		xlabel=Dof,ylabel=Error,
-		title={$\mu=1$, $\sigma=\frac{1}{2}$}]
-
-		\addplot[color=red,mark=*] plot coordinates {
-			(7,		8.472e-02)
-			(31,	3.044e-02)
-			(111,	1.022e-02)
-			(351,	3.303e-03)
-			(1023,	1.039e-03)
-			(2815,	3.196e-04)
-			(7423,	9.658e-05)
-			(18943,	2.873e-05)
-			(47103,	8.437e-06)
-		};
+		title=with minor tick identification]
+	\addplot coordinates {
+		(1e-2,10)
+		(3e-2,100)
+		(6e-2,200)
+	};
 	\end{loglogaxis}
-	\end{tikzpicture}
+\end{tikzpicture}%
 
-	\begin{lstlisting}
-	\begin{tikzpicture}
-	\begin{loglogaxis}[
-		width=0.48\textwidth,
-		xlabel=Dof,ylabel=Error,
-		title={$\mu=0.1$, $\sigma=0.2$}]
-
-		\addplot plot coordinates {
-			(5,		8.312e-02)
-			(17,	2.547e-02)
-			...
-			(4097,	1.207e-05)
-			(9217,	3.261e-06)
-		};
-	\end{loglogaxis}
-	\end{tikzpicture}%
-	\hfill
-	\begin{tikzpicture}
+\begin{tikzpicture}%
 	\begin{loglogaxis}[
-		width=0.48\textwidth,
-		xlabel=Dof,ylabel=Error,
-		title={$\mu=1$, $\sigma=\frac{1}{2}$}]
-
-		\addplot[color=red,mark=*] plot coordinates {
-			(7,		8.472e-02)
-			(31,	3.044e-02)
-			...
-			(18943,	2.873e-05)
-			(47103,	8.437e-06)
-		};
-	\end{loglogaxis}
-	\end{tikzpicture}
-	\end{lstlisting}
-	\caption{An example for the `\texttt{title}' option. Some data points have not been listed, the `\texttt{...}' is not part of the plot.}
-	\label{fig:titleexample}
-\end{figure}
+		title=without minor tick identification,
+		log identify minor tick positions=false]
+	\addplot coordinates {
+		(1e-2,10)
+		(3e-2,100)
+		(6e-2,200)
+	};
+	\end{loglogaxis}%
+\end{tikzpicture}%
+\end{codeexample}
+\end{pgfplotskey}
+
+\begin{pgfplotscodekey}{log number format code}
+Provides \TeX-code to generate log plot tick labels. Argument `|#1|' is the (natural) logarithm of the tick position.
+The default implementation invokes |log base 10 number format code| after it changed the log basis to~$10$. It also checks the other log plot options.
+\end{pgfplotscodekey}
+
+
+\begin{pgfplotscodekey}{log base 10 number format code}
+Allows to change the overall appearance of base 10 log plot tick labels. The default is
+\begin{codeexample}[code only]
+log base 10 number format code/.code={%
+	$10^{\pgfmathprintnumber{#1}}$}
+\end{codeexample}
+where the `|log plot exponent style|' allows to change number formatting options.
+\end{pgfplotscodekey}
+
+\begin{pgfplotskey}{log plot exponent style=\marg{key-value-list}}
+Allows to configure the number format of log plot exponents. This style is installed just before `|log base 10 number format code|' will be invoked. Please note that this style will be installed within the default code for `|log number format code|'.
+\begin{codeexample}[]
+\tikzset{samples=15}
+\pgfplotsset{every axis/.append style={
+		width=7cm,
+		xlabel=$x$,
+		ylabel=$f(x)$,
+		extra y ticks={45},
+		legend style={at={(0.03,0.97)},
+			anchor=north west}}}
+
+\begin{tikzpicture}
+\begin{semilogyaxis}[
+	log plot exponent style/.style={
+		/pgf/number format/fixed zerofill,
+		/pgf/number format/precision=1}]
 
+	\addplot plot[id=gnuplot_exp,domain=-5:10] 
+		function{exp(x)};
+	\addplot plot[id=gnuplot_expv,domain=-5:10]
+		function{exp(2*x)};
 
-\subsubsection{\texttt{[xy]mode=normal$|$log}}
-Allows to choose between normal plots or logplots for each $x,y$-combination. Default is \lstinline!xmode=normal!, \lstinline!ymode=normal!.
+	\legend{$e^x$,$e^{2x}$}
+\end{semilogyaxis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\tikzset{samples=15}
+\pgfplotsset{every axis/.append style={
+		width=7cm,
+		xlabel=$x$,
+		ylabel=$f(x)$,
+		extra y ticks={45},
+		legend style={at={(0.03,0.97)},
+			anchor=north west}}}
+
+\begin{tikzpicture}
+\begin{semilogyaxis}[
+	log plot exponent style/.style={
+		/pgf/number format/fixed,
+		/pgf/number format/use comma,
+		/pgf/number format/precision=2}]
+
+	\addplot plot[id=gnuplot_exp,domain=-5:10] 
+		function{exp(x)};
+	\addplot plot[id=gnuplot_expv,domain=-5:10]
+		function{exp(2*x)};
+
+	\legend{$e^x$,$e^{2x}$}
+\end{semilogyaxis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotskey}
+
+%--------------------------------------------------
+% \subsubsection{Defining Own Display Styles}
+% You can define own display styles, although this may require some insight into \TeX-programming. Here are two examples:
+% \begin{enumerate}
+% 	\item A new fixed point display style: The following code defines a new style named `\texttt{my own fixed point style}' which uses $1{\cdot}00$ instead of $1.00$.
+% \begin{lstlisting}
+% \def\myfixedpointstyleimpl#1.#2\relax{%
+% 	#1{\cdot}#2%
+% }%
+% \def\myfixedpointstyle#1{%
+% 	\pgfutilensuremath{%
+% 	\ifpgfmathfloatroundhasperiod
+% 		\expandafter\myfixedpointstyleimpl#1\relax
+% 	\else
+% 		#1%
+% 	\fi
+% 	}%
+% }
+% \pgfkeys{/my own fixed point style/.code={%
+% 	\let\pgfmathprintnumber@fixed@style=\myfixedpointstyle}
+% }%
+% \end{codeexample}
+% 	You only need to overwrite the macro \lstinline!\pgfmathprintnumber@fixed@style!. This macro takes one argument (the result of any numerical computations). The \TeX-boolean \lstinline!\ifpgfmathfloatroundhasperiod! is true if and only if the input number contains a period.
+% 
+% 	\item An example for a new scientific display style:
+% \begin{lstlisting}
+% % #1:
+% % 		0 == '0' (the number is +- 0.0),
+% % 		1 == '+', 
+% % 		2 == '-',
+% % 		3 == 'not a number'
+% % 		4 == '+ infinity'
+% % 		5 == '- infinity'
+% % #2: the mantisse
+% % #3: the exponent
+% \def\myscistyle#1#2e#3\relax{%
+% 	...
+% }
+% \pgfkeys{/my own sci style/.code={%
+% 	\let\pgfmathfloatrounddisplaystyle=\myscistyle},
+% }%
+% \end{codeexample}
+% \end{enumerate}
+%-------------------------------------------------- 
+
+
+
+
+\subsection{Specifying the Plotted Range}
+
+\begin{pgfplotsxykeylist}{\x min=\marg{coord},\x max=\marg{coord}}
+The options |xmin|, |xmax| and |ymin|, |ymax| allow to define the axis limits, i.e. the lower left and the upper right corner. Everything outside of the axis limits will be clipped away.
+
+If one of \lstinline!xmin! or \lstinline!xmax! is missing, the $x$-interval will be determined automatically. The same holds true if one of \lstinline!ymin! or \lstinline!ymax! is missing: in this case, the $y$-interval will be determined automatically.
+
+If $x$-limits have been specified explicitly and $y$-limits are computed automatically, the automatic computation of $y$-limits will only considers points which fall into the specified $x$-range (and vice--versa). This can be disable using |clip limits=false|.
+
+Axis limits can be increased automatically using the |enlargelimits| option.
+\end{pgfplotsxykeylist}
+
+\begin{pgfplotsxykey}{\x mode=\mchoice{normal,linear,log} (initially normal)}
+Allows to choose between linear (=normal) or logarithmic axis scaling or logplots for each $x,y$-combination.
+\end{pgfplotsxykey}
+
+\begin{pgfplotskey}{clip limits=\mchoice{true,false} (initially true)}
+	Configures what to do if some, but not all axis limits have been specified explicitly. In case |clip limits=true|, the automatic limit computation will \emph{only} consider points which do not contradict the explicitly set limits. 
+
+	This option has nothing to do with path clipping, it only affects how the axis limits are computed.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{enlargelimits=\mchoice{true,false,auto,\marg{val}}}
+Enlarges the axis size somewhat if enabled.
 
-\subsubsection{\texttt{[xy]tick=\{LIST\}}}
-The options \texttt{xtick} and \texttt{ytick} assigns a list of \emph{Positions} where ticks shall be placed. The argument \texttt{LIST} will be used inside of a \lstinline!\foreach \x in {LIST}! statement, and \texttt{LIST} contains one of the following formats:
+You can set |xmin|, |xmax| and |ymin|, |ymax| to the minimum/maximum values of your data and |enlargelimits| will enlarge the canvas such that the axis doesn't touch the plots.
+
+\begin{itemize}
+	\item The value |true| enlarges all axes.
+	\item The value |false| uses tight axis limits as specified by the user (or read from input coordinates).
+	\item The value |auto| will enlarge limits only for axis for which axis limits have been determined automatically.
+	\item All other values like `|enlargelimits=0.1|' will enlarge all axis limits relatively (in this example, 10\% of the axis limits will be added at all sides).
+\end{itemize}
+A small value of |enlargelimits| may avoid problems with large markers near the boundary.
+\end{pgfplotskey}
+
+
+\subsection{Tick and Grid Options}
+
+\begin{pgfplotsxykey}{\x tick=\mchoice{\textbackslash empty,data,\marg{coordinate list}} (initially \marg{})}
+The options |xtick| and |ytick| assigns a list of \emph{Positions} where ticks shall be placed. The argument is either the command |\empty|, |data| or a list of coordinates. The choice |\empty| will result in no tick at all. The special value |data| will produce tick marks at every coordinate of the first plot. Otherwise, tick marks will be placed at every coordinate in  \marg{coordinate list}. If this list is empty, \PGFPlots\ will compute a default list. 
+
+\marg{coordinate list} will be used inside of a \lstinline!\foreach \x in !\marg{coordinate list} statement. The format is as follows:
 \begin{itemize}
-	\item \lstinline!{0,1,2,5,8}! (a series of coordinates),
+	\item \lstinline!{0,1,2,5,8,1e1,1.5e1}! (a series of coordinates),
 	\item \lstinline!{0,...,5}! (the same as \lstinline!{0,1,2,3,4,5}!),
 	\item \lstinline!{0,2,...,10}! (the same as \lstinline!{0,2,4,6,8,10}!),
 	\item \lstinline!{9,...,3.5}! (the same as \lstinline!{9, 8, 7, 6, 5, 4}!),
 	\item See \cite[Section~34]{tikz} for a more detailed definition of the options.
-	\item Use `\texttt{xtick=}' to use the default tick placement rules.
-	\item Use `\lstinline!xtick=\empty!' to disable any ticks.
 \end{itemize}
-For logplots, \PGFPlots\ will apply $\log(\cdot)$ to each element in `\texttt{LIST}'. 
+For logplots, \PGFPlots\ will apply $\log(\cdot)$ to each element in `\marg{coordinate list}'. 
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{loglogaxis}[xtick={12,9897,1468864}]
+	\plotcoords
+	\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
 
-\paragraph{Attention:} You can't use the `\texttt{...}' syntax if the elements are too large for \TeX! For example, `\texttt{xtick=1.5e5,2e7,3e8}' will work (because the elements are interpreted as strings, not as numbers), but `\texttt{xtick=1.5,3e5,...,1e10}' will fail because it involves real number arithmetics beyond \TeX's capacities.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	xtick=\empty,
+	ytick={-2,0.3,3,3.7,4.5}]
+\addplot+[smooth] coordinates {
+	(-2,3) (-1.5,2) (-0.3,-0.2) 
+	(1,1.2) (2,2) (3,5)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\paragraph{Attention:} You can't use the `|...|' syntax if the elements are too large for \TeX! For example, `|xtick=1.5e5,2e7,3e8|' will work (because the elements are interpreted as strings, not as numbers), but `|xtick=1.5,3e5,...,1e10|' will fail because it involves real number arithmetics beyond \TeX's capacities.
 \vspace*{0.3cm}
 
 \noindent
-The default choice for tick \emph{positions} in normal plots is to place a tick at each coordinate~$i\cdot h$. The step size~$h$ depends on the axis scaling and the axis limits. It is chosen from a list a ``feasable'' step sizes such that neither too much nor too few ticks will be generated. The default for logplots it to place ticks at each $10^i$ in the axis' range. The default tick positions can be reconfigured with
+The default choice for tick \emph{positions} in normal plots is to place a tick at each coordinate~$i\cdot h$. The step size~$h$ depends on the axis scaling and the axis limits. It is chosen from a list a ``feasable'' step sizes such that neither too much nor too few ticks will be generated. The default for logplots is to place ticks at positions $10^i$ in the axis' range. Which positions depends on the axis scaling and the dimensions of the picture. The default tick positions can be reconfigured with
 \begin{itemize}
-	\item \lstinline!\renewcommand{\axisdefaulttickwidth}{35}! where the integer argument denotes the maximum space between adjacent ticks in full points. The suffix ``\texttt{pt}'' has to be omitted and fractional numbers are not supported.
-	\item \lstinline!\renewcommand{\axisdefaulttryminticks}{4}! configures a loose lower bound on the number of ticks. It should be considered as a suggestion, not a tight limit.
+	\item `\lstinline!max space between ticks=!\marg{number}' where the integer argument denotes the maximum space between adjacent ticks in full points. The suffix ``|pt|'' has to be omitted and fractional numbers are not supported. The default is~\axisdefaulttickwidth.
+	\item `\lstinline!try min ticks=!\marg{number}' configures a loose lower bound on the number of ticks. It should be considered as a suggestion, not a tight limit. The default is~\axisdefaulttryminticks. This number will increase the number of ticks if `|max space between ticks|' produces too few of them.
+	\item `\lstinline!try min ticks log=!\marg{number}' The same for logarithmic axis.
 \end{itemize}
+The total number of ticks may still vary because not all fractional numbers in the axis' range are valid tick positions.
 
 
 \noindent
 The tick \emph{appearance} can be (re-)configured with
-\begin{lstlisting}
-\tikzstyle{every tick}=[very thin,gray]
-\tikzstyle{every minor tick}=[]
-\end{lstlisting}
+\begin{codeexample}[code only]
+\pgfplotsset{every tick/.style={very thin,gray}}
+\pgfplotsset{every minor tick/.style={}}
+\end{codeexample}
 or
-\begin{lstlisting}
-\tikzstyle{every tick}+=[very thin,gray]
-\tikzstyle{every minor tick}+=[black]
-\end{lstlisting}
-Please prefer the `\texttt{+=}' versions to ensure compatibility with future versions.
+\begin{codeexample}[code only]
+\pgfplotsset{every tick/.append style={very thin,gray}}
+\pgfplotsset{every minor tick/.append style={black}}
+\end{codeexample}
+Please prefer the `|.append style|' versions to ensure compatibility with future versions.
+
+This style commands can be used at any time. The tick line width can be configured with `|major tick length|' and `|minor tick length|'.
+\end{pgfplotsxykey}
+
+\begin{pgfplotskey}{minor tick num=\marg{number}}
+	Sets both, |minor x tick num| and |minor y tick num| to \marg{number}.
+
+	Minor ticks will be disabled if the major ticks don't have the same distance.
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[minor tick num=1]
+	\addplot (\x,\x^3);
+	\addplot (\x,-20*\x);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[minor tick num=3]
+	\addplot (\x,\x^3);
+	\addplot (\x,-20*\x);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\end{pgfplotskey}
+
+\begin{pgfplotsxykey}{minor \x~tick num=\marg{number} (initially 0)}
+	Sets the number of minor tick lines used for linear $x$~or~$y$ axis separately.
+
+	Minor ticks will be disabled if the major ticks don't have the same distance.
+\begin{codeexample}[]
+\begin{tikzpicture}
+	\begin{axis}[minor x tick num=1,
+	             minor y tick num=3]
+	\addplot (\x,\x^3);
+	\addplot (\x,-20*\x);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
 
-This style commands can be used at any time. The tick line width can be configured with the \lstinline!axis!-options `\texttt{tickwidth}' and `\texttt{subtickwidth}'.
+\end{pgfplotsxykey}
 
-\subsubsection{\texttt{[xy]tickten=\{LIST\}}}
-The options \texttt{xtickten} and \texttt{ytickten} allow to place ticks at selected positions $10^k, k \in \text{\texttt{LIST}}$. They are only used for logplots. The syntax for `\texttt{LIST}' is the same as above for `\texttt{xtick=LIST}' or `\texttt{ytick=LIST}'.
+\begin{pgfplotsxykey}{extra \x\ ticks=\marg{coordinate list}}
+Adds \emph{additional} tick positions and tick labels to the $x$~or~$y$ axis. `Additional' tick positions do not affect the normal tick placement algorithms, they are drawn after the normal ticks. This has two benefits: first, you can add single, important tick positions without disabling the default tick label generation and second, you can draw tick labels `on top' of others, possibly using different style flags.
 
-\subsubsection{\texttt{[xy]ticklabels=\{LIST\}}}
-Assigns a \emph{list} of tick \emph{labels} to each tick position. Tick \emph{positions} are assigned using the \texttt{xtick} and \texttt{ytick}-options.
 
-This is one of two options to assign tick labels directly. The other option is `\texttt{xticklabel=\{COMMAND\}}' (or \texttt{yticklabel=\{COMMAND\}}).
-Option `\texttt{\*ticklabel}' offers higher flexibility while `\texttt{\*ticklabels}' is easier to use.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	xmin=0,xmax=3,ymin=0,ymax=15,
+	extra y ticks={2.71828},
+	extra y tick labels={$e$},
+	extra x ticks={2.2},
+	extra x tick style={grid=major,
+		/pgfplots/tick label style={
+			rotate=90,anchor=east}},
+	extra x tick labels={Cut},
+]
+	\addplot (\x,{exp(\x)});
+	\addlegendentry{$e^x$}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={width=5.3cm}}
+\begin{tikzpicture}
+\begin{loglogaxis}
+\addplot coordinates 
+	{(10,1e-5) (20,5e-6) (40,2.5e-6)};
+\end{loglogaxis}
+\end{tikzpicture}
 
-The argument \texttt{LIST} has the same format as for ticks, that means
-\begin{lstlisting}
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	extra x ticks={20,40},
+	extra y ticks={5e-6,2.5e-6}]
+\addplot coordinates 
+	{(10,1e-5) (20,5e-6) (40,2.5e-6)};
+\end{loglogaxis}
+\end{tikzpicture}
+
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	log identify minor tick positions=false,
+	extra x ticks={20,40},
+	extra y ticks={5e-6,2.5e-6}]
+\addplot coordinates 
+	{(10,1e-5) (20,5e-6) (40,2.5e-6)};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+
+Remarks:
+\begin{itemize} 
+\item Use |extra x ticks| to highlight special tick positions. The use of |extra x ticks| does not affect minor tick/grid line generation, so you can place extra ticks at positions $j\cdot 10^i$ in log--plots. 
+\item Extra ticks are always typeset as major ticks.
+
+They are affected by |major tick length| or options like |grid=major|.
+\item Use the style |every extra x tick| (|every extra y tick|) to configure the appearance.
+\item You can also use `|extra x tick style=|\marg{...}' which has the same effect.
+\end{itemize}
+\end{pgfplotsxykey}
+
+\begin{pgfplotskeylist}{
+	space between ticks=\marg{number} (initially 35),
+	try min ticks=\marg{number} (initially 4),
+	try min ticks log=\marg{number} (initially 3)}
+see Options |xtick| and |ytick| for a description.
+\end{pgfplotskeylist}
+
+\begin{pgfplotskeylist}{tickwidth=\marg{dimension} (initially 0.15cm),major tick length=\marg{dimension} (initially 0.15cm)}
+	Sets the width of major tick lines.
+\end{pgfplotskeylist}
+
+\begin{pgfplotskeylist}{subtickwidth=\marg{dimension} (initially 0.1cm),minor tick length=\marg{dimension} (initially 0.1cm)}
+	Sets the width of minor tick lines.
+\end{pgfplotskeylist}
+
+\begin{pgfplotsxykey}{\x tickten=\marg{exponent base 10 list}}
+These options allow to place ticks at selected positions $10^k, k \in \text{\marg{exponent base 10 list}}$. They are only used for logplots. The syntax for \marg{exponent base 10 list} is the same as above for |xtick=|\marg{list} or |ytick=|\marg{list}.
+
+Using `|xtickten={1,2,3,4}|' is equivalent to `|xtick={1e1,1e2,1e3,1e4}|', but it requires fewer computational time and it allows to use the short syntax `|xtickten={1,...,4}|'.
+\begin{codeexample}[]
+\begin{tikzpicture}[samples=8]
+\begin{semilogyaxis}[
+	ytickten={-6,-4,...,4},
+	domain=0:10]
+
+% invoke gnuplot to generate coordinates:
+\addplot plot[id=pow1] 
+	function {2**(-2*x + 6)};
+\addlegendentry{$2^{-2x + 6}$}
+
+\addplot plot[id=pow2] 
+	function {2**(-1.5*x -3)};
+\addlegendentry{$2^{-1.5x -3}$}
+\end{semilogyaxis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotsxykey}
+
+\begin{pgfplotsxykey}{\x ticklabels=\marg{label list}}
+Assigns a \emph{list} of tick \emph{labels} to each tick position. Tick \emph{positions} are assigned using the |xtick| and |ytick|-options.
+
+This is one of two options to assign tick labels directly. The other option is |xticklabel=|\marg{command} (or |yticklabel=|\marg{command}).
+Option `|xticklabel|' offers higher flexibility while `|xticklabels|' is easier to use.
+
+The argument \marg{label list} has the same format as for ticks, that means
+\begin{codeexample}[code only]
 xticklabels={$\frac{1}{2}$,$e$}
-\end{lstlisting}
+\end{codeexample}
 Denotes the two--element--list $\{\frac 12, e\}$. The list indices match the indices of the tick positions. If you need commas inside of list elements, use 
-\begin{lstlisting}
+\begin{codeexample}[code only]
 xticklabels={{0,5}, $e$}.
-\end{lstlisting}
+\end{codeexample}
 
 
-Example:
-\begin{lstlisting}
+\begin{codeexample}[]
 \begin{tikzpicture}
 \begin{axis}[
 	xtick={-1.5,-1,...,1.5},
@@ -679,76 +2447,33 @@ Example:
 		$\frac 12$,
 		$1$}
 ]
-\addplot[smooth,blue,mark=*] plot coordinates {
-	(-1,	1)
-	(-0.75,	0.5625)
-	(-0.5,	0.25)
-	(-0.25,	0.0625)
-	(0,		0)
-	(0.25,	0.0625)
-	(0.5,	0.25)
-	(0.75,	0.5625)
-	(1,		1)
+\addplot[smooth,blue,mark=*] coordinates {
+	(-1,    1)
+	(-0.75, 0.5625)
+	(-0.5,  0.25)
+	(-0.25, 0.0625)
+	(0,     0)
+	(0.25,  0.0625)
+	(0.5,   0.25)
+	(0.75,  0.5625)
+	(1,     1)
 };
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-yields figure~\ref{fig:ticklistexample}.
-\begin{figure}
-	\centering
-	\begin{tikzpicture}[baseline]
-	\begin{axis}[
-		anchor=north east,
-		width=6cm,
-		xtick={-1.5,-1,...,1.5},
-		xticklabels={%
-			$-1\frac 12$,
-			$-1$,
-			$-\frac 12$,
-			$0$,
-			$\frac 12$,
-			$1$}
-	]
-	\addplot[smooth,blue,mark=*] plot coordinates {
-		(-1,	1)
-		(-0.75,	0.5625)
-		(-0.5,	0.25)
-		(-0.25,	0.0625)
-		(0,		0)
-		(0.25,	0.0625)
-		(0.5,	0.25)
-		(0.75,	0.5625)
-		(1,		1)
-	};
-	\end{axis}
-	\end{tikzpicture}
-	\hspace{10pt}%
-	\begin{minipage}[t]{6cm}%
-	\vspace{0pt}%
-	\begin{lstlisting}
-xtick={-1.5,-1,...,1.5},
-xticklabels={%
-	$-1\frac 12$,
-	$-1$,
-	$-\frac 12$,
-	$0$,
-	$\frac 12$,
-	$1$}
-	\end{lstlisting}
-	\end{minipage}
-	\caption{An example for the \texttt{xticklabels} option.}
-	\label{fig:ticklistexample}
-\end{figure}
-
-\subsubsection{\texttt{[xy]ticklabel=\{COMMAND\}}}
-Use \texttt{xticklabel} or \texttt{yticklabel} to change the \LaTeX-command which creates the tick \emph{labels} assigned to each tick position (see options \texttt{xtick} and \texttt{ytick}). 
-
-This is one of two options to assign tick labels directly. The other option is `\texttt{xticklabels=\{LIST\}}' (or \texttt{yticklabels=\{LIST\}}). Option `\texttt{\*ticklabel}' offers higher flexibility while `\texttt{\*ticklabels}' is easier to use.
-
-The argument `\texttt{COMMAND}' can be any \LaTeX-text. The following commands are valid inside of \texttt{COMMAND}:
+\end{codeexample}
+\end{pgfplotsxykey}
+
+
+\begin{pgfplotsxykey}{\x ticklabel=\marg{command}}
+Use |xticklabel| or |yticklabel| to change the \TeX-command which creates the tick \emph{labels} assigned to each tick position (see options |xtick| and |ytick|). 
+
+This is one of two options to assign tick labels directly. The other option is `|xticklabels=|\marg{label list}' (or |yticklabels=|\marg{label list}). Option `|xticklabel|' offers higher flexibility while `|xticklabels|' is easier to use.
+
+The argument \marg{command} can be any \TeX-text. The following commands are valid inside of \marg{command}:
 \begin{description}
 	\item[\textbackslash tick] The current element of option \lstinline!xtick! (or \lstinline!ytick!).
 	\item[\textbackslash ticknum] The current tick number, starting with~0 (a counter).
+	\item[\textbackslash nexttick] This command is only valid in case if the |x tick label as interval| option is set (or the corresponding variable for~$y$). It will contain the position of the next tick position, that means the right boundary of the tick interval.
 \end{description}
 The default argument is 
 \begin{itemize}
@@ -756,288 +2481,805 @@ The default argument is
 	\item \lstinline!\axisdefaultticklabellog! for logplots, see below.
 \end{itemize}
 (the same holds for \lstinline!yticklabel!). The defaults are set to
-\begin{lstlisting}
-\newcommand{\axisdefaultticklabel}[0]{%
-	$\prettyprintnumber{\tick}$%
+\begin{codeexample}[code only]
+\def\axisdefaultticklabel{%
+	$\pgfmathprintnumber{\tick}$%
 }
 
-\newcommand{\axisdefaultticklabellog}[0]{{%
-	\logtologtentomacro{\tick}{\roundedtick}%
-	$10^{\prettyprintnumber{\roundedtick}}$%
-}}
-\end{lstlisting}
+\def\axisdefaultticklabellog{%
+	\pgfkeysgetvalue{/pgfplots/log number format code/.@cmd}\pgfplots@log@label@style
+	\expandafter\pgfplots@log@label@style\tick\pgfeov
+}
+\end{codeexample}
+that means you can configure the appearance of linear axis with the number formatting options described in section~\ref{sec:number:printing} and logarithmic axis with |log number format code|, see below.
+
 You can change the appearance of tick labels with
-\begin{lstlisting}
-\tikzstyle{every tick label}+=[font=\tiny]
-\end{lstlisting}
+\begin{codeexample}[code only]
+\pgfplotsset{every tick label/.append style={
+	font=\tiny,
+	/pgf/number format/sci}}
+\end{codeexample}
 and/or
-\begin{lstlisting}
-\tikzstyle{every x tick label}+=[above]
-\end{lstlisting}
+\begin{codeexample}[code only]
+\pgfplotsset{every x tick label/.append style={
+	above,
+	/pgf/number format/fixed zerofill}}
+\end{codeexample}
 and
-\begin{lstlisting}
-\tikzstyle{every y tick label}+=[font=\bfseries]
-\end{lstlisting}
-
-\subsubsection{\texttt{tickpos=left$|$right$|$both}}
-Allows to choose where to place the small tick lines. Default is ``\texttt{both}''. This setting applies to both $x$~and~$y$ axis where ``left'' and ``right'' mean ``bottom'' and ``top'' for~$y$.
-
-\subsubsection{\texttt{[xy]minorticks=true$|$false}}
-\subsubsection{\texttt{[xy]majorticks=true$|$false}}
-\subsubsection{\texttt{ticks=minor$|$major$|$both$|$none}}
-Enables/disables the small tick lines either for single axis or for all of them. Major ticks are those placed at the tick positions and minor ticks are only used in log plots. Please note that minor ticks are automatically disabled if \texttt{xtick} is not a uniform range\footnote{A uniform list means the difference between all elements is~$1$ for normal plots or, for logplots, $\log(10)$.}. Default is to use minor and major ticks.
-
-You can configure the length of the tick line with `\texttt{minor tick length=DIMEN}' and `\texttt{major tick length=DIMEN}' (where DIMEN is a \TeX-length like 1cm) and its appearance using the following styles:
-\begin{lstlisting}
-\tikzstyle{every tick}+=[color=black] % applies to major and minor ticks,
-\tikzstyle{every minor tick}+=[thin]  % applies only to minor ticks,
-\tikzstyle{every major tick}+=[thick] % applies only to major ticks.
-\end{lstlisting}
-There is also the style ``\texttt{every tick}'' which applies to both, major and minor ticks.
-
-\subsubsection{\texttt{major tick length=DIMEN}}
-\subsubsection{\texttt{minor tick length=DIMEN}}
-Allows to configure the length of the small tick lines. Minor ticks are only displayed for logarithmic plots. See option ``\texttt{ticks}'' for appearance styles for ticks.
-
-\subsubsection{\texttt{[xy]minorgrids=true$|$false}}
-\subsubsection{\texttt{[xy]majorgrids=true$|$false}}
-\subsubsection{\texttt{grid=minor$|$major$|$both$|$none}}
-Enables/disables different grid lines. Major grid lines are placed at the normal tick positions (see \texttt{xmajorticks}) while minor grid lines are placed at minor ticks (see \texttt{xminorticks}). 
+\begin{codeexample}[code only]
+\pgfplotsset{every y tick label/.append style={font=\bfseries}}
+\end{codeexample}
+Another possibility is to use 
+\begin{codeexample}[code only]
+\begin{axis}[y tick label style={above,
+	/pgf/number format/fixed zerofill}
+]
+...
+\end{axis}
+\end{codeexample}
+which has the same effect as the `|every x tick label|' statement above. This is possible for all \PGFPlots-|every|-styles, see section~\ref{sec:styles}.
+\end{pgfplotsxykey}
+
+\begin{pgfplotsxykey}{\x\ tick label as interval=\mchoice{true,false} (initially false)}
+	Allows to treat tick labels as intervals; that means the tick positions denote the interval boundaries. If there are $n$ positions, $(n-1)$ tick labels will be generated, one for each interval.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[x tick label as interval]
+	\addplot (\x,3*\x);
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+	This mode enables the use of |\nexttick| inside of |xticklabel| (or |yticklabel|). A common application might be a bar plot.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	ybar interval=0.9,
+	x tick label as interval,
+	xmin=2003,xmax=2030,
+	ymin=0,ymax=140,
+	xticklabel={
+	   $\pgfmathprintnumber{\tick}$
+	-- $\pgfmathprintnumber{\nexttick}$},
+	xtick=data,
+	x tick label style={
+		rotate=90,anchor=east,
+		/pgf/number format/1000 sep=}
+]
+
+	\addplot[draw=blue,fill=blue!40!white]
+		coordinates
+		{(2003,40) (2005,100) (2006,15) 
+		 (2010,90) (2020,120) (2030,3)};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotsxykey}
+
+\label{sec:scaled:ticks}%
+\begin{pgfplotskey}{scaled ticks=\mchoice{true,false} (initially true)}
+Allows to factor out common exponents in tick labels. For example, if you have tick labels $20000,40000$ and $60000$, you may want to save some space and write $2,4,6$ with a separate factor `$\cdot 10^4$'. Use `|scaled ticks=true|' to enable this feature (default is |true|).
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[scaled ticks=true]
+	\addplot coordinates {
+		(20000,0.0005)
+		(40000,0.0010)
+		(60000,0.0020)
+	};
+\end{axis}
+\end{tikzpicture}%
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[scaled ticks=false]
+	\addplot coordinates {
+		(20000,0.0005)
+		(40000,0.0010)
+		(60000,0.0020)
+	};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotskey}
+
+\begin{pgfplotscodekey}{tick scale label code}
+Allows to change the default code for scaled tick labels. The default is
+\begin{codeexample}[code only]
+tick scale label code/.code={$\cdot 10^{#1}$}.
+\end{codeexample}
+\end{pgfplotscodekey}
+
+\begin{pgfplotskey}{scale ticks below=\marg{exponent}}
+Allows fine tuning of the `|scaled ticks|' algorithm: if the axis limits are of magnitude $10^e$ and $e<$\marg{exponent}, the common prefactor~$10^e$ will be factored out. The default is 
+\makeatletter
+\pgfplots@scale@ticks@below@exponent
+\makeatother.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{scale ticks above=\marg{exponent}}
+Allows fine tuning of the '|scaled ticks|' algorithm: if the axis limits are of magnitude $10^e$ and $e>$\marg{exponent}, the common prefactor~$10^e$ will be factored out. The default is
+\makeatletter
+\pgfplots@scale@ticks@above@exponent
+\makeatother.
+\end{pgfplotskey}
+
+
+\begin{pgfplotskey}{tickpos=\mchoice{left,right,both} (initially both)}
+Allows to choose where to place the small tick lines. Default is ``|both|''. This setting applies to both $x$~and~$y$ axis where ``left'' and ``right'' mean ``bottom'' and ``top'' for~$y$.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{tick align=\mchoice{inside,center,outside} (initially inside)}
+Allows to change the location of the ticks relative to the axis lines.
+Default is ``|inside|''. this setting applies to both $x$~and~$y$ axis.
+\end{pgfplotskey}
+
+
+\begin{pgfplotsxykeylist}{\x minorticks=\mchoice{true,false} (initially true),\x majorticks=\mchoice{true,false} (initially true),ticks=\mchoice{minor,major,both,none} (initially both)}
+Enables/disables the small tick lines either for single axis or for all of them. Major ticks are those placed at the tick positions and minor ticks are between tick positions. Please note that minor ticks are automatically disabled if |xtick| is not a uniform range\footnote{A uniform list means the difference between all elements is the same for linear axis or, for logarithmic axes, $\log(10)$.}.
+
+The key |minor tick length=|\marg{dimen} configures the tick length for minor ticks while the |major| variant applies to major ticks.
+You can configure the appearance using the following styles:
+\begin{codeexample}[code only]
+\pgfplotsset{every tick/.append style={color=black}} % applies to major and minor ticks,
+\pgfplotsset{every minor tick/.append style={thin}}  % applies only to minor ticks,
+\pgfplotsset{every major tick/.append style={thick}} % applies only to major ticks.
+\end{codeexample}
+There is also the style ``|every tick|'' which applies to both, major and minor ticks.
+\end{pgfplotsxykeylist}
+
+	
+\begin{pgfplotsxykeylist}{\x minorgrids=\mchoice{true,false} (initially true),\x majorgrids=\mchoice{true,false} (initially true),grids=\mchoice{minor,major,both,none} (initially both)}
+Enables/disables different grid lines. Major grid lines are placed at the normal tick positions (see |xmajorticks|) while minor grid lines are placed at minor ticks (see |xminorticks|). 
+
+This example employs the coordinates defined on page~\pageref{page:plotcoords:src}.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	xlabel={\textsc{Dof}},
+	ylabel={$L_2$ Error},
+	grid=major
+]
+\plotcoords
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
+
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{loglogaxis}[
+	grid=both,
+	tick align=outside,
+	tickpos=left]
+\addplot coordinates 
+	{(100,1e-4) (500,1e-5) (1000,3e-6)};
+\addplot coordinates 
+	{(100,1e-5) (500,4e-6) (1000,2e-6)};
+\end{loglogaxis}
+\end{tikzpicture}
+\end{codeexample}
 
 Grid lines will be drawn before tick lines are processed, so ticks will be drawn on top of grid lines. You can configure the appearance of grid lines with the styles
-\begin{lstlisting}
-\tikzstyle{every axis grid}=[style=help lines] % applies to major and minor grids,
-\tikzstyle{every minor grid}+=[color=blue]     % applies only to minor grid lines,
-\tikzstyle{every major grid}+=[thick]          % applies only to major grid lines.
-\end{lstlisting}
-An example for grid lines can be found in section~\ref{sec:gridlines}.
-
-\subsubsection{\texttt{enlargelimits=[true$|$false$|$auto$|$VAL]}}
-Enlarges the axis size somewhat if enabled.
+\begin{codeexample}[code only]
+\pgfplotsset{every axis grid/.style={style=help lines}}
+\pgfplotsset{every minor grid/.append style={color=blue}}
+\pgfplotsset{every major grid/.append style={thick}}
+\end{codeexample}
+\end{pgfplotsxykeylist}
 
-You can set \texttt{xmin}, \texttt{xmax} and \texttt{ymin}, \texttt{ymax} to the minimum/maximum values of your data and \texttt{enlargelimits} will enlarge the canvas such that the axis doesn't touch the plots.
 
-\begin{itemize}
-	\item The value \texttt{true} enlarges all axes.
-	\item The value \texttt{false} uses tight axis limits as specified by the user (or read from input coordinates).
-	\item The value \texttt{auto} will enlarge limits only for axis for which axis limits have been determined automatically.
-	\item All other values like `\texttt{enlargelimits=0.1}' will enlarge all axis limits relatively (in this example, 10\% of the axis limits will be added at all sides).
-	\item If no relative threshold is provided, axis enlargement is done relatively to $x_\text{max}-x_\text{min}$ for normal plots and absolutely for log--plots up to now.
-\end{itemize}
-A small value of \texttt{enlargelimits} may avoid problems with large markers near the boundary.
 
-\subsubsection{\texttt{legend columns=NUMBER}}
-Allows to configure the maximum number of adjacent legend entries. The default is \texttt{legend columns=1}, so legends are placed vertically below each other. Examples can be found in section~\ref{sec:legendexamples:cols}.
 
-\subsubsection{\texttt{legend plot pos=left$|$right$|$none}}
-Configures where the small line specifications will be drawn: left of the description, right of the description or not at all. See an example in section~\ref{sec:legendexamples:plotpos}.
 
-\subsubsection{\texttt{disablelogfilter}}
-Disables numerical evaluation of $\log(x)$ in \LaTeX. If you specify this option, any plot coordinates and tick positions must be provided as $\log(x)$ instead of $x$. This may be faster and -- possibly -- more accurate than the numerical log. The current implementation of $\log(x)$ normalizes~$x$ to $m\cdot 10^e$ and computes
-\[ \log(x) = \log(m) + e \log(10) \]
-where $y = \log(m)$ is computed with a newton method applied to $\exp(y) - m$. The normalization involves string parsing without \TeX-registers. You can savely evaluate $\log(1\cdot 10^{-7})$ although \TeX-registers would produce an underflow for such small numbers. 
 
-The exponential function is implemented in pgf using a truncated Euler McLaurin--series.
+\subsection{Style Options}
+\label{sec:styles}
+\subsubsection{All Supported Styles}
+\PGFPlots\ provides many styles to customize its appearance and behavior. They can be defined and changed in any place where keys are allowed. 
 
-The current implementation of $\log(\cdot)$ is done by the macro \lstinline!\pgfmathlog! which is provided by package \lstinline!pgfmathlog.sty! (contained in the \PGFPlots-bundle).
+\begin{handler}{.style=\marg{key-value-list}}
+	Defines or redefines a style \meta{key}. A style is a normal key which will set all options in \marg{key-value-list} when it is set.
 
-\subsubsection{\texttt{disabledatascaling}}
-\label{sec:disabledatascaling}%
-Disables internal re-scaling of input data. Normally, every input data like plot coordinates, tick positions or whatever, are parsed without using \TeX's limited number precision. Then, a transformation like 
-	\[ T(x) = 10^{q-m} \cdot x \]
-is applied to every input coordinate/position where $m$ is ``the order of $x$'' base~$10$. Example: $x=1234 = 1.234\cdot 10^3$ has order~$m=4$ while $x=0.001234 = 1.234\cdot 10^{-3}$ has order $m=-2$. The parameter~$q$ is the order of the axis' width/height.
+	Use	|\pgfplotsset{|\meta{key}|/.style={|\meta{key-value-list}|}}| to (re-) define a style \meta{key} in the namespace |/pgfplots|.
+\end{handler}
 
-The \textbf{effect} is that your plot coordinates can be of \emph{arbitrary precision} like $0.0000001$ and $0.0000004$. For these two coordinates, \PGFPlots\ will use 100pt and 400pt internally. The transformation is quit fast since it relies only on period shifts.
+\begin{handler}{.append style=\marg{key-value-list}}
+	Appends \marg{key-value-list} to an already existing style \meta{key}. This is the preferred method to change the predefined styles: if you only append, you maintain compatibility with future versions.
 
-The option ``\texttt{disabledatascaling}'' disables this data transformation. That means you are restricted to coordinates which \TeX\ can handle\footnote{Please note that the axis' scaling requires to compute $1/( x_\text{max} - x_{\text{min}} )$. The option \texttt{disabledatascaling} may lead to overflow or underflow in this context, so use it with care! Normally, the data scale transformation avoids this problem.}.
+	Use	|\pgfplotsset{|\meta{key}|/.append style={|\meta{key-value-list}|}}| to append \marg{key-value-list} to the style \meta{key}. This will assume the prefix |/pgfplots|.
+\end{handler}
 
-So far, the data scale transformation applies only to normal axis (logarithmic scales do not need it). 
+\begin{command}{\pgfplotsset\marg{key-value-list}}
+	Defines or sets all options in \marg{key-value-list}.
+	
+	It is a shortcut for |\pgfqkeys{/pgfplots}|\marg{key-value-list}, that means it inserts the prefix |/pgfplots| to any option which has no full path.
 
-\subsubsection{\texttt{anchor=NAME}}
-This option shifts the axis horizontally and vertically such that the axis anchor (a point on the axis) is placed at coordinate $(0,0)$\footnote{I haven't understood how to implement an axis as a path command. In the future, the last path coordinate may be used in this place.}.
+	You can define new style keys with |.style| and |.append style|, see above.
+\end{command}
 
-\begin{itemize}
-	\item 
-Anchors are useful in conjunction with horizontal or vertical alignment of plots, see the examples in section~\ref{sec:align} and section~\ref{sec:halign}.
-
-	\item Anchors are placed on the axis rectangle; any axis labels, titles or legends are completely unaffected.
-
-	\item Valid choices for \texttt{NAME} are 
-		\texttt{north}, 
-		\texttt{north west}, 
-		\texttt{west}, 
-		\texttt{south west}, 
-		\texttt{south}, 
-		\texttt{south east}, 
-		\texttt{east}, 
-		\texttt{north east}, 
-		\texttt{center}.
-		They denote the places 
+\begin{stylekey}{/pgfplots/every axis}
+ Installed at the beginning of every axis. \Tikz\ options inside of it will be used for anything inside of the axis rectangle and any axis descriptions.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every semilogx axis}
+ Installed at the beginning of every plot with linear $x$~axis and logarithmic $y$~axis, but after `|every axis|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every semilogy axis}
+ Likewise, but with interchanged roles for $x$~and~$y$.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every loglog axis}
+ Installed at the beginning of every double--logarithmic plot.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every linear axis}
+ Installed at the beginning of every plot with normal axis scaling.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis plot}
+ Used for the \Tikz-drawing command in any `\lstinline!\addplot!' command. May only contain \Tikz\ options.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis plot post}
+ This style is very similar to |every axis plot| in that is applies to any drawing command in |\addplot|. However, it is set \emph{after} any user defined styles or |cycle list| options.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfplotsset{
+	every axis plot post/.append style=
+		{mark=none}}
+
+\begin{axis}[
+	legend style={
+		at={(0.03,0.97)},anchor=north west},
+	domain=0:1]
+	\addplot (\x,\x^2);
+	\addplot (\x,{exp(\x)});
+	\legend{$x^2$,$e^x$}
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis plot no \#}
+ Used for every \#th plot where $\#=1,2,3,4,\dotsc$.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis label}
+ Used for $x$~and~$y$ axis label. You can use `|at=|\marg{(x,y)} to set its position where $(0,0)$ refers to the lower left corner and $(1,1)$ to the upper right one.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis x label}
+ Used for $x$~labels, installed after `|every axis label|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis y label}
+ Like `|every axis x label|', just for~$y$.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis title}
+ Used for any axis title. The |at=|\marg{(x,y)} command works as for `|every axis label|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every tick}
+ Installed for each of the small tick lines.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor tick}
+ Used for each minor tick line, installed after `|every tick|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major tick}
+ Used for each major tick line, installed after `|every tick|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every x tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor x tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major x tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every y tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor y tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major y tick}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis grid}
+ Used for each grid line.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor grid}
+ Used for each minor grid line, installed after `|every axis grid|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major grid}
+ Likewise, for major grid lines.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis x grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor x grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major x grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis y grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every minor y grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every major y grid}
+
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every tick label}
+ Used for each $x$~and~$y$ tick labels.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every x tick label}
+ Used for each $x$~tick label, installed after `|every tick label|'.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every y tick label}
+ Likewise, for $y$~tick labels.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every x tick scale label}
+ Configures placement and display of the nodes containing the order of magnitude of $x$~tick labels, see~\ref{sec:scaled:ticks} for more information about |scaled ticks|.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every y tick scale label}
+ Likewise, but for $y$-tick scale labels.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every extra x tick}
+ Allows to configure the appearance of `|extra x ticks|'. This style is installed before touching the first extra $x$~tick, so you can set any option which affects tick generation, for example
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every error bar}
+ Installed for every error bar.
+\begin{codeexample}[code only]
+\pgfplotsset{every extra x tick/.append style={grid=major}}
+\pgfplotsset{every extra x tick/.append style={major tick length=0pt}}
+\pgfplotsset{every extra x tick/.append style={/pgf/number format=sci subscript}}
+\end{codeexample}
+or something like that.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every extra y tick}
+ Likewise, but for extra $y$-ticks.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every axis legend}
+ Installed for each legend. As for |every axis label|, the legend's position can be placed using coordinates between $0$~and~$1$, see above.
+\end{stylekey}
+
+
+\begin{pgfplotsxykeylist}{%
+	\x\ tick label style=\marg{$\dots$},
+	\x\ tick scale label style=\marg{$\dots$},
+	label style=\marg{$\dots$},
+	\x\ label style=\marg{$\dots$},
+	title style=\marg{$\dots$},
+	tick style=\marg{$\dots$},
+	minor tick style=\marg{$\dots$},
+	major tick style=\marg{$\dots$},
+	\x\ tick style=\marg{$\dots$},
+	minor \x\ tick style=\marg{$\dots$},
+	major \x\ tick style=\marg{$\dots$},
+	grid style=\marg{$\dots$},
+	minor grid style=\marg{$\dots$},
+	major grid style=\marg{$\dots$},
+	\x\ grid style=\marg{$\dots$},
+	minor \x\ grid style=\marg{$\dots$},
+	major \x\ grid style=\marg{$\dots$},
+	extra \x\ tick style=\marg{$\dots$}}
+
+All these options are equivalent to the corresponding `|every ...|'--styles.
+
+For example, |label style=|\marg{...} has the same effect as 
+\begin{codeexample}[code only]
+\pgfplotsset{every axis label/.append style={...}}
+\end{codeexample}
+but can be provided as an option (or as part of a user defined style).
+See section~\ref{sec:styles} for more information about the available styles.
+\end{pgfplotsxykeylist}
+
+\subsubsection{Assigning Own Styles}
+\label{sec:styles:own}%
+Use |\pgfplotsset{|\meta{style name}|/.style=|\marg{key-value-list}|}|
+to create own styles. You \emph{can't use} |\tikzstyle|\marg{style name}|=[]|.
+\begin{codeexample}[]
+\pgfplotsset{my personal style/.style=
+	{grid=major,font=\large}}
+
+\begin{tikzpicture}
+\begin{axis}[my personal style]
+	\addplot coordinates {(0,0) (1,1)};	
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+\subsection{Alignment Options}
+
+\begin{pgfplotskey}{anchor=\marg{name} (initially south west)}
+\label{option:anchor}%
+This option shifts the axis horizontally and vertically such that the axis anchor (a point on the axis) is placed at coordinate $(0,0)$.
+
+Anchors are useful in conjunction with horizontal or vertical alignment of plots, see the examples below.
+
+There are three sets of anchors available: anchors positioned on the axis rectangle, anchors on the outer bounding box and anchors which have one coordinate on the outer bounding box and the other one at a position of the axis rectangle.
+
+{%
+%\pgfplotsset{every picture/.append style={background rectangle/.style={help lines},show background rectangle}}%
+\pgfplotstableread{pgfplots.testplot}\plottable
+\def\plot{%
+	\begin{axis}[
+		width=5cm,
+		name=test plot,
+		xlabel=$x$,
+		ylabel={$y$},% = \frac 12 \cdot x^3 - 4 x^2 -16 x$},
+		y label style={yshift=-15pt},
+		legend style={at={(1.03,1)},anchor=north west},
+		title=A test plot.
+	]
+		\addplot table from{\plottable};
+		%\addplot coordinates {(0,0) (1,1)};
+		\addlegendentry{$f(x)$}
+		\addplot[red] plot[id=gnuplot_ppp,domain=-40:40,samples=120] function{10000*sin(x/3)};
+		\addlegendentry{$g(x)$}
+	\end{axis}
+}%
+\def\showit#1#2{%
+	%\node[show them,#2] at (test plot.#1) {(s.#1)};
+	\node[pin=#2:(s.#1),fill=black,circle,scale=0.3] at (test plot.#1) {};
+}%
+In more detail, we have
+\tikzstyle{every pin}=[opacity=0.5,fill=yellow,rectangle,rounded corners=3pt,font=\tiny]
+Anchors on the axis rectangle,
 		\begin{center}
-			\begin{tikzpicture}[x=3cm,y=3cm]
-				\draw (0,0) rectangle (1,1);
-				\node[above]		at (0.5,1)	{N};
-				\node[above left]	at (0,1)		{NW};
-				\node[left]			at (0,0.5)	{W};
-				\node[below left]	at (0,0)		{SW};
-				\node[below]		at (0.5,0)	{S};
-				\node[below right]	at (1,0)		{SE};
-				\node[right]		at (1,0.5)	{E};
-				\node[above right]	at (1,1)		{NE};
-				\node at (0.5,0.5)	{C};
+			\begin{tikzpicture}
+				\plot
+				\showit{north}{90}
+				\showit{north west}{135}
+				\showit{west}{180}
+				\showit{south west}{225}
+				\showit{south}{270}
+				\showit{south east}{305}
+				\showit{east}{0}
+				\showit{north east}{45}
+				\showit{center}{90}
 			\end{tikzpicture}
 		\end{center}
-	\item The default value is \texttt{anchor=south west}.
+Anchors on the outer bounding box,
+		\begin{center}
+			\begin{tikzpicture}
+				\plot
+				\showit{outer north}{90}
+				\showit{outer north west}{135}
+				\showit{outer west}{180}
+				\showit{outer south west}{225}
+				\showit{outer south}{270}
+				\showit{outer south east}{305}
+				\showit{outer east}{0}
+				\showit{outer north east}{45}
+				\showit{outer center}{90}
+			\end{tikzpicture}
+		\end{center}
+Finally there are anchors which have one coordinate on the outer bounding box, and one on the axis rectangle,
+		\begin{center}
+			\begin{tikzpicture}[show background rectangle]
+				\plot
+				{\pgfplotsset{every pin/.append style={pin distance=1cm}}%
+				\showit{above north}{90}
+				}%
+				\showit{above north east}{90}
+				\showit{right of north east}{0}
+				\showit{right of east}{0}
+				\showit{right of south east}{0}
+				\showit{below south east}{-90}
+				{\pgfplotsset{every pin/.append style={pin distance=1cm}}%
+				\showit{below south}{-90}
+				}%
+				\showit{below south west}{-90}
+				\showit{left of south west}{180}
+				\showit{left of west}{180}
+				\showit{left of north west}{180}
+				\showit{above north west}{90}
+			\end{tikzpicture}
+		\end{center}
+The default value is |anchor=south west|. You can use anchors in conjunction with the \Tikz\ |baseline| option and/or \lstinline!\begin{pgfinterruptboundingbox}! to perform alignment.
+}
 
-\end{itemize}
+\begin{description}
+\item[Vertical alignment with \texttt{baseline}]
+\label{sec:align}%
+The default axis anchor is |south west|, which means that the picture coordinate $(0,0)$ is the lower left corner of the axis. As a consequence, the \Tikz\ option ``|baseline|'' allows vertical alignment of adjacent plots:
+\begin{codeexample}[]
+\tikzset{domain=-1:1}
+\begin{tikzpicture}
+	\begin{axis}[xlabel=A normal sized $x$ label]
+	\addplot[smooth,blue,mark=*] (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}%
+\hspace{0.15cm}
+\begin{tikzpicture}
+	\begin{axis}[xlabel={$\displaystyle \sum_{i=0}^N n_i $ }]
+	\addplot[smooth,blue,mark=*] (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
 
-\subsubsection{\texttt{width=DIMEN}, \texttt{height=DIMEN}}
-The axis is always scaled such that its dimension is 
+\begin{codeexample}[]
+\tikzset{domain=-1:1}
+\begin{tikzpicture}[baseline]
+	\begin{axis}[xlabel=A normal sized $x$ label]
+	\addplot[smooth,blue,mark=*] (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}%
+\hspace{0.15cm}
+\begin{tikzpicture}[baseline]
+	\begin{axis}[xlabel={$\displaystyle \sum_{i=0}^N n_i $ }]
+	\addplot[smooth,blue,mark=*] (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+The |baseline| option configures \Tikz\ to shift position $y=0$ to the text's baseline and the |south west| anchor shifts the axis such the $y=0$ is at the lower left axis corner.
+
+
+\item[Horizontal Alignment]
+\label{sec:halign}%
+If you place multiple |axes| into a single |tikzpicture| and use the `|anchor|'-option, you can control horizontal alignment:
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfplotsset{every axis/.append style={
+cycle list={
+	{red,only marks,mark options={
+		fill=red,scale=0.8},mark=*},
+	{black,only marks,mark options={
+		fill=black,scale=0.8},mark=square*}}}}
+
+\begin{axis}[width=4cm,scale only axis,
+	name=main plot]
+\addplot file 
+	{plotdata/pgfplots_scatterdata1.dat};
+\addplot file 
+	{plotdata/pgfplots_scatterdata2.dat};
+\addplot[blue] coordinates {
+	(0.093947,	-0.011481)
+	(0.101957,	0.494273)
+	(0.109967,	1.000027)};
+\end{axis}
+
+% introduce named coordinate:
+\path (main plot.below south west) ++(0,-0.1cm) 
+	coordinate (lower plot position);
 
-{\centering\lstinline!(\axisdefaultwidth,\axisdefaultheight)!.
+\begin{axis}[at={(lower plot position)},
+	anchor=north west,
+	width=4cm,scale only axis,height=0.8cm,
+	ytick=\empty]
 
+\addplot file 
+  {plotdata/pgfplots_scatterdata1_latent.dat};
+\addplot file 
+  {plotdata/pgfplots_scatterdata2_latent.dat};
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+
+
+\item[Bounding box restrictions]
+\label{sec:bounding:box:example}%
+{%
+The following figure is centered and encapsulated with an \lstinline!\fbox! to show its bounding box.
+\setlength{\fboxsep}{0pt}%
+\begin{codeexample}[]
+\fbox{%
+\begin{tikzpicture}%
+	\begin{pgfinterruptboundingbox}
+	\begin{axis}[
+		name=my plot,
+		title=A title,
+		xlabel={$x$},
+		ylabel={$y$},
+		legend style={at={(0.5,0.97)},
+			anchor=north,legend columns=-1},
+		domain=-2:2
+	]
+	\addplot (\x,\x^2);
+	\addplot (\x,\x^3);
+	\addplot (\x,\x^4);
+	\legend{$x^2$,$x^3$,$x^4$}
+	\end{axis}
+	\end{pgfinterruptboundingbox}
+
+	\useasboundingbox 
+			  (my plot.below south west)
+	rectangle (my plot.above north east);
+\end{tikzpicture}%
 }%
-\noindent
-The options \lstinline!width=DIMEN! and \lstinline!height=DIMEN! override the default scaling. If just one of them is specified, the other one is scaled such that the aspect ratio stays the same.
+\end{codeexample}%
+}%
+The |pgfinterruptboundingbox| environment does not include its content into the image's bounding box, and |\useasboundingbox| sets the pictures bounding box to the following argument.
 
-\noindent\underline{Remarks:} 
-\begin{itemize}
-	\item The scaling only affects the width of one unit in $x$-direction or the height for one unit in $y$-direction. Axis labels and tick labels won't be resized, but their size is used to determine the axis scaling.
+\end{description}
+\end{pgfplotskey}
 
-	\item You can use the \Tikz-\lstinline!scale=NUMBER! option,
-	\begin{lstlisting}
-		\begin{tikzpicture}[scale=2]
-		\begin{axis}
-		...
-		\end{axis}
-		\end{tikzpicture}
-	\end{lstlisting}
-	to scale the complete picture.
+\begin{pgfplotskey}{at=\marg{coordinate expression}}
+Assigns a position for the complete axis image. This option works similarly to the |at|-option of |\node[at=|\marg{coordinate expression}|]|, see~\cite{tikz}. The common syntax is |at=|\marg{(x,y)}.
+\end{pgfplotskey}
 
-	\item The \Tikz-options \lstinline!x! and \lstinline!y! which set the unit dimensions in $x$ and $y$ directions can be specified as arguments to \lstinline!\begin{axis}[x=1.5cm,y=2cm]! if needed (see below). These settings override the \lstinline!width! and \lstinline!height! options.
 
-	\item You can also force a fixed width/height of the axis (without looking at labels) with
-	\begin{lstlisting}
-		\begin{tikzpicture}
-		\begin{axis}[width=5cm,scale only axis]
-			...
-		\end{axis}
-		\end{tikzpicture}
-	\end{lstlisting}
-
-	\item Use
-	\begin{lstlisting}
-		\renewcommand{\axisdefaultwidth}{3cm}
-		\renewcommand{\axisdefaultheight}{6cm}
-		\begin{axis}
-		...
-		\end{axis}
-	\end{lstlisting}
-	to replace the default dimension.
-
-	\item Please note that up to the writing of this manual, \PGFPlots\ only estimates the size needed for axis- and tick labels. It does not include legends which have been placed outside of the axis\footnote{I.e. the `\texttt{width}' option will not work as expected, but the bounding box is still ok.}. This may be fixed in future versions.
-
-	Use the \lstinline!x=DIMEN!, \lstinline!y=DIMEN! and \lstinline!scale only axis! options if the scaling happens to be wrong.
-\end{itemize}
 
-\subsubsection{\texttt{scale only axis=[true$|$false]}}
-This boolean option allows to apply \texttt{width} and \texttt{height} only to the axis rectangle. If `\texttt{scale only axis}' is enabled, label, tick and legend dimensions won't influence the size of the axis rectangle.
+\subsection{Miscellaneous Options}
 
-If \texttt{scale only axis=false} (the default), \PGFPlots\ will try to produce the desired width \emph{including} labels, titles and ticks.
+\begin{pgfplotskey}{disablelogfilter=\mchoice{true,false} (initally false, default true)}
+Disables numerical evaluation of $\log(x)$ in \TeX. If you specify this option, any plot coordinates and tick positions must be provided as $\log(x)$ instead of $x$. This may be faster and -- possibly -- more accurate than the numerical log. The current implementation of $\log(x)$ normalizes~$x$ to $m\cdot 10^e$ and computes
+\[ \log(x) = \log(m) + e \log(10) \]
+where $y = \log(m)$ is computed with a newton method applied to $\exp(y) - m$. The normalization involves string parsing without \TeX-registers. You can savely evaluate $\log(1\cdot 10^{-7})$ although \TeX-registers would produce an underflow for such small numbers. 
+\end{pgfplotskey}
 
-\subsubsection{\texttt{x=DIMEN}, \texttt{y=DIMEN}}
-Use
-	\begin{lstlisting}
-		\begin{tikzpicture}
-		\begin{axis}[x=1.5cm,...]
-		...
-		\end{axis}
-		\end{tikzpicture}
-	\end{lstlisting}
-	to set the unit size for one $x$-coordinate to 1.5cm. The same is possible for the $y$-coordinate.
+\label{sec:disabledatascaling}%
+\begin{pgfplotskey}{disabledatascaling=\mchoice{true,false} (initally false, default true)}
+Disables internal re-scaling of input data. Normally, every input data like plot coordinates, tick positions or whatever, are parsed without using \TeX's limited number precision. Then, a transformation like 
+	\[ T(x) = 10^{q-m} \cdot x - a \]
+is applied to every input coordinate/position where $m$ is ``the order of $x$'' base~$10$. Example: $x=1234 = 1.234\cdot 10^3$ has order~$m=4$ while $x=0.001234 = 1.234\cdot 10^{-3}$ has order $m=-2$. The parameter~$q$ is the order of the axis' width/height.
 
-	Setting $x$ explicitly overrides the \lstinline!width! option. Setting $y$ explicitly overrides the \lstinline!height! option.
+The \textbf{effect} is that your plot coordinates can be of \emph{arbitrary magnitude} like $0.0000001$ and $0.0000004$. For these two coordinates, \PGFPlots\ will use 100pt and 400pt internally. The transformation is quit fast since it relies only on period shifts. This scaling allows precision beyond \TeX's capabilities.
+%\footnote{Please note that while plot coordinates can be of quite large magnitude like $10^12$ or $10^{-9}$, \PGFPlots\ still uses \TeX-registers internally (the math parser of \PGF). If your axis interval is $[1234567.8, 1234567.9]$ or something like that, }.
 
-	Please note that it is \emph{not} possible to specify \lstinline!x! as argument to \lstinline!tikzpicture!. The option 
-	\begin{lstlisting}
-		\begin{tikzpicture}[x=1.5cm]
-		\begin{axis}
-			...
-		\end{axis}
-		\end{tikzpicture}
-	\end{lstlisting}
-	won't have any effect because an axis is always scale to the final size 
-	
-	{\centering\lstinline!(\axisdefaultwidth,\axisdefaultheight)!
-	
-	}%
-	\noindent
-	(see the \lstinline!width! option).
+The option ``|disabledatascaling|'' disables this data transformation. That means you are restricted to coordinates which \TeX\ can handle\footnote{Please note that the axis' scaling requires to compute $1/( x_\text{max} - x_{\text{min}} )$. The option |disabledatascaling| may lead to overflow or underflow in this context, so use it with care! Normally, the data scale transformation avoids this problem.}.
 
-\subsubsection{\texttt{hide axis=[true$|$false]}}
-Allows to hide the axis. No outer rectangle, no tick marks and no labels will be drawn. Only titles and legends will be processed as usual.
+So far, the data scale transformation applies only to normal axis (logarithmic scales do not need it). 
+\end{pgfplotskey}
 
-Axis scaling and clipping will be done as if you did not use \texttt{hide axis}.
 
-\subsubsection{\texttt{[xy]filter=CMD}}
-The option \texttt{xfilter} and \texttt{yfilter} allow coordinate filtering. A coordinate filter maps an input coordinate to an output coordinate (or discards it completely).
+\begin{pgfplotsxykey}{\x\ filter/.code=\marg{...}} % FIXME create a xycodekey environment
+The code keys |x filter| and |y filter| allow coordinate filtering. A coordinate filter gets an input coordinate as |#1|, applies some operation and writes the result into the macro |\pgfmathresult|. If |\pgfmathresult| is empty afterwards, the coordinate is discarded.
 
-Coordinate filters are useful in automatic processing system, where \PGFPlots\ is used to display automatically generated plots. You may not want to filter your coordinates by hand, so these options provide a tool to do this automatically.
+It is allowed if filters do not |\pgfmathresult|. In this case, the unfiltered coordinate will be used.
 
-Be warned: `\texttt{xfilter}' and `\texttt{yfilter}' are advanced options and may require advanced knowledge about \TeX.
+Coordinate filters are useful in automatic processing system, where \PGFPlots\ is used to display automatically generated plots. You may not want to filter your coordinates by hand, so these options provide a tool to do this automatically.
 
-They are used as in the following example. The code
-\begin{lstlisting}
-\def\myOwnXfilter#1\to#2{%
-	\def#2{0.5}%
-}%
+The following filter adds $0.5$ to every $x$ coordinate.
+\begin{codeexample}[]
 \begin{tikzpicture}
-\begin{axis}[xfilter={\myOwnXfilter}]
-\addplot plot coordinates {
+\begin{axis}[x filter/.code=
+	{\pgfmathadd{#1}{0.5}}]
+\addplot coordinates {
 	(4,0)
 	(6,1)
 };
 \end{axis}
 \end{tikzpicture}
-\end{lstlisting}
-will result in
-\begin{center}
-{%
-\def\myOwnXfilter#1\to#2{%
-	\def#2{0.5}%
-}%
+\end{codeexample}
+Please refer to~\cite[pgfmath manual]{tikz} for details about the math engine of \PGF. Please keep in mind that the math engine works with limited \TeX\ precision.
+
+During evaluation of the filter, the macro |\coordindex| contains the number of the current coordinate (starting with~$0$). Thus, the following filter discards all coordinates after the $5$th and before the $10$th.
+\begin{codeexample}[]
 \begin{tikzpicture}
-\begin{axis}[xfilter={\myOwnXfilter}]
-\addplot plot coordinates {
-	(4,0)
-	(6,1)
-};
+\begin{axis}[
+	samples=20,
+	x filter/.code={
+		\ifnum\coordindex>4\relax
+			\ifnum\coordindex<11\relax
+				\def\pgfmathresult{}
+			\fi
+		\fi
+	}]
+\addplot (\x,\x^2);
 \end{axis}
 \end{tikzpicture}
-}%
-\end{center}
-because all $x$-coordinates are replaced by~$0.5$.
+\end{codeexample}
+There is also a style key which simplifies selection by index, see below.
 
-The Argument `\texttt{CMD}' is the name of a \TeX-macro which takes exactly two arguments which are separated by the string `\texttt{\string\to}'. Such a macro is defined as
-\begin{lstlisting}
-\def\exampleFilter#1\to#2{%
-	\def#2{#1}%
-}%
-\end{lstlisting}
-This example uses the \TeX-command \lstinline!\def! to define variables and commands. The arguments are used as follows:
-\begin{itemize}
-	\item \PGFPlots\ invokes the filter with argument \texttt{\#1} set to the input coordinate. For $x$-filters, this is the $x$-coordinate as it is specified to \lstinline!\addplot!, for $y$-filters it is the $y$-coordinate.
-	\item If the corresponding axis is logarithmic, \texttt{\#1} is the \emph{logarithm} of the coordinate as a real number, for example \texttt{\#1=4.2341}.
-	\item The arguments to coordinate filters are not transformed. You may need to call coordinate parsing routines.
-	\item Argument \texttt{\#2} is the name of a \TeX\ command. The filter should assign this command. The first filter above assigned the constant~$0.5$ and the second filter did not filter anything because it is the identity.
+	\PGFPlots\ invokes the filter with argument |#1| set to the input coordinate. For $x$-filters, this is the $x$-coordinate as it is specified to \lstinline!\addplot!, for $y$-filters it is the $y$-coordinate.
 
-	The replacement text of \texttt{\#2} is expected to be \emph{either} empty \emph{or} a real number (without any length-suffix like `cm' or `pt'). If it is empty, the coordinate won't be drawn at all, it will be thrown away.
-\end{itemize}
+	If the corresponding axis is logarithmic, |#1| is the \emph{logarithm} of the coordinate as a real number, for example |#1=4.2341|.
 
-\subsection{\texttt{execute at begin plot=COMMANDS}}
-This axis option allows to invoke `\texttt{COMMANDS}' at the beginning of each \lstinline!\addplot! command. The argument `\texttt{COMMANDS}' can be any \LaTeX\ content.
+	The arguments to coordinate filters are not transformed. You may need to call coordinate parsing routines.
+\end{pgfplotsxykey}
 
-You may use this in conjunction with \texttt{xfilter=...} to reset any counters or whatever. An example would be to change every 4th coordinate.
+\begin{stylekey}{/pgfplots/skip coords between index=\marg{begin}\marg{end}}
+	A style which appends an |x filter| which discards selected coordinates. The selection is done by index where indexing starts with~$0$, see |\coordindex|. Every coordinate with index $\meta{begin} \le i < \meta{end}$ will be skipped.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\begin{axis}[
+	samples=20,
+	skip coords between index={5}{11},
+	skip coords between index={15}{18}]
 
-\subsection{\texttt{execute at end plot=COMMANDS}}
-This axis option allows to invoke `\texttt{COMMANDS}' after each \lstinline!\addplot! command. The argument `\texttt{COMMANDS}' can be any \LaTeX\ content.
+\addplot (\x,\x^2);
+\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{stylekey}
+
+\begin{pgfplotskey}{filter discard warning=\mchoice{true,false} (initially true)}
+	Issues a notification in your logfile whenever coordinate filters discard coordinates.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{execute at begin plot=\marg{commands}}
+This axis option allows to invoke \marg{commands} at the beginning of each \lstinline!\addplot! command. The argument \marg{commands} can be any \TeX\ content.
+
+You may use this in conjunction with |xfilter=...| to reset any counters or whatever. An example would be to change every $4$th coordinate.
+\end{pgfplotskey}
+
+\begin{pgfplotskey}{execute at end plot=\marg{commands}}
+This axis option allows to invoke \marg{commands} after each \lstinline!\addplot! command. The argument \marg{commands} can be any \TeX\ content.
+\end{pgfplotskey}
+
+\begin{pgfplotscodekey}{before end axis}
+Allows to insert \marg{commands} just before the axis is ended. This option takes effect inside of the clipped area.
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={
+	before end axis/.code={
+		\fill[red] (axis cs:1,10) circle(5pt);
+		\node at (axis cs:-4,10) 
+			{\large This text has been inserted 
+			 using \texttt{before end axis}.};
+	}}}
+\begin{tikzpicture}
+	\begin{axis}
+	\addplot (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotscodekey}
+
+\begin{pgfplotscodekey}{after end axis}
+Allows to insert \marg{commands} right after the end of the clipped drawing commands. While |befor end axis| has the same effect as if \marg{commands} had been placed inside of your axis, |after end axis| allows to access axis coordinates without being clipped.
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={
+	after end axis/.code={
+		\fill[red] (axis cs:1,10) circle(5pt);
+		\node at (axis cs:-4,10) 
+			{\large This text has been inserted using \texttt{after end axis}.};
+	}}}
+\begin{tikzpicture}
+	\begin{axis}
+	\addplot (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotscodekey}
+
+\begin{pgfplotscodekey}{extra description}
+Allows to insert \marg{commands} after axis labels, titles and legends have been typeset.
+
+The code can thus use $(0,0)$ to access the lower left corner and $(1,1)$ to access the upper right one. It won't be clipped.
+\begin{codeexample}[]
+\pgfplotsset{every axis/.append style={
+	extra description/.code={
+		\node at (0.5,0.5) {Center!};
+	}}}
+\begin{tikzpicture}
+	\begin{axis}
+	\addplot (\x,\x^2);
+	\end{axis}
+\end{tikzpicture}
+\end{codeexample}
+\end{pgfplotscodekey}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testplot b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testplot
new file mode 100644
index 00000000000..b293f51b819
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testplot
@@ -0,0 +1,23 @@
+#Curve 0 of 1, 20 points .5*x**3 - 4*x**2 -16*x**1
+#x y type
+-40.00000 -37760.00000  i
+-35.78947 -27472.03966  i
+-31.57895 -19229.39204  i
+-27.36842 -12808.11780  i
+-23.15789 -7984.27759  i
+-18.94737 -4533.93206  i
+-14.73684 -2233.14186  i
+-10.52632 -857.96763  i
+-6.31579 -184.47004  i
+-2.10526 11.29028  i
+2.10526 -46.74734  i
+6.31579 -134.64353  i
+10.52632 -28.45896  i
+14.73684 495.74574  i
+18.94737 1661.90990  i
+23.15789 3693.97288  i
+27.36842 6815.87403  i
+31.57895 11251.55270  i
+35.78947 17224.94824  i
+40.00000 24960.00000  i
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable
new file mode 100644
index 00000000000..e568f8e1d2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable
@@ -0,0 +1,10 @@
+Level	Cost	Error
+1	7	8.47178381e-02
+2	31	3.04409349e-02
+3	111	1.02214539e-02
+4	351	3.30346265e-03
+5	1023	1.03886535e-03
+6	2815	3.19646457e-04
+7	7423	9.65789766e-05
+8	18943	2.87339125e-05
+9	47103	8.43749881e-06
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable2.dat b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable2.dat
new file mode 100644
index 00000000000..d9bdc8f72e6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.testtable2.dat
@@ -0,0 +1,9 @@
+x	y	errorx	errory
+32	32	0	0
+64	64	0	0
+128	128	0	0.3	
+1024	1024	0	0.2	
+32068	32068	0	0.6	
+64000	64000	0	0.6	
+128000	128000	0	0.6	
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.tex
index 2feb78a99bd..b00a5fd7ea6 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.tex
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.tex
@@ -19,68 +19,50 @@
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[a4paper]{article}
-
-\usepackage{ifpdf}
-\ifpdf
-	\usepackage[pdftex]{hyperref}
-\else
-	\usepackage[dvipdfm]{hyperref}
-\fi
-% \usepackage{graphicx}
-\usepackage[intlimits]{amsmath}
-\usepackage{amssymb}
-\usepackage{amsfonts}
-
-\newcommand{\R}{\mathbb{R}}
-\newcommand{\N}{\mathbb{N}}
-\newcommand{\Z}{\mathbb{Z}}
-
-\usepackage{listings}
-\usepackage{courier}
-\lstset{%
-	basicstyle=\ttfamily,
-	language=[LaTeX]tex, % Seems as if \lstset{language=tex} must be invoked BEFORE loading tikz!?
-	tabsize=4,
-	breaklines=true,
-	breakindent=0pt
-}
-
-\ifpdf
-	\pdfinfo {
-		/Author	(Christian Feuersaenger)
-	}
-
-\else
-	\def\pgfsysdriver{pgfsys-dvipdfm.def}
-\fi
-%\def\pgfsysdriver{pgfsys-pdftex.def}
-\usepackage{pgfplots}
-
-\newcommand{\FIXME}[1]{\textcolor{red}{(FIXME: #1)}}
-
-% fuer endvironment 'sidewaysfigure' bspw
-% \usepackage{rotating}
-
-\newcommand\Tikz{Ti\textit kZ}
-\newcommand\PGF{PGF}
-\newcommand\PGFPlots{Pgfplots}
-
-% Fix overful hboxes automatically:
-\tolerance=2000
-\emergencystretch=10pt
-
-
-\author{%
-	Christian Feuers\"anger\footnote{\url{http://wissrech.ins.uni-bonn.de/people/feuersaenger}}\\%
-	Institut f\"ur Numerische Simulation\\
-	Universit\"at Bonn, Germany}
-\title{Manual for Package \PGFPlots\\{\small Version \pgfplotsversion}}
+\input{pgfplots.preamble.tex}
+
+\def\plotcoords{%
+\addplot coordinates {
+(5,8.312e-02)    (17,2.547e-02)   (49,7.407e-03)
+(129,2.102e-03)  (321,5.874e-04)  (769,1.623e-04)
+(1793,4.442e-05) (4097,1.207e-05) (9217,3.261e-06)
+};
+
+\addplot coordinates{
+(7,8.472e-02)    (31,3.044e-02)    (111,1.022e-02)
+(351,3.303e-03)  (1023,1.039e-03)  (2815,3.196e-04)
+(7423,9.658e-05) (18943,2.873e-05) (47103,8.437e-06)
+};
+
+\addplot coordinates{
+(9,7.881e-02)     (49,3.243e-02)    (209,1.232e-02)
+(769,4.454e-03)   (2561,1.551e-03)  (7937,5.236e-04)
+(23297,1.723e-04) (65537,5.545e-05) (178177,1.751e-05)
+};
+
+\addplot coordinates{
+(11,6.887e-02)    (71,3.177e-02)     (351,1.341e-02)
+(1471,5.334e-03)  (5503,2.027e-03)   (18943,7.415e-04)
+(61183,2.628e-04) (187903,9.063e-05) (553983,3.053e-05)
+};
+
+\addplot coordinates{
+(13,5.755e-02)     (97,2.925e-02)     (545,1.351e-02)
+(2561,5.842e-03)   (10625,2.397e-03)  (40193,9.414e-04)
+(141569,3.564e-04) (471041,1.308e-04) 
+(1496065,4.670e-05)
+};
+}%
+
+\title{%
+	Manual for Package \PGFPlots\\
+	{\small Version \pgfplotsversion}\\
+	{\small\href{http://sourceforge.net/projects/pgfplots}{http://sourceforge.net/projects/pgfplots}}}
 
 \begin{document}
 \maketitle
 \begin{abstract}%
-\PGFPlots\ draws high--quality function plots in normal or logarithmic scaling with a user-friendly interface. The user supplies axis labels, legend entries and the plot coordinates for one or more plots and \PGFPlots\ applies axis scaling, computes any logarithms and axis ticks and draws the plots. It is based on Till Tantau's package \PGF/\Tikz.
+\PGFPlots\ draws high--quality function plots in normal or logarithmic scaling with a user-friendly interface. The user supplies axis labels, legend entries and the plot coordinates for one or more plots and \PGFPlots\ applies axis scaling, computes any logarithms and axis ticks and draws the plots, supporting line plots, piecewise constant plots, bar plots and area plots. It is based on Till Tantau's package \PGF/\Tikz.
 \end{abstract}
 \tableofcontents
 \section{Introduction}
@@ -89,30 +71,21 @@ This package provides tools to generate plots and labeled axes easily. It draws
 It is build completely on \Tikz\ and \PGF\ and may be used as \Tikz\ library. 
 
 \section{Upgrade remarks}
-This release provides a lot of improvements which can be found in all detail in ``\texttt{changelog.txt}'' for interested readers. However, some attention is required for upgrades:
-\begin{enumerate}
-	\item I have re-implemented legends as \Tikz-matrizes and the default legend styles have been changed accordingly.
+This release provides a lot of improvements which can be found in all detail in \texttt{ChangeLog} for interested readers. However, some attention is useful for upgrades, which does especially affect style options: although |\tikzstyle| is still supported, you should replace any occurance of |\tikzstyle| with |\pgfplotsset{|\meta{style name}|/.style={|\meta{key-value-list}|}}| or the associated |.append style| variant. See section~\ref{sec:styles} for more detail.
 
-	Please \emph{replace} 
-	\begin{lstlisting}
-\tikzstyle{every axis legend}=[...]
-	\end{lstlisting}
-	\emph{with} 
-\begin{lstlisting}
-\tikzstyle{every axis legend}+=[...].
-\end{lstlisting}
+\section{Acknowledgements}
+I thank God for all hours of enjoyed programming. I thank Pascal Wolkotte, author of package |pgfgraph|, who joined development and contributed code for axis lines and tick alignment. Furthermore, I thank Dr.~Schweitzer for many fruitful discussions and Dr.~Meine for his ideas and suggestions.
 
-	\item Update each \lstinline!\axispath...! command in your files. You will need to use \lstinline!axis cs! as coordinate system to apply any axis transformations. See sections~\ref{sec:axispath} and~\ref{sec:axis:coords} for details.
+Last but not least, I thank Till Tantau and Mark Wibrow for their excellent graphics (and more) package \PGF\ and \Tikz\ which is the base of \PGFPlots.
 
-	\item The manual file name has been renamed.
-\end{enumerate}
 
 \input{pgfplots.install.tex}%
 \input{pgfplots.intro.tex}%
 \input{pgfplots.reference.tex}%
-\input{pgfplots.examples.tex}%
 \input{pgfplots.importexport.tex}%
 
+\printindex
+
 \bibliographystyle{abbrv} %gerapali} %gerabbrv} %gerunsrt.bst} %gerabbrv}% gerplain}
 \bibliography{pgfplots.bib}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplots.timeseries.dat b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.timeseries.dat
new file mode 100644
index 00000000000..fee26083851
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplots.timeseries.dat
@@ -0,0 +1,19 @@
+time	1minload	nodes	cpus	processes	memused	memcached	membuf	memtotal				
+0	18	100	200	20	15		45	1	150
+1	25	100	200	30	20	45	2	150
+2	25	100	200	30	21	42	2	150
+3	30	100	200	30	20	40	2	150
+4	30	100	200	30	19	40	1	150
+5	80	100	200	30	20	40	3	150
+6	120	100	200	10	3	40	3	150
+7	180	100	200	10	4	41	3	150
+8	183	100	200	10	3	42	2	150
+9	178	100	200	10	2	41	1	150
+10	180	100	200	20	15	45	2	150
+11	184	100	200	20	20	45	3	150
+12	170	100	200	20	22	47	4	150
+13	164	100	200	20	24	50	4	150
+14	150	100	200	20	25	52	3	150
+15	148	100	200	20	26	53	2	150
+16	149	100	200	30	30	54	2	150
+17	154	100	200	30	35	55	1	150
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotsexample.pdf b/Master/texmf-dist/doc/latex/pgfplots/pgfplotsexample.pdf
new file mode 100644
index 00000000000..5a40e21c97d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotsexample.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfplots/example.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplotsexample.tex
index f79b996c1a3..d6a2695ad42 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/example.tex
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotsexample.tex
@@ -9,7 +9,7 @@
 	\centering
 	\begin{tikzpicture}
 	\begin{loglogaxis}
-		\addplot plot coordinates {
+		\addplot coordinates {
 			(1,1)
 			(16,16)
 			(32,64)
@@ -25,7 +25,7 @@
 		\begin{loglogaxis}[
 			xlabel=Cost,
 			ylabel=Error]
-		\addplot plot coordinates {
+		\addplot coordinates {
 			(5,     8.31160034e-02)
 			(17,    2.54685628e-02)
 			(49,    7.40715288e-03)
@@ -47,7 +47,7 @@
 			(18943, 2.87339125e-05)
 			(47103, 8.43749881e-06)
 		};
-		\legend{Case 1\\Case 2\\}
+		\legend{Case 1,Case 2}
 		\end{loglogaxis}
 	\end{tikzpicture}
 	\caption{A larger example}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.csv b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.csv
new file mode 100644
index 00000000000..7a3ee44f7d6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.csv
@@ -0,0 +1,13 @@
+# Convergence results
+# fictional source, generated 2008
+level,dof,error1,error2,info,{grad(log(dof),log(error1))},quot(error1)
+1,9,2.50000000e-01,7.57858283e-01,48,0,0
+2,25,6.25000000e-02,5.00000000e-01,25,-1.35691545e+00,4
+3,81,1.56250000e-02,2.87174589e-01,41,-1.17924958e+00,4
+4,289,3.90625000e-03,1.43587294e-01,8,-1.08987331e+00,4
+5,1089,9.76562500e-04,4.41941738e-02,22,-1.04500712e+00,4
+6,4225,2.44140625e-04,1.69802322e-02,46,-1.02252239e+00,4
+7,16641,6.10351562e-05,8.20091159e-03,40,-1.01126607e+00,4
+8,66049,1.52587891e-05,3.90625000e-03,48,-1.00563427e+00,3.99999999e+00
+9,263169,3.81469727e-06,1.95312500e-03,33,-1.00281745e+00,4.00000001e+00
+10,1050625,9.53674316e-07,9.76562500e-04,2,-1.00140880e+00,4.00000001e+00
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.dat b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.dat
new file mode 100644
index 00000000000..eec53846198
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.dat
@@ -0,0 +1,13 @@
+# Convergence results
+# fictional source, generated 2008
+level	dof	error1	error2	info	grad(log(dof),log(error1))	quot(error1)	
+1	9	2.50000000e-01	7.57858283e-01	48	0	0	
+2	25	6.25000000e-02	5.00000000e-01	25	-1.35691545e+00	4	
+3	81	1.56250000e-02	2.87174589e-01	41	-1.17924958e+00	4	
+4	289	3.90625000e-03	1.43587294e-01	8	-1.08987331e+00	4	
+5	1089	9.76562500e-04	4.41941738e-02	22	-1.04500712e+00	4	
+6	4225	2.44140625e-04	1.69802322e-02	46	-1.02252239e+00	4	
+7	16641	6.10351562e-05	8.20091159e-03	40	-1.01126607e+00	4	
+8	66049	1.52587891e-05	3.90625000e-03	48	-1.00563427e+00	3.99999999e+00	
+9	263169	3.81469727e-06	1.95312500e-03	33	-1.00281745e+00	4.00000001e+00	
+10	1050625	9.53674316e-07	9.76562500e-04	2	-1.00140880e+00	4.00000001e+00	
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.out.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.out.tex
new file mode 100644
index 00000000000..5dd615f7638
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.example1.out.tex
@@ -0,0 +1 @@
+\begin {tabular}{cc}dof&error1\\\pgfutilensuremath {9}&\pgfutilensuremath {0.25}\\\pgfutilensuremath {25}&\pgfutilensuremath {6.25\cdot 10^{-2}}\\\pgfutilensuremath {81}&\pgfutilensuremath {1.56\cdot 10^{-2}}\\\pgfutilensuremath {289}&\pgfutilensuremath {3.91\cdot 10^{-3}}\\\pgfutilensuremath {1{,}089}&\pgfutilensuremath {9.77\cdot 10^{-4}}\\\pgfutilensuremath {4{,}225}&\pgfutilensuremath {2.44\cdot 10^{-4}}\\\pgfutilensuremath {16{,}641}&\pgfutilensuremath {6.1\cdot 10^{-5}}\\\pgfutilensuremath {66{,}049}&\pgfutilensuremath {1.53\cdot 10^{-5}}\\\pgfutilensuremath {2.63\cdot 10^{5}}&\pgfutilensuremath {3.81\cdot 10^{-6}}\\\pgfutilensuremath {1.05\cdot 10^{6}}&\pgfutilensuremath {9.54\cdot 10^{-7}}\\\end {tabular}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.idx b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.idx
new file mode 100644
index 00000000000..1cf1c458d1d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.idx
@@ -0,0 +1,110 @@
+\indexentry{col sep@\texttt {col sep} key|hyperpage}{2}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!col sep@\texttt {col sep}|hyperpage}{2}
+\indexentry{pgfplotstabletypesetfile@\myprintocmmand {pgfplotstabletypesetfile}|hyperpage}{3}
+\indexentry{pgfplotstableread@\myprintocmmand {pgfplotstableread}|hyperpage}{3}
+\indexentry{pgfplotstabletypeset@\myprintocmmand {pgfplotstabletypeset}|hyperpage}{4}
+\indexentry{columns@\texttt {columns} key|hyperpage}{4}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!columns@\texttt {columns}|hyperpage}{4}
+\indexentry{column type@\texttt {column type} key|hyperpage}{5}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!column type@\texttt {column type}|hyperpage}{5}
+\indexentry{assign column name@\texttt {assign column name} key|hyperpage}{5}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!assign column name@\texttt {assign column name}|hyperpage}{5}
+\indexentry{multicolumn names@\texttt {multicolumn names} key|hyperpage}{5}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!multicolumn names@\texttt {multicolumn names}|hyperpage}{5}
+\indexentry{dec sep align@\texttt {dec sep align} key|hyperpage}{5}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!dec sep align@\texttt {dec sep align}|hyperpage}{5}
+\indexentry{dcolumn@\texttt {dcolumn} key|hyperpage}{6}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!dcolumn@\texttt {dcolumn}|hyperpage}{6}
+\indexentry{every first column@\texttt {every first column} key|hyperpage}{6}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!every first column@\texttt {every first column}|hyperpage}{6}
+\indexentry{every last column@\texttt {every last column} key|hyperpage}{7}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!every last column@\texttt {every last column}|hyperpage}{7}
+\indexentry{every even column@\texttt {every even column} key|hyperpage}{7}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!every even column@\texttt {every even column}|hyperpage}{7}
+\indexentry{every odd column@\texttt {every odd column} key|hyperpage}{7}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!every odd column@\texttt {every odd column}|hyperpage}{7}
+\indexentry{pgfplotstablecol@\myprintocmmand {pgfplotstablecol}|hyperpage}{7}
+\indexentry{pgfplotstablerow@\myprintocmmand {pgfplotstablerow}|hyperpage}{7}
+\indexentry{before row@\texttt {before row} key|hyperpage}{8}
+\indexentry{pgfplots@\texttt {/pgfplots/}!before row@\texttt {before row}|hyperpage}{8}
+\indexentry{after row@\texttt {after row} key|hyperpage}{8}
+\indexentry{pgfplots@\texttt {/pgfplots/}!after row@\texttt {after row}|hyperpage}{8}
+\indexentry{every even row@\texttt {every even row} key|hyperpage}{8}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every even row@\texttt {every even row}|hyperpage}{8}
+\indexentry{every odd row@\texttt {every odd row} key|hyperpage}{8}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every odd row@\texttt {every odd row}|hyperpage}{8}
+\indexentry{every head row@\texttt {every head row} key|hyperpage}{8}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every head row@\texttt {every head row}|hyperpage}{8}
+\indexentry{every first row@\texttt {every first row} key|hyperpage}{9}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every first row@\texttt {every first row}|hyperpage}{9}
+\indexentry{every last row@\texttt {every last row} key|hyperpage}{9}
+\indexentry{pgfplots@\texttt {/pgfplots/}!every last row@\texttt {every last row}|hyperpage}{9}
+\indexentry{row predicate@\texttt {row predicate} key|hyperpage}{9}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!row predicate@\texttt {row predicate}|hyperpage}{9}
+\indexentry{skip rows between index@\texttt {skip rows between index} key|hyperpage}{9}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!skip rows between index@\texttt {skip rows between index}|hyperpage}{9}
+\indexentry{assign cell content@\texttt {assign cell content} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!assign cell content@\texttt {assign cell content}|hyperpage}{10}
+\indexentry{assign cell content as number@\texttt {assign cell content as number} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!assign cell content as number@\texttt {assign cell content as number}|hyperpage}{10}
+\indexentry{string type@\texttt {string type} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!string type@\texttt {string type}|hyperpage}{10}
+\indexentry{every table@\texttt {every table} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!every table@\texttt {every table}|hyperpage}{10}
+\indexentry{font@\texttt {font} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!font@\texttt {font}|hyperpage}{10}
+\indexentry{begin table@\texttt {begin table} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!begin table@\texttt {begin table}|hyperpage}{10}
+\indexentry{end table@\texttt {end table} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!end table@\texttt {end table}|hyperpage}{10}
+\indexentry{outfile@\texttt {outfile} key|hyperpage}{10}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!outfile@\texttt {outfile}|hyperpage}{10}
+\indexentry{debug@\texttt {debug} key|hyperpage}{11}
+\indexentry{pgfplots@\texttt {/pgfplots/}!table@\texttt {table/}!debug@\texttt {debug}|hyperpage}{11}
+\indexentry{newcolumntype@\myprintocmmand {newcolumntype}|hyperpage}{11}
+\indexentry{pgfmathprintnumber@\myprintocmmand {pgfmathprintnumber}|hyperpage}{12}
+\indexentry{pgfmathprintnumberto@\myprintocmmand {pgfmathprintnumberto}|hyperpage}{12}
+\indexentry{fixed@\texttt {fixed} key|hyperpage}{12}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!fixed@\texttt {fixed}|hyperpage}{12}
+\indexentry{fixed zerofill@\texttt {fixed zerofill} key|hyperpage}{12}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!fixed zerofill@\texttt {fixed zerofill}|hyperpage}{12}
+\indexentry{sci@\texttt {sci} key|hyperpage}{12}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci@\texttt {sci}|hyperpage}{12}
+\indexentry{sci zerofill@\texttt {sci zerofill} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci zerofill@\texttt {sci zerofill}|hyperpage}{13}
+\indexentry{zerofill@\texttt {zerofill} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!zerofill@\texttt {zerofill}|hyperpage}{13}
+\indexentry{std@\texttt {std} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!std@\texttt {std}|hyperpage}{13}
+\indexentry{int detect@\texttt {int detect} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!int detect@\texttt {int detect}|hyperpage}{13}
+\indexentry{int trunc@\texttt {int trunc} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!int trunc@\texttt {int trunc}|hyperpage}{13}
+\indexentry{precision@\texttt {precision} key|hyperpage}{13}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!precision@\texttt {precision}|hyperpage}{13}
+\indexentry{set decimal separator@\texttt {set decimal separator} key|hyperpage}{14}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!set decimal separator@\texttt {set decimal separator}|hyperpage}{14}
+\indexentry{dec sep@\texttt {dec sep} key|hyperpage}{14}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!dec sep@\texttt {dec sep}|hyperpage}{14}
+\indexentry{set thousands separator@\texttt {set thousands separator} key|hyperpage}{14}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!set thousands separator@\texttt {set thousands separator}|hyperpage}{14}
+\indexentry{1000 sep@\texttt {1000 sep} key|hyperpage}{14}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!1000 sep@\texttt {1000 sep}|hyperpage}{14}
+\indexentry{use period@\texttt {use period} key|hyperpage}{14}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!use period@\texttt {use period}|hyperpage}{14}
+\indexentry{use comma@\texttt {use comma} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!use comma@\texttt {use comma}|hyperpage}{15}
+\indexentry{skip 0.@\texttt {skip 0.} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!skip 0.@\texttt {skip 0.}|hyperpage}{15}
+\indexentry{sci 10e@\texttt {sci 10e} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci 10e@\texttt {sci 10e}|hyperpage}{15}
+\indexentry{sci 10\textasciicircum e@\texttt {sci 10\textasciicircum e} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci 10\textasciicircum e@\texttt {sci 10\textasciicircum e}|hyperpage}{15}
+\indexentry{sci e@\texttt {sci e} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci e@\texttt {sci e}|hyperpage}{15}
+\indexentry{sci E@\texttt {sci E} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci E@\texttt {sci E}|hyperpage}{15}
+\indexentry{sci subscript@\texttt {sci subscript} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!sci subscript@\texttt {sci subscript}|hyperpage}{15}
+\indexentry{assume math mode@\texttt {assume math mode} key|hyperpage}{15}
+\indexentry{pgf@\texttt {/pgf/}!number format@\texttt {number format/}!assume math mode@\texttt {assume math mode}|hyperpage}{15}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.pdf b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.pdf
new file mode 100644
index 00000000000..d131f2937bd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.tex
new file mode 100644
index 00000000000..e2e3c74fa37
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstable.tex
@@ -0,0 +1,862 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Package pgfplots.sty documentation. 
+%
+% Copyright 2007/2008 by Christian Feuersaenger.
+%
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+% 
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+% 
+% You should have received a copy of the GNU General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\input{pgfplots.preamble.tex}
+
+\usepackage{array}
+\usepackage{colortbl}
+\usepackage{booktabs}
+
+\pgfqkeys{/codeexample}{%
+	every codeexample/.style={
+		width=4cm,
+		/pgfplots/every axis/.append style={legend style={fill=graphicbackground}}
+	},
+	tabsize=4,
+}
+
+%\pgfplotstableset{debug=true}
+
+\title{%
+	Manual for Package \PGFPlotstable\\
+	{\small Component of \PGFPlots, Version \pgfplotsversion}\\
+	{\small\href{http://sourceforge.net/projects/pgfplots}{http://sourceforge.net/projects/pgfplots}}}
+
+\begin{document}
+\maketitle
+\begin{abstract}%
+	This package reads tab-separated numerical tables from input and generates code for pretty-printed \LaTeX-tabulars. It rounds to the desired precision and prints it in different number formatting styles.
+\end{abstract}
+\tableofcontents
+\section{Introduction}
+\PGFPlotstable\ is a lightweight sub-package of \PGFPlots\ which employs its table input methods and the number formatting techniques to convert tab-separated tables into tabulars.
+
+It's input is a text file containing space separated rows, possibly starting with column names. Its output is a \LaTeX\ tabular which contains selected columns of the text table, rounded to the desired precision, printed in the desired number format (fixed point, integer, scientific etc).
+
+It is used with
+\begin{codeexample}[code only]
+\usepackage{pgfplots}
+\end{codeexample}
+\noindent and requires \PGFPlots\ and \PGF\ installed.
+
+\section{Text table input format}
+\PGFPlotstable\ works with plain text file tables in which entries (``cells'') are separated by a separation character. The initial separation character is ``white space'' which means ``at least one space or tab''. Those tables can have a header line which contains column names and most other columns typically contain numerical data.
+
+\noindent The following listing shows |pgfplotstable.example1.dat| and is used often throughout this documentation.
+\begin{codeexample}[code only]
+# Convergence results
+# fictional source, generated 2008
+level   dof     error1  error2  info    grad(log(dof),log(error1))      quot(error1)    
+1       9       2.50000000e-01  7.57858283e-01  48      0       0       
+2       25      6.25000000e-02  5.00000000e-01  25      -1.35691545e+00 4       
+3       81      1.56250000e-02  2.87174589e-01  41      -1.17924958e+00 4       
+4       289     3.90625000e-03  1.43587294e-01  8       -1.08987331e+00 4       
+5       1089    9.76562500e-04  4.41941738e-02  22      -1.04500712e+00 4       
+6       4225    2.44140625e-04  1.69802322e-02  46      -1.02252239e+00 4       
+7       16641   6.10351562e-05  8.20091159e-03  40      -1.01126607e+00 4       
+8       66049   1.52587891e-05  3.90625000e-03  48      -1.00563427e+00 3.99999999e+00  
+9       263169  3.81469727e-06  1.95312500e-03  33      -1.00281745e+00 4.00000001e+00  
+10      1050625 9.53674316e-07  9.76562500e-04  2       -1.00140880e+00 4.00000001e+00  
+\end{codeexample}
+Lines starting with `|%|' or `|#|' are considered to be comment lines and are ignored.
+
+There is future support for a second header line which must start with `|$flags |' (the space is obligatory, even if the column separator is \emph{not} space!). Currently, such a line is ignored. It may be used to provide number formatting options like precision and number format.
+
+\begin{key}{/pgfplots/table/col sep=\mchoice{space,comma,semicolon,colon,braces} (initially space)}
+	Specifies the column separation character for table reading. The initial choice, |space| means ``at least one white space''. White spaces are tab stops or spaces (newlines always delimit lines).
+
+	For example, the file |pgfplotstable.example1.csv| uses commas as separation characters.
+\begin{codeexample}[code only]
+# Convergence results
+# fictional source  generated 2008
+level,dof,error1,error2,info,{grad(log(dof),log(error1))},quot(error1)
+1,9,2.50000000e-01,7.57858283e-01,48,0,0
+2,25,6.25000000e-02,5.00000000e-01,25,-1.35691545e+00,4
+3,81,1.56250000e-02,2.87174589e-01,41,-1.17924958e+00,4
+4,289,3.90625000e-03,1.43587294e-01,8,-1.08987331e+00,4
+5,1089,9.76562500e-04,4.41941738e-02,22,-1.04500712e+00,4
+6,4225,2.44140625e-04,1.69802322e-02,46,-1.02252239e+00,4
+7,16641,6.10351562e-05,8.20091159e-03,40,-1.01126607e+00,4
+8,66049,1.52587891e-05,3.90625000e-03,48,-1.00563427e+00,3.99999999e+00
+9,263169,3.81469727e-06,1.95312500e-03,33,-1.00281745e+00,4.00000001e+00
+10,1050625,9.53674316e-07,9.76562500e-04,2,-1.00140880e+00,4.00000001e+00
+\end{codeexample}
+	Thus, we need to specify |col sep=comma| when we read it.
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[col sep=comma]{pgfplotstable.example1.csv}
+\end{codeexample}
+	You may call |\pgfplotstableset{col sep=comma}| once in your preamble if all your tables uses commas as column separator.
+
+	Please note that if cell entries (for example column names) contain the separation character, you need to enclose the column entry in \emph{braces}: |{grad(log(dof),log(error1)}|. If you want to use unmatched braces, you need to write a backslash before the brace. For example the name `|column{withbrace|' needs to be written as `|column\{withbrace|'. 
+	
+	Furthermore, if you need empty cells in case |col sep=space|, you have to provide |{}| to delimit such a cell since |col sep=space| uses \emph{at least} one white space (consuming all following ones).
+
+	The value |col sep=braces| is special since it actually uses two separation characters. Every single cell entry is delimited by an opening and a closing brace, \marg{entry}, for this choice. Furthermore, any wite spaces (spaces and tabs) between cell entries are \emph{skipped} in case |braces| until the next \marg{entry} is found.
+\end{key}
+
+\begin{command}{\pgfplotstabletypesetfile[\meta{optional arguments}]\marg{file name}}
+	This command loads the table file \marg{file name} and typesets it using the current configuration of number formats and table options.
+\begin{codeexample}[]
+\pgfplotstabletypesetfile{pgfplotstable.example1.dat}
+\end{codeexample}
+
+	\noindent The configuration can be customized with \meta{optional arguments}.
+
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[sci subscript,sci zerofill]{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{command}
+
+% FIXME : 'header' option!
+\begin{command}{\pgfplotstableread\marg{file name}\marg{\textbackslash macro}}
+	Loads the table \marg{file name} into a \TeX-macro \meta{\textbackslash macro}. This macro can than be used several times.
+\begin{codeexample}[]
+\pgfplotstableread{pgfplotstable.example1.dat}\table
+\pgfplotstabletypeset[columns={dof,error1}]\table
+\hspace{2cm}
+\pgfplotstabletypeset[columns={dof,error2}]\table
+\end{codeexample}
+\end{command}
+
+\begin{command}{\pgfplotstabletypeset[\meta{optional arguments}]\marg{\textbackslash macro}}
+	Works in the same way as |\pgfplotstabletypesetfile|, but it accepts an already loaded table.
+\end{command}
+
+\section{Selecting columns}
+\begin{key}{/pgfplots/table/columns=\marg{comma-separated-list} (initially all available ones)}
+	Selects particular columns the table. If this option is missing, all available columns will be selected.
+
+	Inside of \marg{comma-separated-list}, column names as they appear in the table's header are expected. If there is no header, simply use column names. If there are column names, the special syntax |[index]|\meta{integer} can be used to select columns by index. The first column has index~$0$.
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[columns={dof,level,[index]4}]{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{key}
+
+\begin{pgfplotstablecolumnkey}
+	Sets all options in \marg{key-value-list} exclusively for \marg{column name}.
+
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/error2/.style={
+		column name=$A$,
+		sci,sci zerofill,sci subscript,
+		precision=2},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}
+	}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+	If your column name contains commas `|,|', slashes `|/|' or equal signs `|=|', you need to enclose the column name in braces.
+\begin{codeexample}[width=7cm]
+\pgfplotstabletypesetfile[
+	columns={dof,error1,{grad(log(dof),log(error1))}},
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}},
+	columns/{grad(log(dof),log(error1))}/.style={
+		column name=slopes $L_2$,
+		fixed,fixed zerofill,
+		precision=1}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{pgfplotstablecolumnkey}
+
+\begin{key}{/pgfplots/table/column type=\marg{tabular column type} (initially c)}
+	Contains the column type for |tabular|. 
+	
+	If all column types are empty, the complete argument is skipped (assuming that no |tabular| environment is generated).
+
+	Use |\pgfplotstableset{column type/.add=|\marg{before}\marg{after}|}| to \emph{modify} a value instead of overwriting it. The |.add| key handler works for other options as well.
+\begin{codeexample}[width=7cm]
+\pgfplotstabletypesetfile[
+	columns={dof,error1,info},
+	column type/.add={|}{}% results in '|c'
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{key}
+
+
+\begin{codekey}{/pgfplots/table/assign column name}
+	Allows to \emph{modify} the value of |column name|.
+	
+	Argument |#1| is the current column name, that means after
+	evaluation of |column name|. After |assign column| name, a new (possibly modified) value for |column name| should be set.
+	
+	That means you can use |column name| to assign the name as such
+	and |assign column name| to generate final \TeX\ code (for example to insert |\multicolumn{1}{c}{#1}|).
+
+	Default is empty which means no change.
+\end{codekey}
+
+\begin{stylekey}{/pgfplots/table/multicolumn names=\marg{tabular column type} (initially c)}
+	A style which typesets each column name using a |\multicolumn{1}|\marg{tabular column type}\marg{the column name} statement.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/dec sep align=\marg{header column type} (initially c)}
+	A style which employs the current decimal separator as alignment character.
+
+	The first argument determines the alignment of the header column. 
+
+	The style |dec sep align| actually introduces two new |tabular| columns, namely |r@{}l|. It introduces multicolumns for column names accordingly and handles numbers which do not have a decimal separator.
+
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[
+	columns={dof,error1,error2,info,{grad(log(dof),log(error1))}},
+	columns/error1/.style={dec sep align},
+	columns/error2/.style={sci,sci subscript,sci zerofill,dec sep align},
+	columns/info/.style={fixed,dec sep align},
+	columns/{grad(log(dof),log(error1))}/.style={fixed,dec sep align}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+
+	Or with comma as decimal separator:
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[
+	use comma,
+	columns={dof,error1,error2,info,{grad(log(dof),log(error1))}},
+	columns/error1/.style={dec sep align},
+	columns/error2/.style={sci,sci subscript,sci zerofill,dec sep align},
+	columns/info/.style={fixed,dec sep align},
+	columns/{grad(log(dof),log(error1))}/.style={fixed,dec sep align}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+	It may be advisable to use the |zerofill| variants to force at least one digit after the decimal separator.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/dcolumn=\marg{tabular column type}\marg{type for column name} (initially \{D\{.\}\{.\}\{2\}\}\{c\})}
+	A style which can be used together with the |dcolumn| package of David Carlisle. It also enables alignment at the decimal separator. However, the decimal separator needs to be exactly one character which is incompatible with `|{,}|' (the default setting for |use comma|).
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/every first column}
+A style which is installed for every first column only.
+\begin{codeexample}[width=7cm]
+\pgfplotstabletypesetfile[
+ every head row/.style={before row=\hline,after row=\hline\hline},
+ every last row/.style={after row=\hline},
+ every first column/.style={
+  column type/.add={|}{}
+ },
+ every last column/.style={
+  column type/.add={}{|}
+ }]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/every last column}
+A style which is installed for every last column only.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/every even column}
+A style which is installed for every column with even column index (starting with~$0$).
+{
+\pgfplotstableset{
+	columns={dof,error1,{grad(log(dof),log(error1))},info},
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}},
+	columns/{grad(log(dof),log(error1))}/.style={
+		column name=slopes $L_2$,
+		fixed,fixed zerofill,
+		precision=1}}
+
+\begin{codeexample}[code only]
+\pgfplotstableset{
+	columns={dof,error1,{grad(log(dof),log(error1))},info},
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}},
+	columns/{grad(log(dof),log(error1))}/.style={
+		column name=slopes $L_2$,
+		fixed,fixed zerofill,
+		precision=1}}
+\end{codeexample}
+
+\begin{codeexample}[width=7cm,graphic=white]
+% \usepackage{colortbl}
+\pgfplotstabletypesetfile[
+ every even column/.style={
+  column type/.add={>{\columncolor[gray]{.8}}}{}
+}]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+}
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/table/every odd column}
+A style which is installed for every column with odd column index (starting with~$0$).
+\end{stylekey}
+
+\begin{command}{\pgfplotstablecol}
+	During the evaluation of row or column options, this command expands to the current columns' index.
+\end{command}
+\begin{command}{\pgfplotstablerow}
+	During the evaluation of row or column options, this command expands to the current rows' index.
+\end{command}
+
+
+\section{Configuring row appearance}
+\begin{key}{/pgfplots/before row=\marg{\TeX\ code}}	
+	Contains \TeX\ code which will be installed before the first cell in a row.
+\end{key}
+
+\begin{key}{/pgfplots/after row=\marg{\TeX\ code}}	
+	Contains \TeX\ code which will be installed after the last cell in a row (i.e. after |\\|).
+\end{key}
+
+\begin{stylekey}{/pgfplots/every even row}
+	A style which is installed for each row with even row index. The first row is supposed to be a ``head'' row and does not count. Indexing starts with~$0$.
+{
+\pgfplotstableset{
+	columns={dof,error1,{grad(log(dof),log(error1))}},
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}},
+	columns/{grad(log(dof),log(error1))}/.style={
+		column name=slopes $L_2$,
+		fixed,fixed zerofill,
+		precision=1}}
+
+\begin{codeexample}[code only]
+\pgfplotstableset{
+	columns={dof,error1,{grad(log(dof),log(error1))}},
+	columns/error1/.style={
+		column name=$L_2$,
+		sci,sci zerofill,sci subscript,
+		precision=3},
+	columns/dof/.style={
+		int detect,
+		column name=\textsc{Dof}},
+	columns/{grad(log(dof),log(error1))}/.style={
+		column name=slopes $L_2$,
+		fixed,fixed zerofill,
+		precision=1}}
+\end{codeexample}
+
+\begin{codeexample}[width=7cm,graphic=white]
+% \usepackage{booktabs}
+\pgfplotstabletypesetfile[
+	every head row/.style={
+		before row=\toprule,after row=\midrule},
+	every last row/.style={
+		after row=\bottomrule},
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+
+\begin{codeexample}[width=7cm,graphic=white]
+% \usepackage{booktabs,colortbl}
+\pgfplotstabletypesetfile[
+	every even row/.style={
+		before row={\rowcolor[gray]{0.9}}},
+	every head row/.style={
+		before row=\toprule,after row=\midrule},
+	every last row/.style={
+		after row=\bottomrule},
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+
+}
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every odd row}	
+	A style which is installed for each row with odd row index. The first row is supposed to be a ``head'' row and does not count. Indexing starts with~$0$.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every head row}	
+	A style which is installed for each first row in the tabular. This can be used to adjust options for column names or to add extra lines/colours.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every first row}	
+	A style which is installed for each first \emph{data} row, i.e. after the head row.
+\end{stylekey}
+
+\begin{stylekey}{/pgfplots/every last row}	
+	A style which is installed for each last \emph{data} row.
+\end{stylekey}
+
+\begin{codekey}{/pgfplots/table/row predicate}
+	A boolean predicate which allows to select particular rows of the input table. The argument |#1| contains the current row's index (starting with~$0$, not counting comment lines or column names).
+
+	The return value is assigned to the \TeX-if |\ifpgfplotstableuserow|. If the boolean is not changed, the return value is true.
+\begin{codeexample}[width=7cm]
+% \usepackage{booktabs}
+\pgfplotstabletypesetfile[
+	every head row/.style={
+		before row=\toprule,after row=\midrule},
+	every last row/.style={
+		after row=\bottomrule},
+	row predicate/.code={%
+		\ifnum#1>4\relax
+			\ifnum#1<8\relax
+				\pgfplotstableuserowfalse
+			\fi
+		\fi}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+	Please note that |row predicate| is applied \emph{before} any other option which affects row appearance. For example, the even/odd styles refer to those rows which are selected.
+	
+	Furthermore, |row predicate| applies only to the typeset routines, not the read methods. If you want to plot only selected table entries with |\addplot table|, use the \PGFPlots\ coordinate filter options.
+\end{codekey}
+
+\begin{stylekey}{/pgfplots/table/skip rows between index=\marg{begin}\marg{end}}
+	A style which appends an |row predicate| which discards selected rows. The selection is done by index where indexing starts with~$0$. Every row with index $\meta{begin} \le i < \meta{end}$ will be skipped.
+\begin{codeexample}[width=7cm]
+% \usepackage{booktabs}
+\pgfplotstabletypesetfile[
+	every head row/.style={
+		before row=\toprule,after row=\midrule},
+	every last row/.style={
+		after row=\bottomrule},
+	skip rows between index={2}{4},
+	skip rows between index={7}{9}
+]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+\end{stylekey}
+
+
+\section{Determining cell contents}
+\begin{codekey}{/pgfplots/table/assign cell content}
+	Allows to redefine the algorithm which assigns cell contents. The argument |#1| is the (unformatted) contents of the input table. 
+	
+	The resulting output needs to be written to |/pgfplots/table/@cell content|.
+\end{codekey}
+
+\begin{key}{/pgfplots/table/assign cell content as number}
+	This here is the default implementation of |assign cell contents|.
+\end{key}
+
+\begin{stylekey}{/pgfplots/table/string type}
+	A style which redefines |assign cell contents| to allow (a) text column(s).
+\end{stylekey}
+
+\section{Customizing and getting the tabular code}
+\begin{stylekey}{/pgfplots/table/every table}
+	A style which is installed at the beginning of every |\pgfplotstabletypeset| command.
+\end{stylekey}
+
+\begin{key}{/pgfplots/table/font=\marg{font name} (initially empty)}
+	Assigns a font used for the complete table.
+\end{key}
+
+\begin{key}{/pgfplots/table/begin table=\marg{code} (initially \textbackslash begin\{tabular\})}
+	Contains \marg{code} which is generated as table start.
+\end{key}
+\begin{key}{/pgfplots/table/end table=\marg{code} (initially \textbackslash end\{tabular\})}
+	Contains \marg{code} which is generated as table end.
+\end{key}
+
+\begin{key}{/pgfplots/table/outfile=\marg{file name} (initially empty)}
+	Writes the generated tabular code into \marg{file name}. It can then be used with |\input|\marg{file name}, \PGFPlotstable\ is no longer required since it contains a completely normal |tabular|.
+\begin{codeexample}[]
+\pgfplotstabletypesetfile[
+	columns={dof,error1},
+	outfile=pgfplotstable.example1.out.tex]
+	{pgfplotstable.example1.dat}
+\end{codeexample}
+and |pgfplotstable.example1.out.tex| contains
+\lstdefineformat{inp}{\\\\=\string\newline}%
+\lstinputlisting[basicstyle=\ttfamily\footnotesize,format=inp]{pgfplotstable.example1.out.tex}
+
+The command |\pgfutilensuremath| checks whether math mode is active and switches to math mode if necessary\footnote{Please note that \lstinline{\\pgfutilensuremath} needs to be replaced by \lstinline{\\ensuremath} if you want to use the output file independent of \PGF. That can be done by \lstinline{\\let\\pgfutilensuremath=\\ensuremath} which enables the \LaTeX-command \lstinline{\\ensuremath}.}.
+\end{key}
+
+\begin{key}{/pgfplots/table/debug=\marg{boolean} (initially false)}
+	If enabled, will write every final tabular code to you log file.
+\end{key}
+
+\section{Defining column types for \texttt{tabular}}
+Besides input of text files, it is sometimes desireable to define column types for existing \texttt{tabular} environments.
+
+\begin{command}{\newcolumntype\marg{letter}[\meta{number of arguments}]$>$\marg{before column}\meta{column type}$<$\marg{after column}}
+The command |\newcolumntype| is part of the |array| package and it defines a new column type \marg{letter} for use in \LaTeX\ tabular environments.
+\begin{codeexample}[code only]
+\usepackage{array}
+\end{codeexample}
+
+\begin{codeexample}[]
+\newcolumntype{d}{>{-}c<{+}}
+\begin{tabular}{dl}
+a & b \\
+c & d \\
+\end{tabular}
+\end{codeexample}
+
+Now, the environment |pgfplotstablecoltype| can be used in \marg{before column} and \marg{after column} to define numerical columns:
+\begin{codeexample}[]
+\newcolumntype{L}[1]
+	{>{\begin{pgfplotstablecoltype}[#1]}r<{\end{pgfplotstablecoltype}}}
+
+\begin{tabular}{L{int detect}L{sci,sci subscript,sci zerofill}}
+9      & 2.50000000e-01\\
+25     & 6.25000000e-02\\
+81     & 1.56250000e-02\\
+289    & 3.90625000e-03\\
+1089   & 9.76562500e-04\\
+4225   & 2.44140625e-04\\
+16641  & 6.10351562e-05\\
+66049  & 1.52587891e-05\\
+263169 & 3.81469727e-06\\
+1050625& 9.53674316e-07\\
+\end{tabular}
+\end{codeexample}
+\noindent The environment |pgfplotstablecoltype| accepts an optional argument which may contain any number formatting options. It is an error if numerical columns contain non-numerical data, so it may be necessary to use |\multicolumn| for column names.
+
+\begin{codeexample}[]
+\newcolumntype{L}[1]
+	{>{\begin{pgfplotstablecoltype}[#1]}r<{\end{pgfplotstablecoltype}}}
+
+\begin{tabular}{L{int detect}L{sci,sci subscript,sci zerofill}}
+\multicolumn{1}{r}{Dof} & \multicolumn{1}{r}{Error}\\
+9      & 2.50000000e-01\\
+25     & 6.25000000e-02\\
+81     & 1.56250000e-02\\
+289    & 3.90625000e-03\\
+1089   & 9.76562500e-04\\
+4225   & 2.44140625e-04\\
+16641  & 6.10351562e-05\\
+66049  & 1.52587891e-05\\
+263169 & 3.81469727e-06\\
+1050625& 9.53674316e-07\\
+\end{tabular}
+\end{codeexample}
+\end{command}
+
+\section{Number formatting options}
+\label{sec:number:printing}%
+The following extract of \cite{tikz} explains how to configure number formats.
+\begin{command}{\pgfmathprintnumber\marg{x}}
+Generates pretty-printed output for the (real) number \marg{x}. The input number \marg{x} is parsed using |\pgfmathfloatparsenumber| which allows arbitrary precision.
+
+Numbers are typeset in math mode using the current set of number printing options, see below. Optional arguments can also be provided using |\pgfmathprintnumber[|\meta{options}|]|\marg{x}.
+\end{command}
+
+\begin{command}{\pgfmathprintnumberto\marg{x}\marg{\textbackslash macro}}
+	Returns the resulting number into \marg{\textbackslash macro} instead of typesetting it directly.	
+\end{command}
+
+\begin{key}{/pgf/number format/fixed}
+Configures |\pgfmathprintnumber| to round the number to a fixed number of digits after the period, discarding any trailing zeros.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+
+See section~\ref{sec:number:styles} for how to change the appearance.
+\end{key}
+
+\begin{key}{/pgf/number format/fixed zerofill=\marg{boolean}  (default true)}
+Enables or disables zero filling for any number drawn in fixed point format.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,fixed zerofill,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+This key affects numbers drawn with |fixed| or |std| styles (the latter only if no scientific format is choosen).
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,std,fixed zerofill,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-05}\hspace{1em}
+\pgfmathprintnumber{1}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+
+See section~\ref{sec:number:styles} for how to change the appearance.
+\end{key}
+
+\begin{key}{/pgf/number format/sci}
+Configures |\pgfmathprintnumber| to display numbers in scientific format, that means sign, mantisse and exponent (basis~$10$). The mantisse is rounded to the desired precision.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+
+See section~\ref{sec:number:styles} for how to change the exponential display style.
+\end{key}
+
+\begin{key}{/pgf/number format/sci zerofill=\marg{boolean}  (default true)}
+Enables or disables zero filling for any number drawn in scientific format.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,sci zerofill,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+As with |fixed zerofill|, this option does only affect numbers drawn in |sci| format (or |std| if the scientific format is chosen).
+
+See section~\ref{sec:number:styles} for how to change the exponential display style.
+\end{key}
+
+\begin{stylekey}{/pgf/number format/zerofill=\marg{boolean} (default true)}
+	Sets both, |fixed zerofill| and |sci zerofill| at once.
+\end{stylekey}
+
+\begin{key}{/pgf/number format/std}
+Configures |\pgfmathprintnumber| to a standard algorithm. It chooses either \texttt{fixed} or \texttt{sci}, depending on the order of magnitude. Let $n=s \cdot m \cdot 10^e$ be the input number and $p$ the current precision. If $-p/2 \le e \le 4$, the number is displayed using the fixed format. Otherwise, it is displayed using the scientific format. 
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,std,precision=2}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/int detect}
+Configures |\pgfmathprintnumber| to detect integers automatically. If the input number is an integer, no period is displayed at all. If not, the scientific format is chosen.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,int detect,precision=2}
+\pgfmathprintnumber{15}\hspace{1em}
+\pgfmathprintnumber{20}\hspace{1em}
+\pgfmathprintnumber{20.4}\hspace{1em}
+\pgfmathprintnumber{0.01}\hspace{1em}
+\pgfmathprintnumber{0}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/int trunc}
+Truncates every number to integers (discards any digit after the period).
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,int trunc}
+\pgfmathprintnumber{4.568}\hspace{1em}
+\pgfmathprintnumber{5e-04}\hspace{1em}
+\pgfmathprintnumber{0.1}\hspace{1em}
+\pgfmathprintnumber{24415.98123}\hspace{1em}
+\pgfmathprintnumber{123456.12345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/precision=\marg{number}}
+Sets the desired rounding precision for any display operation. For scientific format, this affects the mantisse.
+\end{key}
+
+\subsection{Changing display styles}%
+\label{sec:number:styles}%
+You can change the way how numbers are displayed. For example, if you use the `\texttt{fixed}' style, the input number is rounded to the desired precision and the current fixed point display style is used to typeset the number. The same is applied to any other format: first, rounding routines are used to get the correct digits, afterwards a display style generates proper \TeX-code.
+
+\begin{key}{/pgf/number format/set decimal separator=\marg{text}}
+Assigns \marg{text} as decimal separator for any fixed point numbers (including the mantisse in sci format).
+\end{key}
+\begin{key}{/pgf/number format/dec sep=\marg{text}}
+	Just another name for |set decimal separator|.
+\end{key}
+
+
+\begin{key}{/pgf/number format/set thousands separator=\marg{text}}
+Assigns \marg{text} as thousands separator for any fixed point numbers (including the mantisse in sci format).
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,
+	precision=2,
+	set thousands separator={}}
+\pgfmathprintnumber{1234.56}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,
+	precision=2,
+	set thousands separator={}}
+\pgfmathprintnumber{1234567890}
+\end{codeexample}
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,
+	precision=2,
+	set thousands separator={.}}
+\pgfmathprintnumber{1234567890}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,
+	precision=2,
+	set thousands separator={,}}
+\pgfmathprintnumber{1234567890}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,
+	precision=2,
+	set thousands separator={{{{,}}}}}
+\pgfmathprintnumber{1234567890}
+\end{codeexample}
+The last example employs commas and disables the default comma-spacing. 
+\end{key}
+\begin{key}{/pgf/number format/1000 sep=\marg{text}}
+	Just another name for |set thousands separator|.
+\end{key}
+
+
+\begin{key}{/pgf/number format/use period}
+A predefined style which installs periods `\texttt{.}' as decimal separators and commas `\texttt{,}' as thousands separators. This style is the default.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,precision=2,use period}
+\pgfmathprintnumber{12.3456}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,precision=2,use period}
+\pgfmathprintnumber{1234.56}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/use comma}
+A predefined style which installs commas `\texttt{,}' as decimal separators and periods `\texttt{.}' as thousands separators.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,precision=2,use comma}
+\pgfmathprintnumber{12.3456}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,fixed,precision=2,use comma}
+\pgfmathprintnumber{1234.56}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/skip 0.=\marg{boolean}}
+	Configures whether numbers like $0.1$ shall be typeset as $.1$ or not.
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,precision=2,
+	skip 0.}
+\pgfmathprintnumber{0.56}
+\end{codeexample}
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,
+	fixed,
+	fixed zerofill,precision=2,
+	skip 0.=false}
+\pgfmathprintnumber{0.56}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/sci 10e}
+Uses $m \cdot 10^e$ for any number displayed in scientific format.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,sci 10e}
+\pgfmathprintnumber{12.345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/sci 10\textasciicircum e}
+The same as `|sci 10e|'.
+\end{key}
+
+\begin{key}{/pgf/number format/sci e}
+Uses the `$1e{+}0$' format which is generated by common scientific tools for any number displayed in scientific format.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,sci e}
+\pgfmathprintnumber{12.345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/sci E}
+The same with an uppercase `\texttt{E}'.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,sci E}
+\pgfmathprintnumber{12.345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/sci subscript}
+Typesets the exponent as subscript for any number displayed in scientific format. This style requires very few space.
+
+\begin{codeexample}[]
+\pgfkeys{/pgf/number format/.cd,sci,sci subscript}
+\pgfmathprintnumber{12.345}
+\end{codeexample}
+\end{key}
+
+\begin{key}{/pgf/number format/assume math mode=\marg{boolean} (default true)}
+	Set this to |true| if you don't want any checks for math mode.
+	
+	The initial setting installs a |\pgfutilensuremath| around each final number to change to math mode if necessary. Use |assume math mode=true| if you know that math mode is active and you don't want |\pgfutilensuremath|.
+\end{key}
+
+\section{Plain \TeX\ and Con\TeX t support}
+The table code generator is initialised to produce \LaTeX\ |tabular| environments. However, it only relies on~`|&|' being the column separator and~`|\\|' the row terminator. The |column type| feature is more or less specific to |tabular|, but you can disable it completely. Replace |begin table| and |end table| with appropriate \TeX- or Con\TeX t commands to change it. If you have useful default styles (or bug reports), let me know.
+
+\printindex
+
+\bibliographystyle{abbrv} %gerapali} %gerabbrv} %gerunsrt.bst} %gerabbrv}% gerplain}
+\bibliography{pgfplots.bib}
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstest.tex b/Master/texmf-dist/doc/latex/pgfplots/pgfplotstest.tex
deleted file mode 100644
index 4fb394c5450..00000000000
--- a/Master/texmf-dist/doc/latex/pgfplots/pgfplotstest.tex
+++ /dev/null
@@ -1,1108 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[intlimits]{amsmath}
-\usepackage{amssymb}
-\usepackage{amsfonts}
-\usepackage{ifpdf}
-\usepackage{listings}
-\usepackage{courier}
-\lstset{%
-	basicstyle=\ttfamily,
-	language=[LaTeX]tex, % Seems as if \lstset{language=tex} must be invoked BEFORE loading tikz!?
-	tabsize=4,
-	breaklines=true,
-	breakindent=0pt
-}
-
-\ifpdf
-	\usepackage[pdftex]{hyperref}
-	\pdfinfo {
-		/Author	(Christian Feuersaenger)
-	}
-
-\else
-	\usepackage[dvipdfm]{hyperref}
-	\def\pgfsysdriver{pgfsys-dvipdfm.def}
-\fi
-%\def\pgfsysdriver{pgfsys-pdftex.def}
-\usepackage{pgfplots}
-
-\pgfrealjobname{pgfplotstest}
-
-\def\testsection#1{\message{STARTING TEST SECTION '#1'}\section{#1}}
-\def\testsubsection#1{\message{STARTING TEST SUBSECTION '#1'}\subsection{#1}}
-\def\testsubsubsection#1{\message{STARTING TEST SUBSUBSECTION '#1'}\subsubsection{#1}}
-
-\def\smallplotstest{%
-\addplot[smooth,blue,mark=*] plot coordinates {
-	(-1,	1)
-	(-0.75,	0.5625)
-	(-0.5,	0.25)
-	(-0.25,	0.0625)
-	(0,		0)
-	(0.25,	0.0625)
-	(0.5,	0.25)
-	(0.75,	0.5625)
-	(1,		1)
-};
-}
-
-\def\loglogtestplot{
-\addplot plot coordinates {
-	(5,	8.311600e-02)
-	(17,	2.546856e-02)
-	(49,	7.407153e-03)
-	(129,	2.101922e-03)
-	(321,	5.873530e-04)
-	(769,	1.622699e-04)
-	(1793,	4.442489e-05)
-	(4097,	1.207141e-05)
-	(9217,	3.261015e-06)
-};
-\addlegendentry{$d=2$}
-
-\addplot plot coordinates {
-	(7,	8.471784e-02)
-	(31,	3.044093e-02)
-	(111,	1.022145e-02)
-	(351,	3.303463e-03)
-	(1023,	1.038865e-03)
-	(2815,	3.196465e-04)
-	(7423,	9.657898e-05)
-	(18943,	2.873391e-05)
-	(47103,	8.437499e-06)
-};
-\addlegendentry{$d=3$}
-}%
-
-\def\manylogplots{%
-	\addplot plot coordinates {
-		(5,		8.312e-02)
-		(17,	2.547e-02)
-		(49,	7.407e-03)
-		(129,	2.102e-03)
-		(321,	5.874e-04)
-		(769,	1.623e-04)
-		(1793,	4.442e-05)
-		(4097,	1.207e-05)
-		(9217,	3.261e-06)
-	};
-
-	\addplot plot coordinates {
-		(7,		8.472e-02)
-		(31,	3.044e-02)
-		(111,	1.022e-02)
-		(351,	3.303e-03)
-		(1023,	1.039e-03)
-		(2815,	3.196e-04)
-		(7423,	9.658e-05)
-		(18943,	2.873e-05)
-		(47103,	8.437e-06)
-	};
-
-	\addplot plot coordinates {
-		(9,	7.881e-02)
-		(49,	3.243e-02)
-		(209,	1.232e-02)
-		(769,	4.454e-03)
-		(2561,	1.551e-03)
-		(7937,	5.236e-04)
-		(23297,	1.723e-04)
-		(65537,	5.545e-05)
-		(178177,	1.751e-05)
-	};
-
-	\addplot plot coordinates {
-		(11,	6.887e-02)
-		(71,	3.177e-02)
-		(351,	1.341e-02)
-		(1471,	5.334e-03)
-		(5503,	2.027e-03)
-		(18943,	7.415e-04)
-		(61183,	2.628e-04)
-		(187903,	9.063e-05)
-		(553983,	3.053e-05)
-	};
-
-	\addplot plot coordinates {
-		(13,	5.755e-02)
-		(97,	2.925e-02)
-		(545,	1.351e-02)
-		(2561,	5.842e-03)
-		(10625,	2.397e-03)
-		(40193,	9.414e-04)
-		(141569,	3.564e-04)
-		(471041,	1.308e-04)
-		(1496065,	4.670e-05)
-	};
-	\legend{$d=2$\\$d=3$\\$d=4$\\$d=5$\\$d=6$\\}
-}%
-
-\author{Christian Feuers\"anger}
-\title{Tests for pgfplots.sty}
-
-\begin{document}
-\maketitle
-
-\testsection{Standard placement normal plot}
-\begin{tikzpicture}
-\begin{axis}
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsection{Scaling tests}
-\testsubsection{width=5cm}
-\begin{tikzpicture}
-\begin{axis}[width=5cm]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{width=textwidth}
-\begin{tikzpicture}
-\begin{axis}[width=\textwidth]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{width=textwidth, height=textheight}
-\begin{tikzpicture}
-\begin{axis}[height=\textheight,width=\textwidth]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{height=3cm}
-\begin{tikzpicture}
-\begin{axis}[height=3cm]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{x=3cm}
-\hrule width3cm height1pt
-\vskip10pt
-\begin{tikzpicture}[baseline]
-\begin{axis}[x=3cm]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{x=3cm, y=4cm}
-\hrule width3cm height1pt
-\noindent
-\vrule height4cm width1pt
-\hskip10pt
-\begin{tikzpicture}[baseline]
-\begin{axis}[x=3cm,y=4cm]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{y=3cm}
-\noindent
-\vrule height3cm width1pt
-\hskip10pt
-\begin{tikzpicture}[baseline]
-\begin{axis}[y=3cm]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{Scale vs. Datascale trafo}
-All should have the same size; especially the same height.
-This tests the data scale transformation and rounding inaccuracies during the computation of $x$~and~$y$ unit vectors,
-\[ x = \frac{W}{T(\bar x) - T(\underline x)}. \]
-The larger $x$, the higher the scaling accuracy. Large $x$ means small $T(\bar x) - T(\underline x)$ (relative to width~$W$). But this implies low accuracy for the input data! And nobody wants inaccurate plots.
-
-The datascale transformation~$T$ is set up such that $O(W) = O(x)$, but I am not sure if I need to adjust some parameters. Some parameters lead to inaccurate~$x$ and~$y$ vectors, such that axis sizes are \emph{not} the same although $W$~and~$H$ (width and height) are the same.
-
-\noindent
-{\tikzstyle{every picture}+=[baseline]
-\axispreset{width=3cm,scale only axis,ytick=\empty}%
-\listnew\autoplotspeclist{blue\\}%
-\begin{tikzpicture}%
-\begin{axis}
-\addplot plot coordinates {
-	(0.000000,	0.113142)
-	(0.062500,	0.114457)
-	(0.125000,	0.115773)
-	(0.187500,	0.117088)
-	(0.250000,	0.118404)
-	(0.312500,	0.119719)
-	(0.375000,	0.121035)
-	(0.437500,	0.122350)
-	(0.500000,	0.123666)
-	(0.562500,	0.124981)
-	(0.625000,	0.126297)
-	(0.687500,	0.127612)
-	(0.750000,	0.128928)
-	(0.812500,	0.130243)
-	(0.875000,	0.131559)
-	(0.937500,	0.132874)
-	(1.000000,	0.134190)
-};
-\end{axis}
-\end{tikzpicture}%
-\begin{tikzpicture}%
-\begin{axis}
-\addplot plot coordinates {
-	(0.000000,	0.192392)
-	(0.020408,	0.551660)
-	(0.040816,	0.816371)
-	(0.061224,	0.957528)
-	(0.081633,	0.936301)
-	(0.102041,	0.784097)
-	(0.122449,	0.539922)
-	(0.142857,	0.257432)
-	(0.163265,	-0.039651)
-	(0.183673,	-0.313379)
-	(0.204082,	-0.533386)
-	(0.224490,	-0.712582)
-	(0.244898,	-0.856655)
-	(0.265306,	-0.932880)
-	(0.285714,	-0.953862)
-	(0.306122,	-0.957749)
-	(0.326531,	-0.890993)
-	(0.346939,	-0.774152)
-	(0.367347,	-0.602360)
-	(0.387755,	-0.396801)
-	(0.408163,	-0.132261)
-	(0.428571,	0.161664)
-	(0.448980,	0.460018)
-	(0.469388,	0.720198)
-	(0.489796,	0.880398)
-	(0.510204,	0.967384)
-	(0.530612,	0.900632)
-	(0.551020,	0.729232)
-	(0.571429,	0.460479)
-	(0.591837,	0.155311)
-	(0.612245,	-0.153827)
-	(0.632653,	-0.430787)
-	(0.653061,	-0.653561)
-	(0.673469,	-0.819444)
-	(0.693878,	-0.931060)
-	(0.714286,	-0.984394)
-	(0.734694,	-0.981970)
-	(0.755102,	-0.940272)
-	(0.775510,	-0.825804)
-	(0.795918,	-0.664138)
-	(0.816327,	-0.465371)
-	(0.836735,	-0.219185)
-	(0.857143,	0.070697)
-	(0.877551,	0.377456)
-	(0.897959,	0.658660)
-	(0.918367,	0.853564)
-	(0.938776,	0.925472)
-	(0.959184,	0.868936)
-	(0.979592,	0.629528)
-	(1.000000,	0.228732)
-};
-\end{axis}
-\end{tikzpicture}%
-\begin{tikzpicture}%
-\begin{axis}
-
-\addplot plot coordinates {
-	(0.000000,	0.112104)
-	(0.062500,	0.098029)
-	(0.125000,	0.083954)
-	(0.187500,	0.069879)
-	(0.250000,	0.055804)
-	(0.312500,	0.041729)
-	(0.375000,	0.027654)
-	(0.437500,	0.013579)
-	(0.500000,	-0.000496)
-	(0.562500,	-0.014571)
-	(0.625000,	-0.028646)
-	(0.687500,	-0.042722)
-	(0.750000,	-0.056797)
-	(0.812500,	-0.070872)
-	(0.875000,	-0.084947)
-	(0.937500,	-0.099022)
-	(1.000000,	-0.113097)
-};
-\end{axis}
-\end{tikzpicture}%
-\begin{tikzpicture}%
-\begin{axis}
-\addplot plot coordinates {
-	(0.000000,	-0.963159)
-	(0.020408,	-0.781664)
-	(0.040816,	-0.488585)
-	(0.061224,	-0.137738)
-	(0.081633,	0.234861)
-	(0.102041,	0.556489)
-	(0.122449,	0.791942)
-	(0.142857,	0.941856)
-	(0.163265,	0.977486)
-	(0.183673,	0.930499)
-	(0.204082,	0.809581)
-	(0.224490,	0.653308)
-	(0.244898,	0.474588)
-	(0.265306,	0.268631)
-	(0.285714,	0.048692)
-	(0.306122,	-0.168568)
-	(0.326531,	-0.380963)
-	(0.346939,	-0.577633)
-	(0.367347,	-0.751043)
-	(0.387755,	-0.893755)
-	(0.408163,	-0.960465)
-	(0.428571,	-0.932380)
-	(0.448980,	-0.841830)
-	(0.469388,	-0.650880)
-	(0.489796,	-0.346509)
-	(0.510204,	-0.007265)
-	(0.530612,	0.329744)
-	(0.551020,	0.621489)
-	(0.571429,	0.826905)
-	(0.591837,	0.947602)
-	(0.612245,	0.956706)
-	(0.632653,	0.872426)
-	(0.653061,	0.724325)
-	(0.673469,	0.528915)
-	(0.693878,	0.310032)
-	(0.714286,	0.081807)
-	(0.734694,	-0.143046)
-	(0.755102,	-0.363063)
-	(0.775510,	-0.559141)
-	(0.795918,	-0.733031)
-	(0.816327,	-0.880063)
-	(0.836735,	-0.959350)
-	(0.857143,	-0.968957)
-	(0.877551,	-0.885145)
-	(0.897959,	-0.702171)
-	(0.918367,	-0.410704)
-	(0.938776,	-0.035900)
-	(0.959184,	0.359062)
-	(0.979592,	0.719407)
-	(1.000000,	0.940563)
-};
-\end{axis}
-\end{tikzpicture}%
-}
-
-
-\testsection{Tick placement}
-\begin{tikzpicture}
-\begin{axis}[
-	xtick={-1.5,-1,...,1.5},
-	ytick={-0.5,0,...,1.5},
-	]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{axis}[
-	xmin=0,xmax=1,
-	xtick={-1.5,-1.25,...,1.5}]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{Enlargelimits tests}
-\testsubsubsection{enlargelimits=false, x limits provided}
-\begin{tikzpicture}
-\begin{axis}[%
-	enlargelimits=false,
-	xmin=0,xmax=1,
-	xtick={-1.5,-1.25,...,1.5}]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsubsection{enlargelimits=false, no limits provided}
-\begin{tikzpicture}
-\begin{axis}[enlargelimits=false]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsubsection{enlargelimits=true, all limits provided $[-1,1]\times [-1,1]$}
-\begin{tikzpicture}
-\begin{axis}[enlargelimits=true,xmin=-1,xmax=1,ymin=-1,ymax=1]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsubsection{enlargelimits=0.5}
-\begin{tikzpicture}
-\begin{axis}[enlargelimits=0.5]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{modified labels}
-
-{
-\tikzstyle{every axis label}=[]
-\tikzstyle{every axis x label}=[
-    at={(0.5,1)},
-    above,
-    yshift=+15pt]
-\tikzstyle{every axis y label}=[
-    at={(1,0.5)},
-    xshift=+35pt,
-    rotate=90]
-
-\begin{tikzpicture}
-\begin{axis}[
-	xlabel=$x$ axis,
-	ylabel=$y$ axis,
-	xmin=0,xmax=1,
-	tickpos=right,
-	xtick={-1.5,-1.25,...,1.5}]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-}
-
-\begin{tikzpicture}
-\begin{axis}[
-	xlabel=$x$ axis,
-	ylabel=$y$ axis,
-	xmin=0,xmax=1,
-	tickpos=both,
-	xtick={-1.5,-1.25,...,1.5}]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsection{Tick label assigment tests}
-\testsubsection{Using xticklabel and xtick}
-\begin{tikzpicture}
-\begin{axis}[
-	xtick={-1.5,-1,...,1.5},
-	xticklabel={%
-		\ifcase\ticknum	$-1\frac12$%
-		\or				$-1$%
-		\or				$-\frac12$%
-		\or				$0$%
-		\or				$\frac12$%
-		\or				$1$%
-		\or				$1\frac12$%
-		\else			$\tick$%
-		\fi
-	}
-]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{Using xticklabels}%
-\begin{tikzpicture}
-\begin{axis}[
-	xtick={-1.5,-1,...,1.5},
-	xticklabels={%
-		$-1\frac 12$,
-		$-1$,
-		$-\frac 12$,
-		$0$,
-		$\frac 12$,
-		$1$}
-]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{With commas}
-\begin{tikzpicture}
-\begin{axis}[
-	xtick={-1.5,-1,...,1.5},
-	xticklabels={%
-		{-1,5},
-		-1,
-		{-0,5},
-		0,
-		{0,5},
-		1,
-		{1,5}}
-]
-\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{Using yticklabels in logplot}%
-{
-\def\tickformat#1{1e#1}%
-\begin{tikzpicture}
-\begin{loglogaxis}[
-	ytick={1e-8,1e-7,1e-6,1e-5,1e-4,1e-3,1e-2,1e-1,1e0,1e1},
-	yticklabels={%
-		\tickformat{-8},
-		\tickformat{-7},
-		\tickformat{-6},
-		\tickformat{-5},
-		\tickformat{-4},
-		\tickformat{-3},
-		\tickformat{-2},
-		\tickformat{-1},
-		\tickformat{-0}}
-]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-}
-
-\testsection{Default options log plot}
-\begin{tikzpicture}
-\begin{loglogaxis}
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\testsection{Semilogy plot}
-\begin{tikzpicture}
-	\begin{semilogyaxis}[xlabel=Index,ylabel=Value]
-	\addplot[color=blue,mark=*] plot coordinates {
-		(1,8)
-		(2,16)
-		(3,32)
-		(4,64)
-		(5,128)
-		(6,256)
-		(7,512)
-	};
-	\end{semilogyaxis}
-\end{tikzpicture}
-
-\testsection{Semilogx plot}
-\begin{tikzpicture}
-	\begin{semilogxaxis}[xlabel=Index,ylabel=Value]
-	\addplot[color=blue,mark=*] plot coordinates {
-		(8,1)
-		(16,2)
-		(32,3)
-		(64,4)
-		(128,5)
-		(256,6)
-		(512,7)
-	};
-	\end{semilogxaxis}
-\end{tikzpicture}
-
-\testsection{Scaling log plots}
-\hrule
-\nobreak
-\vskip10pt
-\nobreak
-\noindent
-\begin{tikzpicture}
-\begin{loglogaxis}[width=\textwidth]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[width=\textwidth,height=\textheight]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[height=5.5cm]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\testsection{Tick/Tick-Label placement log plots}
-\begin{tikzpicture}
-\begin{loglogaxis}[
-	xmin=0.99e2,xmax=1e4,
-	ytickten={-5,-4,-3.6,-3,-2,-1,0},
-	yticklabel={
-		\ifnum\ticknum=2	
-			$\rightarrow$
-		\else
-			\axisdefaultticklabellog
-		\fi
-	}
-]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\testsection{Legends}
-\begingroup
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error]
-\loglogtestplot
-\legend{Eins\\Zwei\\}%
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend columns=2]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend columns=3]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-
-{
-\tikzstyle{every axis legend}+=[inner sep=0pt,nodes={inner sep=0pt}]
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend columns=4]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-}
-
-{\tikzstyle{every axis legend}+=[at={(0.5,-0.2)},anchor=north]
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend columns=6]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-}%
-
-{\tikzstyle{every axis legend}+=[at={(0.5,0.98)},anchor=north,inner sep=0pt]
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend columns=-1]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-}%
-
-\testsubsection{``legend plot pos'' options}
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend plot pos=left]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend plot pos=right]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error,legend plot pos=none]
-\manylogplots
-\end{loglogaxis}
-\end{tikzpicture}
-\endgroup
-
-\testsection{Title-option}
-\begin{tikzpicture}
-\begin{loglogaxis}[title=A test title,xlabel=Dof,ylabel=Error]
-\loglogtestplot
-\end{loglogaxis}
-\end{tikzpicture}
-
-\testsection{Scaling test for very small or very large x values}
-\testsubsection{1e-2}
-\begin{tikzpicture}
-\begin{axis}
-	\addplot plot coordinates {
-		(0.005,1)
-		(0.01,2)
-		(0.02,4)
-	};
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{1e+2}
-% \tracingmacros=2\tracingcommands=2
-\begin{tikzpicture}
-\begin{axis}
-	\addplot plot coordinates {
-		(50,1)
-		(100,2)
-		(200,4)
-	};
-\end{axis}
-\end{tikzpicture}
-% \tracingmacros=0\tracingcommands=0
-
-\testsubsection{x=1e+11; y=1e-6}
-\begin{tikzpicture}
-\begin{axis}
-	\addplot plot coordinates {
-		(5e10,1e-6)
-		(1e11,2e-6)
-		(2e11,4e-6)
-	};
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{1e+2}
-\begin{tikzpicture}
-\begin{axis}
-	\addplot plot coordinates {
-		(5,1)
-		(10,2)
-		(20,4)
-	};
-\end{axis}
-\end{tikzpicture}
-
-\testsection{Filter test}
-{%
-\def\myOwnYfilter#1\to#2{%
-	\def#2{0.5}%
-}%
-\begin{tikzpicture}
-\begin{axis}[yfilter={\myOwnYfilter}]
-\addplot plot coordinates {
-	(4,0)
-	(6,1)
-};
-\end{axis}
-\end{tikzpicture}
-}%
-
-\testsection{Test for addplot+[...]}
-{
-\tikzstyle{every axis legend}+=[at={(1.03,1)},anchor=north west]
-\begin{enumerate}
-	\item Ohne aenderung:
-
-\begin{tikzpicture}
-\begin{axis}
-\smallplotstest
-
-\addplot plot coordinates {
-	(4,0)
-	(6,1)
-};
-\legend{eins\\zwei\\}%
-\end{axis}
-\end{tikzpicture}
-
-\item MIT aenderung:
-
-\begin{tikzpicture}
-\begin{axis}
-\smallplotstest
-
-\addplot+[only marks] plot coordinates {
-	(4,0)
-	(6,1)
-};
-\legend{eins\\zwei\\}%
-\end{axis}
-\end{tikzpicture}
-\end{enumerate}
-}
-
-\testsection{Baseline alignment}
-\noindent
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel=An x label]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-\hspace{1cm}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel={\Huge An x label}]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-
-\testsubsection{Baseline alignment and externalized graphics}
-One needs \texttt{\textbackslash beginpgfgraphicnamed} around the complete paragraph, so this here doesn't work (see source code):
-
-\beginpgfgraphicnamed{baselinetesta}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel=An x label]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-\endpgfgraphicnamed
-%
-%
-\hspace{1cm}
-\beginpgfgraphicnamed{baselinetestb}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel={\Huge An x label}]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-\endpgfgraphicnamed
-
-\testsubsection{Baseline alignment and externalized graphics II}
-\beginpgfgraphicnamed{baselinetestc}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel=An x label]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-%
-%
-\hspace{1cm}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel={\Huge An x label}]
-	\smallplotstest
-\end{axis}
-\end{tikzpicture}
-\endpgfgraphicnamed
-
-\testsubsection{Horizontal and Vertical alignment}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel=An x label,ylabel=An y label]
-	\smallplotstest
-\end{axis}
-
-\begin{scope}[yshift=-4cm]
-\begin{axis}[width=0.4\linewidth,xlabel=An x label,ylabel={$\displaystyle\sum_{k=1}^n \frac 1n$}]
-	\smallplotstest
-\end{axis}
-\end{scope}
-
-\node[fill=yellow,circle] at (0,0) {$(0,0)$};
-\end{tikzpicture}
-%
-%
-\hspace{1cm}
-\begin{tikzpicture}[baseline]
-\begin{axis}[width=0.4\linewidth,xlabel={\Huge An x label}]
-	\smallplotstest
-\end{axis}
-
-\begin{scope}[yshift=-4cm]
-\begin{axis}[width=0.4\linewidth,xlabel={\Huge An x label},ylabel={$\displaystyle\sum_{k=1}^n \frac 1n$}]
-	\smallplotstest
-\end{axis}
-\end{scope}
-\node[fill=yellow,circle] at (0,0) {$(0,0)$};
-\end{tikzpicture}
-
-\testsection{Scaletest}
-
-{
-\listnew{\autoplotspeclist}{%
-	red,only marks,mark options={fill=red!80!black},mark=*\\%
-	black,only marks,mark options={fill=black},mark=square*\\%
-}%
-\begin{tikzpicture}
-\begin{axis}[%
-	width=8cm,
-	height=2cm,
-	xtick=\empty,
-	ytick=\empty
-]
-
-\addplot plot coordinates {
-	(0.968555,	0.000000)
-	(0.984277,	0.000000)
-	(0.030884,	0.000000)
-	(0.250000,	0.000000)
-	(0.750000,	0.000000)
-	(0.468750,	0.000000)
-	(0.750000,	0.000000)
-	(0.484375,	0.000000)
-	(0.968555,	0.000000)
-	(0.968555,	0.000000)
-	(1.000000,	0.000000)
-	(1.000000,	0.000000)
-	(0.030176,	0.000000)
-	(0.250000,	0.000000)
-	(0.250000,	0.000000)
-	(0.250000,	0.000000)
-	(0.750000,	0.000000)
-	(1.000000,	0.000000)
-	(0.500000,	0.000000)
-	(0.500000,	0.000000)
-	(0.234375,	0.000000)
-	(0.500000,	0.000000)
-	(0.750000,	0.000000)
-	(0.000000,	0.000000)
-	(0.750000,	0.000000)
-	(0.468750,	0.000000)
-	(0.500000,	0.000000)
-	(0.000000,	0.000000)
-	(0.468750,	0.000000)
-	(0.000000,	0.000000)
-	(0.750000,	0.000000)
-	(0.000000,	0.000000)
-	(0.234375,	0.000000)
-	(1.000000,	0.000000)
-};
-\addplot plot coordinates {
-	(0.367188,	0.000000)
-	(0.625000,	0.000000)
-	(0.312500,	0.000000)
-	(0.656250,	0.000000)
-	(0.312500,	0.000000)
-	(0.148438,	0.000000)
-	(0.125000,	0.000000)
-	(0.640625,	0.000000)
-	(0.136719,	0.000000)
-	(0.875000,	0.000000)
-	(0.390625,	0.000000)
-	(0.828125,	0.000000)
-	(0.875000,	0.000000)
-	(0.656250,	0.000000)
-	(0.125000,	0.000000)
-	(0.343750,	0.000000)
-	(0.861328,	0.000000)
-	(0.312500,	0.000000)
-	(0.578125,	0.000000)
-	(0.578125,	0.000000)
-	(0.625000,	0.000000)
-	(0.375000,	0.000000)
-	(0.875000,	0.000000)
-	(0.812500,	0.000000)
-	(0.847656,	0.000000)
-	(0.589844,	0.000000)
-	(0.343750,	0.000000)
-	(0.125000,	0.000000)
-	(0.875000,	0.000000)
-	(0.125000,	0.000000)
-	(0.609375,	0.000000)
-	(0.156250,	0.000000)
-};
-\end{axis}
-\end{tikzpicture}
-}
-
-\testsection{Anchortest}
-{
-\def\plot#1{
-\vbox{\hsize=5cm
-#1:
-
-\begin{tikzpicture}
-	\begin{axis}[width=5cm,anchor=#1]
-		\smallplotstest
-	\end{axis}
-	\node[fill=yellow,circle] at (0,0) {$(0,0)$};
-\end{tikzpicture}
-}
-}%
-\noindent
-\plot{north}
-\plot{north west}
-\plot{west}
-\plot{south west}
-\plot{south}
-\plot{south east}
-\plot{east}
-\plot{north east}
-\plot{center}
-}
-
-\testsection{Hide axis test}
-\begin{tikzpicture}
-	\begin{axis}
-		\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-\begin{tikzpicture}
-	\begin{axis}[hide axis]
-		\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-\vskip 1cm
-\noindent
-\begin{tikzpicture}
-	\begin{axis}[hide axis,title=A plot with hidden axis]
-		\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-\begin{tikzpicture}
-	\begin{axis}[hide axis,title=A plot with hidden axis]
-		\smallplotstest
-		\legend{A legend\\}
-	\end{axis}
-\end{tikzpicture}
-
-\testsection{Style--test}
-{
-%\tikzstyle{every axis}=[xmin=-3,xmax=3]
-\begin{tikzpicture}
-	\begin{axis}
-		\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-}
-
-\testsection{Grid lines test}
-\begin{tikzpicture}
-	\begin{axis}[xmajorgrids]
-	\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{axis}[ymajorgrids,xmajorgrids]
-	\smallplotstest
-	\end{axis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}[ymajorgrids,xmajorgrids]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}[grid=both]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-{
-\tikzstyle{every major tick}+=[color=black,thick]
-\begin{tikzpicture}
-	\begin{loglogaxis}[grid=major]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\tikzstyle{every minor tick}+=[color=black,thick]
-\begin{tikzpicture}
-	\begin{loglogaxis}[grid=both]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-}
-
-\testsection{Tick lines test}
-\begin{tikzpicture}
-	\begin{loglogaxis}[xmajorticks=false,xminorticks=true]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}[ymajorticks=false,yminorticks=false]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}[ticks=none]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}[ticks=major]
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-
-\testsection{TikZ-coordinate system ``axis''}
-\begin{tikzpicture}
-\begin{axis}
-\smallplotstest
-\axispath\draw (axis cs:0.5,0.6) -- (axis cs:-1,0);
-\end{axis}
-\end{tikzpicture}
-
-\begin{tikzpicture}
-	\begin{loglogaxis}
-	\axispath\draw 
-		(axis cs:18943,2.873391e-05) |- (axis cs:47103,8.437499e-06);
-	\loglogtestplot
-	\end{loglogaxis}
-\end{tikzpicture}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1.dat b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1.dat
new file mode 100644
index 00000000000..940bcad71a5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1.dat
@@ -0,0 +1,35 @@
+0.190600	0.860900
+0.194400	0.908000
+0.179900	0.140700
+0.212400	0.294200
+0.218900	0.779100
+0.201700	0.388400
+0.209100	0.679900
+0.196200	0.470800
+0.199900	0.812700
+0.199300	0.850500
+0.204300	0.980300
+0.209500	0.953000
+0.176200	0.145300
+0.207400	0.351900
+0.199000	0.304500
+0.202200	0.256300
+0.197000	0.744300
+0.181100	0.998900
+0.193400	0.554900
+0.218300	0.506500
+0.193800	0.201000
+0.208100	0.531900
+0.204100	0.635500
+0.217000	0.069800
+0.196100	0.710300
+0.198900	0.440900
+0.213000	0.591900
+0.206000	0.030700
+0.186000	0.395900
+0.206500	0.082500
+0.195500	0.672000
+0.221400 -0.013500
+0.202300	0.222300
+0.193300	0.959700
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1_latent.dat b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1_latent.dat
new file mode 100644
index 00000000000..33123e0b8b3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata1_latent.dat
@@ -0,0 +1,10 @@
+		0.968555	0
+		0.030884	0
+		0.750000	0
+		0.468750	0
+		1.000000	0
+		0.030176	0
+		0.750000	0
+		0.468750	0
+		0	0
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2.dat b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2.dat
new file mode 100644
index 00000000000..64404efbcf7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2.dat
@@ -0,0 +1,32 @@
+	0.005300	0.369500
+	-0.016100	0.610000
+	-0.007400	0.252100
+	0.002900	0.699600
+	0.010900	0.232000
+	-0.014100	0.152400
+	-0.008000	-0.003100
+	-0.009100	0.639900
+	-0.008700	0.125800
+	-0.003700	0.897400
+	0.009600	0.432200
+	-0.009100	0.770800
+	-0.030300	0.974200
+	-0.004000	0.675900
+	-0.002100	0.089500
+	0.003300	0.319700
+	0.006100	0.863300
+	0.000600	0.263700
+	-0.008900	0.471500
+	0.016000	0.505700
+	0.000000	0.602600
+	-0.012300	0.404400
+	-0.007000	0.911900
+	0.006700	0.747200
+	0.009000	0.825300
+	-0.001500	0.534400
+	-0.020600	0.336300
+	0.012600	0.039800
+	0.011600	0.944100
+	-0.003600	0.068000
+	-0.022400	0.575400
+	-0.002900	0.184500
diff --git a/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2_latent.dat b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2_latent.dat
new file mode 100644
index 00000000000..d10aaeb8e53
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfplots/plotdata/pgfplots_scatterdata2_latent.dat
@@ -0,0 +1,9 @@
+		0.367188	0
+		0.312500	0
+		0.136719	0
+		0.828125	0
+		0.656250	0
+		0.343750	0
+		0.125000	0
+		0.156250	0
+
diff --git a/Master/texmf-dist/doc/latex/pgfplots/todo.txt b/Master/texmf-dist/doc/latex/pgfplots/todo.txt
index 2c27f484bbd..e0d804e0d36 100644
--- a/Master/texmf-dist/doc/latex/pgfplots/todo.txt
+++ b/Master/texmf-dist/doc/latex/pgfplots/todo.txt
@@ -2,6 +2,36 @@
 BUGS
 -------------------------------------------------------------
 
+- extra ticks can be disabled by the tick special cases for axis lines (when two
+  axis lines cross each other)
+
+- \addplot plot[#1] does not use /pgfplots as search path
+
++ eliminate any public reference to the '\\'-lists. They are inconsistent with PGF.
+
++ use '{}' for sci  'e' style - looks better
+
++ the tick scale labels are inadequate.
+   1. Formatting
+   2. maybe they should be disabled at all!?
+
++ specifying axis limits for X should also limit those for Y (some sort of
+  clipping)
+
+- the text height of every axis x tick should be adjusted to allow tick scale
+  labels on the same vertical alignment
+  -> bug in pgf: text height does not properly respect to the current font!?
+
++ the new \pgfkeys framework:
+  	+ I have re-implemented all options with \pgfkeys. 
+	  this allows styles and mixing of TikZ/pgfplots options.
+	+ BUG: if someone provides FULL keynames, the method WILL FAIL.
+	+ the style= option fails.
+	+ the 'x=' and 'y=' options fail.
+	+ every option which exists in both, pgf and tikz, will fail!
+	+ 'legend style' fails
+	+ the 'legend style, grid style, x label style etc. options' test fails
+
 + axis limits of zero width are not fixed causing division by zero
 
 + ytick=\empty is broken again :-(
@@ -15,12 +45,10 @@ BUGS
 	Instead, tick positions should be RECOGNISED AS MINOR TICKS (which is not
 	that simple).
 
-- bei normalen plots wird der parser nicht angeworfen
-
 + die legend[font=] variable ist doch dasselbe wie in dem tikzstyle zu legenden,
   oder? warum funktioniert es dann anders?
 
-- implementiere enlargelimits fuer log-achsen
++ implementiere enlargelimits fuer log-achsen
 
 + markers werden rausgeclipped, wenn die achsen TIGHT sind.
 
@@ -67,13 +95,13 @@ X Fix the scaling estimations.
    -> bei sehr grossen oder sehr kleinen limits schlaegt die derzeitige
    einschraenkung der step sizes fehl
 
-- addplot plot coordinates { (235 , 43252) }
++ addplot plot coordinates { (235 , 43252) }
   								 ^
   funzt nicht wegen dem leerzeichen vor dem komma
 
-- verschiebung des ylabels ist komisch, wegen der rotate option
+X verschiebung des ylabels ist komisch, wegen der rotate option
 
-- die standard-positionierung der achsenlabels beruecksichtigt nicht die breite
++ die standard-positionierung der achsenlabels beruecksichtigt nicht die breite
   der ticklabels - entweder ist es daher zu weit weg oder zu nah
 
 + tickpos packt nur die ticks woanders hin, nicht die tick labels
@@ -140,24 +168,67 @@ X Die gesamtbreite enthaelt zu viele nur grob einkalkulierte einfluesse!
 FEATURES
 -------------------------------------------------------------
 
-- prettyprintnumber is not adequate.
+X implement an axis as path-command
+
++ implement proper anchors 
+
++ provide simple options for useful bounding box truncations
+
+
++ Maybe I could perform a restore of the current bounding box at the END of an
+  axis. Restore means: restore to the setting BEFORE the axis.
+
+  This is useful if 
+   - the size of the inner axis
+   - the size of the final axis 
+  remains known until after the complete axis. 
+
+  Motivation: the axis as such can have NO contribution to the pictures dimension,
+  and the user can call '\useasboundingbox (inner axis.north east) rectangle
+  (inner axis.south west);
+  or something like that.
+
+  This affects \pgf@picminx and the other variables, see the manual.
+
++ I could create a node which can be referenced and which has the axis' size 
+  [ That touches another open problem, see below]
+
++ I could use the new 'local bounding box' option of PGF to restrict the
+  bounding box to the axis' size
+
++ I also need some sort of number style for log-tick-labels.
+
++ move math mode shifts into \prettyprintnumber implementation.
+
++ allow the '-plot' commands.
+  It would be a cool feature if '(FIRST_X,0)' could be inserted as move-to
+  operation before every plot.
+  -> one could make funny features with 'fill' in plot styles.
+
+- make the legend code more general: allow
+   \addformattedlegendentry{ \node{hallo} \nextcell \node{foo} \nextcell #1}
+   where #1 is the auto-generated small plot-spec image. One could also provide
+   '#2' as just the current plot spec OPTIONS.
+
+
++ prettyprintnumber is not adequate.
   There are different aims:
   1. The user provides 
-  		- precision
-		- number format (sci, fixed, truncate to int, 'whatever fits best')
-		- the number in any precision or format.
+  		+ precision
+		+ number format (sci, fixed, truncate to int, 'whatever fits best')
+		+ the number in any precision or format.
 			Details:
-				- I need \scifloatround
-				  	- sollte die mantisse einer exponential-darstellung runden
-					- erfordert u.U. renormalisierungen
-				- the fixed point rounding routine needs to distinguish between
-				  	- MAXIMUM precision,	1.000	-> 1
-					- FIXED precision		1.000	-> 1.00
-				- the 'std' format should use
-				  	- fixed point if 
+				+ I need \scifloatround
+				  	+ sollte die mantisse einer exponential-darstellung runden
+					+ erfordert u.U. renormalisierungen
+				+ the fixed point rounding routine needs to distinguish between
+				  	+ MAXIMUM precision,	1.000	-> 1
+					+ FIXED precision		1.000	-> 1.00
+				+ the 'std' format should use
+				  	+ fixed point if 
 					  	-4 < e < precision
-					- scientific in all other cases.
-					- this is copied from 'printf' manual. Motivation:
+					+ scientific in all other cases.
+					+ this is copied from 'printf' manual. Motivation:
 					  	- 0.00013  wastes more space than 1.3e-4 and the latter
 						  one may have higher precision.
 						- with precision 3,  exponent > precision like  12345 =
@@ -192,8 +263,8 @@ FEATURES
 			- for scientific format: call
 			  \shownumberexponential\sign\mantisse\exponent
 			  There are different possible methods to display \mantisse:
-			  	- MAXIMUM precision
-				- FIXED precision
+			  	+ MAXIMUM precision
+				+ FIXED precision
 			  The same holds for the exponent: 
 			  	- zero-pad to X digits
 				- minimum space
@@ -207,9 +278,9 @@ FEATURES
 			  Maybe I can return the \preperiod and \postperiod parts from the
 			  rounding-routines.
    Ideas:
-   	- prettyprintnumber should access a bunch of configuration variables.
-	- these variables should be configurable by a key-value-parser.
-	- there should be a key-value-interface for prettyprintnumber, but it would
+   	+ prettyprintnumber should access a bunch of configuration variables.
+	+ these variables should be configurable by a key-value-parser.
+	+ there should be a key-value-interface for prettyprintnumber, but it would
 	  be best if that one is not necessarily needed. Most applications will not call
 	  prettyprintnumber directly; they will configure the number format once and
 	  invoke prettyprintnumber without options.
@@ -221,14 +292,14 @@ FEATURES
 
 - document 'legend plot pos' option
 
-- Most of my loops are quite inefficient. I have learned how to employ
++ Most of my loops are quite inefficient. I have learned how to employ
   \@ifnextchar (or the PGF-pendant) to create efficient loops on top of TeXs
   parser:
   - use \@ifnextchar to check for a TERMINATE token and recurse otherwise.
   - linear runtime
   - I fear, my loops have quadratic runtime
 
-- there are some clipping paths in the tick-placement loop which can be
++ there are some clipping paths in the tick-placement loop which can be
   replacement with simple \ifdim's. 
   I guess clipping is not the cheapest operation.
 
@@ -237,7 +308,7 @@ FEATURES
   them like '\tick' during ticklabel typesetting
  
 
-- Es sollte unbedingt moeglich sein, die TikZ-Styles zu verwenden. Das
++ Es sollte unbedingt moeglich sein, die TikZ-Styles zu verwenden. Das
   \axispreset ist reichlich nervig und inkonsistent mit der restlichen nutzung
   -> optimal:
 	  \path (0,0) axis[xlabel=X,width=...] {
@@ -271,7 +342,7 @@ FEATURES
 	-> convert to \listnew, use listpopfront to access elements
 
 
-- provide options for log plot tick formatting:
++ provide options for log plot tick formatting:
   	10^0.703 vs fixed point format
 
 + I could provide a global coordinate transformation 
@@ -347,27 +418,26 @@ FEATURES
   Kann man das nutzen, um sowohl farbige als auch S/W-plots zu generieren?
   -> pruefe draftcopy paket
 
+
 - koennte man den kram auch aus (grossen) tabellen rauslesen? Also sowas wie
   "plot X versus Y aus file Z"?
-  -> das geht sicher! 
+-> DEBUG!
   Ideen:
-  	- abstrakte datenstruktur als liste von spalten, eine spalte ist ne liste
+  	+ abstrakte datenstruktur als liste von spalten, eine spalte ist ne liste
 	  von nummern
-	- einlesen: 
-	  	- zeilenweise, haengt an die jeweiligen spalten mit \listpushback
+	+ einlesen: 
+	  	+ zeilenweise, haengt an die jeweiligen spalten mit \listpushback
 		  coordinaten dran
-		- read first line as header (optionally my $flags line for column
+		+ read first line as header (optionally my $flags line for column
 		  formatting advice)
-		- read just strings, no parsing
+		+ read just strings, no parsing
 		- optimal: '\t' as separator. How can I teach TeX to use '\t' as
 		  separator!?
 	- would allow
-	  	\addplot plot table[x=X,y=Z] {\table}
+	+  	\addplot plot table[x=X,y=Z] {\table}
 	  and
-	  	\typesettable[columns=...,format=sci,...,formatting options=...] {\table}
-	- implementation: simple run through column lists
-	   -> I need a method for simultaneous traversal of multiple lists, not
-	   difficult
+	-  	\typesettable[columns=...,format=sci,...,formatting options=...] {\table}
+	+ implementation: simple run through column lists
 	-> CONSISTENT data representation, powerful display options
 
 
@@ -398,7 +468,8 @@ FEATURES
   	- domain option verwenden zum update der limits
 	- kann man logs anwenden?
 	- plot function
-	- plot file
+	+ plot file
+	+ plot table[x=column1,y=column4]
 	- plot (...)
 	-> see tikz.code.tex for how to implement that!
author	Karl Berry <karl@freefriends.org>	2008-06-15 17:56:37 +0000
committer	Karl Berry <karl@freefriends.org>	2008-06-15 17:56:37 +0000
commit	3f126e90ac9efa15e72c8b415a2f25d3b19c509a (patch)
tree	3fb6f3eebbf51978c31e8d6ff1180432e50b9935 /Master/texmf-dist/doc/latex
parent	9667a29e9fef0ef89c9d7bd311e2d2a6aaccf50c (diff)