1 files changed, 16 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/pgfplotsplothandlers.code.tex b/Master/texmf-dist/tex/generic/pgfplots/pgfplotsplothandlers.code.tex
index d7352cc0970..d9bec6a91cf 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/pgfplotsplothandlers.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/pgfplotsplothandlers.code.tex
@@ -566,10 +566,11 @@
 \def\pgfplotsplothandlerserializepointto@default#1{%
 	% Store normalized point for list:
 	% We need
-	% xi,yi,zi,mi;
-	% where zi and mi may be empty. mi is the per-point meta
-	% information. It is used for per-coordinate marker
-	% modifications (like colormaps for scatter plots).
+	% xi,yi,zi;
+	% where zi may be empty. 
+	%
+	% Note that per-point meta information is stored in
+	% \pgfplotsaxisserializedatapoint .
 	\edef#1{\pgfplots@current@point@x,\pgfplots@current@point@y,\pgfplots@current@point@z}%
 }%
 
@@ -1749,6 +1750,9 @@
 		\else
 			\pgfmathfloatmultiply@{\pgfp@hist@totalcount@inv}{\pgfplotsplothandlerhistogram@invh}%
 			\let\pgfp@hist@totalcount@times@h@inv=\pgfmathresult
+% FIXME : this here is a patch suggestion for 
+% https://sourceforge.net/tracker/?func=detail&atid=1060656&aid=3609245&group_id=224188
+\let\pgfp@hist@totalcount@times@h@inv=\pgfp@hist@totalcount@inv
 			\pgfplotsarrayforeachungrouped{pgfp@hist}\as\pgfplots@hist@count{%
 				\pgfmathfloatparsenumber{\pgfplots@hist@count}%
 				\pgfmathfloatmultiply@{\pgfmathresult}{\pgfp@hist@totalcount@times@h@inv}%
@@ -1885,6 +1889,7 @@
 	contour prepared/.code={%
 		\let\tikz@plot@handler=\pgfplotsplothandlercontourprepared
 		\pgfqkeys{/pgfplots/contour}{%
+			every contour plot,
 			#1,%
 		}%
 	},
@@ -1912,6 +1917,9 @@
 	% this is (only) used for contour filled:
 	% data limits={(xmin,ymin,zmin,cmin) (xmax,ymax,ymax,cmax}
 	contour/data limits/.initial=,% FIXME EXPERIMENTAL
+	contour/every contour plot/.style={
+		/pgfplots/legend image post style={sharp plot},
+	},
 	contour/every contour label/.style={%
 		sloped,%
 		transform shape,%
@@ -1965,7 +1973,10 @@
 	% Interface to external tools:
 	contour external/.code={%
 		\edef\tikz@plot@handler{\noexpand\pgfplotsplothandlercontourexternal}%
-		\pgfqkeys{/pgfplots/contour external}{#1}%
+		\pgfqkeys{/pgfplots/contour external}{%
+			every contour plot,
+			#1%
+		}%
 	},
 	contour external/scanline marks/.is choice,
 	contour external/scanline marks/false/.code={\def\pgfplotsplothandlercontourexternal@scanlinemode{0}},