summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex41
1 files changed, 18 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
index 96fe6db490a..0b6310873ab 100644
--- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsyssoftpath.code.tex
@@ -7,7 +7,7 @@
%
% See the file doc/generic/pgf/licenses/LICENSE for more details.
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.7 2008/07/18 19:06:58 ludewich Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/systemlayer/pgfsyssoftpath.code.tex,v 1.9 2013/09/09 10:05:41 tantau Exp $
% This package provides the pgf system path abstraction layer. This
@@ -52,7 +52,7 @@
% buffers are flushed.
%
% Because of this buffering, it is imperative that the main path is
-% accessed only vie appropriate interface macros.
+% accessed only via appropriate interface macros.
@@ -141,33 +141,31 @@
% Add a moveto element to the current path
\def\pgfsyssoftpath@moveto#1#2{%
- \edef\pgfsyssoftpath@temp{{%
- \noexpand\pgfsyssoftpath@movetotoken{#1}{#2}%
- }}%
- \expandafter\pgfsyssoftpath@addtocurrentpath\pgfsyssoftpath@temp%
+ \edef\pgfsyssoftpath@coord{{#1}{#2}}%
+ \expandafter\pgfsyssoftpath@addtocurrentpath\expandafter{\expandafter\pgfsyssoftpath@movetotoken\pgfsyssoftpath@coord}%
\ifpgfsyssoftpathmovetorelevant%
- \xdef\pgfsyssoftpath@lastmoveto{{#1}{#2}}%
+ \global\let\pgfsyssoftpath@lastmoveto\pgfsyssoftpath@coord%
\fi%
}
% Add a lineto element to the current path
\def\pgfsyssoftpath@lineto#1#2{%
- \edef\pgfsyssoftpath@temp{{%
- \noexpand\pgfsyssoftpath@linetotoken{#1}{#2}%
- }}%
- \expandafter\pgfsyssoftpath@addtocurrentpath\pgfsyssoftpath@temp%
+ \edef\pgfsyssoftpath@coord{{#1}{#2}}%
+ \expandafter\pgfsyssoftpath@addtocurrentpath\expandafter{\expandafter\pgfsyssoftpath@linetotoken\pgfsyssoftpath@coord}%
}
+
% Add curveto elements to the current path
\def\pgfsyssoftpath@curveto#1#2#3#4#5#6{%
\edef\pgfsyssoftpath@temp{{%
- \noexpand\pgfsyssoftpath@curvetosupportatoken{#1}{#2}%
- \noexpand\pgfsyssoftpath@curvetosupportbtoken{#3}{#4}%
- \noexpand\pgfsyssoftpath@curvetotoken{#5}{#6}%
- }}%
+ \noexpand\pgfsyssoftpath@curvetosupportatoken{#1}{#2}%
+ \noexpand\pgfsyssoftpath@curvetosupportbtoken{#3}{#4}%
+ \noexpand\pgfsyssoftpath@curvetotoken{#5}{#6}%
+ }}%
\expandafter\pgfsyssoftpath@addtocurrentpath\pgfsyssoftpath@temp%
}
+
% Add rectanlge elements to the current path
\def\pgfsyssoftpath@rect#1#2#3#4{%
\edef\pgfsyssoftpath@temp{{%
@@ -179,18 +177,13 @@
% Add closepath element to the current path
\def\pgfsyssoftpath@closepath{%
- \edef\pgfsyssoftpath@temp{{%
- \noexpand\pgfsyssoftpath@closepathtoken\pgfsyssoftpath@lastmoveto%
- }}%
- \expandafter\pgfsyssoftpath@addtocurrentpath\pgfsyssoftpath@temp%
+ \expandafter\pgfsyssoftpath@addtocurrentpath\expandafter{\expandafter\pgfsyssoftpath@closepathtoken\pgfsyssoftpath@lastmoveto}%
}
% Add special element to the current path
\def\pgfsyssoftpath@specialround#1#2{%
- \edef\pgfsyssoftpath@temp{{%
- \noexpand\pgfsyssoftpath@specialroundtoken{#1}{#2}%
- }}%
- \expandafter\pgfsyssoftpath@addtocurrentpath\pgfsyssoftpath@temp%
+ \edef\pgfsyssoftpath@temp{{#1}{#2}}%
+ \expandafter\pgfsyssoftpath@addtocurrentpath\expandafter{\expandafter\pgfsyssoftpath@specialroundtoken\pgfsyssoftpath@temp}%
}
% Marshallers
@@ -200,6 +193,8 @@
\def\pgfsyssoftpath@curvetosupportatoken#1#2#3#4#5#6#7#8{\pgfsys@curveto{#1}{#2}{#4}{#5}{#7}{#8}}
\def\pgfsyssoftpath@closepathtoken#1#2{\pgfsys@closepath}
\let\pgfsyssoftpath@specialroundtoken=\pgfutil@gobbletwo
+\def\pgfsyssoftpath@curvetosupportbtoken#1#2{curvetotokenb} % make sure this this \ifx-equal only to itself
+\def\pgfsyssoftpath@curvetotoken#1#2{curvetotoken}% make sure this this \ifx-equal only to itself
\endinput