From b7f351186e14a82b2d9ad697752a86e073d04fc6 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 21 May 2013 23:04:38 +0000
Subject: pstricks (21may13)

git-svn-id: svn://tug.org/texlive/trunk@30616 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/generic/pstricks/pstricks.tex   | 54 ++++++++++++++--------
 1 file changed, 36 insertions(+), 18 deletions(-)

(limited to 'Master/texmf-dist/tex/generic')

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 18412f54e62..bae2c3ba6ef 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -103,8 +103,8 @@
 \input pgffor.code.tex
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.41}
-\def\filedate{2013/04/17}
+\def\fileversion{2.43}
+\def\filedate{2013/05/12}
 \catcode`\@=11\relax
 \pst@addfams{pstricks}
 %
@@ -795,22 +795,25 @@
 \catcode`\!=13
 \catcode`\*=13
 \catcode`\>=13
+\catcode`\+=13
 \gdef\pst@activecoor{%
   \def|{\string|}%
   \def;{\string;}%
   \def!{\string!}%
   \def*{\string*}%			algebraic expression hv 2007-11-17
   \def>{\string>}%
+  \def+{\string+}%			pure algebaric 2013-04-23
 }
 \endgroup
 % \pst@C@@rType = 0 cartesian (x,y)
 %               = 1 polar     (r;phi)
 %               = 2 PS        (! x y)
 %               = 3 mixed     ((x,y)|(x,y))
-%               = 4 algebraic (*x f(x))
+%               = 4 algebraic (*x f(x))   x in PostScript notation
 %               = 5 node      (A)
 %               = 6 special node ([...]A)
 %               = 7 node      (>A)
+%               = 8 algebraic (+x,f(x))   _both_ algebraic
 \def\pst@CheckCoorType#1|#2|#3\@nil{%
   \ifx#3|\relax 
     \global\pst@C@@rType=3\relax
@@ -837,11 +840,15 @@
         \else
           \ifx#1*\relax%			algebraic PostScript code: x f(x)
             \global\pst@C@@rType=4\relax%
-	  \else
-            \ifx#4;\relax%		polar coordinates
-              \global\pst@C@@rType=1\relax%
-            \else
-              \global\pst@C@@rType=0\relax%
+          \else
+            \ifx#1+\relax%			algebraic PostScript code: x, (f(x)
+              \global\pst@C@@rType=8\relax%
+  	    \else
+              \ifx#4;\relax%		polar coordinates
+                \global\pst@C@@rType=1\relax%
+              \else
+                \global\pst@C@@rType=0\relax%
+              \fi
             \fi
           \fi
 	\fi
@@ -872,14 +879,18 @@
       \ifx#1!\relax%			PostScript code: x y
         \def\ps@next{\raw@coor}%
       \else
-        \ifx#1*\relax%			algebraic PostScript code: x f(x)
+        \ifx#1*\relax%			PostScript/algebraic code: x f(x)
           \def\ps@next{\alg@coor}%
-	\else
-          \def\ps@next{\special@@@coor#1}%
-	\fi
-      \fi
-    \fi\fi
-  \fi
+        \else
+          \ifx#1+\relax%		algebraic code: x,f(x)
+            \def\ps@next{\algalg@coor}%
+	  \else%
+            \def\ps@next{\special@@@coor#1}%
+          \fi%
+	\fi%
+      \fi%
+    \fi\fi%
+  \fi%
   \ps@next%
 }
 \def\special@@@coor#1;#2;#3\@nil{%
@@ -927,9 +938,15 @@
 \def\alg@coor#1;#2\@nil{\expandafter\alg@@@coor#1}
 \def\alg@@@coor#1 #2{%			algebraic PostScript code 
   \edef\pst@coor{%
-%    #1 /yArg exch def /x exch def 
     /x #1 def
-%    /yArg load 200 string cvs /Arg exch def  
+    /Func (#2) AlgParser cvx def    
+    x Func 
+    \pst@number\psyunit mul exch \pst@number\psxunit mul exch }}
+%
+\def\algalg@coor#1;#2\@nil{\expandafter\algalg@@@coor#1}
+\def\algalg@@@coor#1,#2{%			algebraic algebraic code 
+  \edef\pst@coor{%
+    /x (#1) AlgParser cvx def    
     /Func (#2) AlgParser cvx def    
     x Func 
     \pst@number\psyunit mul exch \pst@number\psxunit mul exch }}
@@ -4005,7 +4022,8 @@ pop
 % 
 \def\uput@vii#1#2{%
   \edef\pst@coor{%
-    \pst@number\pslabelsep % \ifdim\pslabelsep<\z@  neg \fi
+    \ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pslabelsep \fi 
+%    \pst@number\pslabelsep % \ifdim\pslabelsep<\z@  neg \fi
     #2
     \pst@number{\wd\pst@hbox}%
     \pst@number{\ht\pst@hbox}%
-- 
cgit v1.2.3