1 files changed, 29 insertions, 2 deletions
diff --git a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex
index f9f260b1d7d..abaf662bc40 100644
--- a/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex
+++ b/Master/texmf-dist/tex/generic/pgfplots/oldpgfcompatib/pgfplotsoldpgfsupp_misc.code.tex
@@ -1,13 +1,40 @@
 % ======================================================
 % compatibility with PGF 2.10
 % ======================================================
+%
 \def\pgfdeclarelayer#1{%
   \pgfutil@ifundefined{pgf@layerbox@#1}{%
-	  \expandafter\pgf@newbox\csname pgf@layerbox@#1\endcsname%
-	  \expandafter\pgf@newbox\csname pgf@layerboxsaved@#1\endcsname%
+	  \expandafter\expandafter\csname pgf@newbox\endcsname\csname pgf@layerbox@#1\endcsname%
+	  \expandafter\expandafter\csname pgf@newbox\endcsname\csname pgf@layerboxsaved@#1\endcsname%
   }{}%
 }
 
+\def\pgfutil@insertatbegincurrentpagefrombox@WRONG#1{%
+  \global\setbox\pgfutil@abb\hbox{\unhbox\pgfutil@abb#1}%
+}
+
+% needed for dvipdfmx and shader=interp
+\def\pgfutil@insertatbegincurrentpagefrombox@FIXED#1{%
+  \edef\pgf@temp{\the\wd\pgfutil@abb}%
+  \global\setbox\pgfutil@abb\hbox{%
+  	\unhbox\pgfutil@abb 
+	%
+	% the order in which \pgfutil@insertatbegincurrentpagefrombox
+	% matters unless we make the following -shift!
+	% To see this, consider writing two such statements. The second
+	% one will (naturally) be placed more to the right, although there
+	% is no apparent reason why it should.
+	%
+	% CF observed problems when placing patterns in XObjects without
+	% this skip (dvipdfmx driver for pgfplots shader=interp)
+	\hskip-\pgf@temp\relax
+	#1%
+  }%
+}
+\expandafter\ifx\csname pgfutil@insertatbegincurrentpagefrombox\endcsname\pgfutil@insertatbegincurrentpagefrombox@WRONG
+	\let\pgfutil@insertatbegincurrentpagefrombox=\pgfutil@insertatbegincurrentpagefrombox@FIXED
+\fi
+
 % check if \endtikzpicture deals with layerlist:
 \expandafter\pgfutil@in@\expandafter\pgf@remember@layerlist@globally\expandafter{\endtikzpicture}%
 \ifpgfutil@in@