Fix position tracking for XeTeX pgf-tikz#353

hmenke · Jun 20, 2019 · d0f6660 · d0f6660
1 parent d5aca9f
commit d0f6660
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def b/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def
@@ -86,21 +86,30 @@
 \def\pgfsys@hboxsynced#1{%
   \pgfsys@begin@idscope%
   \pgfsys@beginscope%
-    \setbox#1=\hbox{\box#1}%
-    \wd#1=0pt%
-    \ht#1=0pt%
-    \dp#1=0pt%
-    \pgfsys@dvipdfmx@suspendcontent%
-    \pgfsys@invoke{0 J [] 0 d}% reset line cap and dash
-    \pgfsys@dvipdfmx@start@force@reset@color%
-    \pgf@sys@bp@correct\pgf@pt@x%
-    \pgf@sys@bp@correct\pgf@pt@y%
-    \special{pdf:btrans matrix \pgf@pt@aa\space \pgf@pt@ab\space \pgf@pt@ba\space \pgf@pt@bb\space
-      \pgf@sys@tonumber{\pgf@pt@x} \pgf@sys@tonumber{\pgf@pt@y}}%
-    \box#1%
-    \special{pdf:etrans}%
-    \pgfsys@dvipdfmx@stop@force@reset@color%
-    \pgfsys@dvipdfmx@unsuspendcontent%
+    \setbox\pgf@hbox=\hbox{%
+      \hskip\pgf@pt@x%
+      \raise\pgf@pt@y\hbox{%
+        \pgf@pt@x=0pt%
+        \pgf@pt@y=0pt%
+        \wd#1=0pt%
+        \ht#1=0pt%
+        \dp#1=0pt%
+        \pgflowlevelsynccm%
+        \special{pdf: content q}%
+        \pgfsys@invoke{q -1 0 0 -1 0 0 cm}%
+        \special{pdf: content -1 0 0 -1 0 0 cm q}% \pgfsys@dvipdfmx@suspendcontent
+        \pgfsys@invoke{0 J [] 0 d}% reset line cap and dash
+        \pgfsys@dvipdfmx@start@force@reset@color%
+        \box#1%
+        \pgfsys@dvipdfmx@stop@force@reset@color%
+        \pgfsys@invoke{n Q Q Q}% \pgfsys@dvipdfmx@unsuspendcontent
+      }%
+      \hss%
+    }%
+    \wd\pgf@hbox=0pt%
+    \ht\pgf@hbox=0pt%
+    \dp\pgf@hbox=0pt%
+    \box\pgf@hbox%
   \pgfsys@endscope%
   \pgfsys@end@idscope%
 }