Random shifts to fix output routine shenenigans #928

pgf-tikz · Oct 4, 2020 · 8beaf97 · 8beaf97
1 parent bf46600
commit 8beaf97
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/tex/generic/pgf/utilities/pgfutil-latex.def b/tex/generic/pgf/utilities/pgfutil-latex.def
@@ -92,6 +92,9 @@
 
 \AtBeginDocument{\AtEndDocument{\clearpage\the\pgfutil@everybye}}
 
+% \@ifl@t@r is defined \@onlypremable so we have to save it here
+\let\pgfutil@ifl@t@r=\@ifl@t@r
+
 \def\pgfutil@insertatbegincurrentpagefrombox#1{%
   \edef\pgf@temp{\the\wd\pgfutil@abb}%
   \global\setbox\pgfutil@abb\hbox{%
@@ -105,8 +108,9 @@
     %
     % CF observed problems when placing patterns in XObjects without
     % this skip (dvipdfmx driver for pgfplots shader=interp)
-    \hskip-\pgf@temp\relax%
+    \hskip\dimexpr\pgfutil@ifl@t@r\fmtversion{2020/10/01}{2in-2\hoffset}{}-\pgf@temp\relax%
     #1%
+    \pgfutil@ifl@t@r\fmtversion{2020/10/01}{\hskip\dimexpr-2in-2\hoffset\relax}{}%
   }%
 }
 \newbox\pgfutil@abb%
@@ -119,7 +123,7 @@
 }
 \let\pgfutil@abe\pgfutil@empty%
 
-\@ifl@t@r\fmtversion{2020/10/01}{%
+\pgfutil@ifl@t@r\fmtversion{2020/10/01}{%
   \AddToHook{shipout/background}{%
     \put(\hoffset-1in,\voffset-1in){%
       \pgfutil@abe\unhbox\pgfutil@abb\pgfutil@abc\global\let\pgfutil@abc\pgfutil@empty