fixed math loading order problem

pgf-tikz · Mar 30, 2012 · 6b8752d · 6b8752d
1 parent d0f77b2
commit 6b8752d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 3 deletions.
diff --git a/doc/generic/pgf/ChangeLog b/doc/generic/pgf/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-30 Till Tantau <[email protected]>
+
+	- Fixed problem that in case math library is loaded before pgf
+	some math functions were broken (because \pgfmath@xa and
+	\pgf@xa were different registers, which they should not be).
+
 2012-03-29 Till Tantau <[email protected]>
 
 	- Added anchoring and orientation to graph drawing library. 

diff --git a/generic/pgf/math/pgfmathutil.code.tex b/generic/pgf/math/pgfmathutil.code.tex
@@ -80,7 +80,7 @@
 \let\pgfmath@yc\pgf@yc
 
 \let\pgfmath@tempdima\pgfutil@tempdima
-\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdimb\pgfutil@tempdimb
 
 \let\c@pgfmath@counta\c@pgf@counta
 \let\c@pgfmath@countb\c@pgf@countb

diff --git a/generic/pgf/modules/pgfmoduledecorations.code.tex b/generic/pgf/modules/pgfmoduledecorations.code.tex
@@ -1347,7 +1347,6 @@
 		\advance\pgf@x0.666666\pgf@xa%
 		\advance\pgf@y0.666666\pgf@ya%
 	}%	
-	%
 	\let\pgf@decorate@movealonginputsegment\pgf@decorate@movealonginputsegment@line%
 	\let\pgf@decorate@transformtoinputsegment\pgf@decorate@transformtoinputsegment@line%
 	\let\pgfdecorationcurrentinputsegment\pgfdecorationinputsegmentlineto%
@@ -1419,7 +1418,7 @@
 		\pgfpointcurveattime{\pgf@decorate@inputsegmenttime}%
 			{\pgf@decorate@inputsegment@first}{\pgf@decorate@inputsegment@supporta}%
 			{\pgf@decorate@inputsegment@supportb}{\pgf@decorate@inputsegment@last}%
-		\pgf@xa\pgf@x%
+\show1		\pgf@xa\pgf@x%
 		\pgf@ya\pgf@y%
 		\pgf@xb\pgf@decorate@inputsegmenttime pt\relax%
 		%

diff --git a/generic/pgf/systemlayer/pgfsys.code.tex b/generic/pgf/systemlayer/pgfsys.code.tex
@@ -67,6 +67,25 @@
 \newcount\c@pgf@countd
 
 
+% Ensure that math registers are the same (math is broken in case it
+% is loaded first)
+\let\pgfmath@x\pgf@x
+\let\pgfmath@xa\pgf@xa
+\let\pgfmath@xb\pgf@xb
+\let\pgfmath@xc\pgf@xc
+
+\let\pgfmath@y\pgf@y
+\let\pgfmath@ya\pgf@ya
+\let\pgfmath@yb\pgf@yb
+\let\pgfmath@yc\pgf@yc
+
+\let\c@pgfmath@counta\c@pgf@counta
+\let\c@pgfmath@countb\c@pgf@countb
+\let\c@pgfmath@countc\c@pgf@countc
+\let\c@pgfmath@countd\c@pgf@countd
+
+
+
 % The following \if decides, whether even-odd filling and clipping is
 % to be used or normal the non-zero winding number rule. See the
 % pdf-documentation for details on what these rules are.

diff --git a/generic/pgf/utilities/pgfutil-context.def b/generic/pgf/utilities/pgfutil-context.def
@@ -275,6 +275,11 @@
 \newbox  \pgfutil@voidb@x
 \newtoks \pgfutil@toks@
 
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempcnta\pgfutil@tempcnta
+\let\pgfmath@tempcntb\pgfutil@tempcntb
+
 % From LaTeX
 \newskip\pgfutil@flushglue
 \pgfutil@flushglue=0pt plus 1fil

diff --git a/generic/pgf/utilities/pgfutil-latex.def b/generic/pgf/utilities/pgfutil-latex.def
@@ -67,6 +67,12 @@
 \let\pgfutil@tempdima=\@tempdima
 \let\pgfutil@tempdimb=\@tempdimb
 
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempcnta\pgfutil@tempcnta
+\let\pgfmath@tempcntb\pgfutil@tempcntb
+
+
 \AtEndDocument{\par\vfil\penalty-10000\relax\the\pgfutil@everybye}
 
 \def\pgfutil@insertatbegincurrentpagefrombox#1{%

diff --git a/generic/pgf/utilities/pgfutil-plain.def b/generic/pgf/utilities/pgfutil-plain.def
@@ -209,6 +209,11 @@
 \newdimen\pgfutil@tempdima
 \newdimen\pgfutil@tempdimb
 
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempdima\pgfutil@tempdima
+\let\pgfmath@tempcnta\pgfutil@tempcnta
+\let\pgfmath@tempcntb\pgfutil@tempcntb
+
 % From LaTeX
 \newskip\pgfutil@flushglue
 \pgfutil@flushglue=0pt plus 1fil