pst-eucl (24mar14)

git-svn-id: svn://tug.org/texlive/trunk@33274 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
index 9e84c66648e..ee42bc8612c 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -16,8 +16,8 @@
 \ifx\MultidoLoaded\endinput \else\input multido.tex \fi
 \csname PSTEuclideLoaded\endcsname
 \let\PSTEuclideLoaded\endinput
-\def\fileversion{1.48}
-\def\filedate{2013/05/02}
+\def\fileversion{1.49}
+\def\filedate{2014/03/17}
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN
 %% archives in directory macros/latex/base/lppl.txt.
@@ -276,7 +276,7 @@ end}%
   \ifx\psk@PointName\@none\else
     \rput{*0}([nodesep=\ifx\psk@PointNameSep\@default{1em}\else\psk@PointNameSep\fi,
                angle=\ifx\psk@PosAngle\@undef{0}\else\psk@PosAngle\fi]#1)%
-      {\ifPst@PtNameMath$\Pst@WhichLabel{#1}$\else\Pst@WhichLabel{#1}\fi}
+      {\ifPst@PtNameMath $\Pst@WhichLabel{#1}$\else\Pst@WhichLabel{#1}\fi}
   \fi}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \def\Pst@WhichLabel#1{\ifx\psk@PointName\@default#1\else\psk@PointName\fi}%DR 0
@@ -1082,7 +1082,10 @@ end}%
 %  end){\pnode{#5}}%
   \pnode(!
     tx@EcldDict begin
-    #4 { #3 } { #2 } NewtonSolving pop 
+    #4 
+    { \ifPst@algebraic (#3) AlgParser cvx exec \else #3  \fi }
+    { \ifPst@algebraic (#2) AlgParser cvx exec \else #2  \fi }
+    NewtonSolving pop 
     2 copy end
     /#5.Y exch def /#5.X exch def % save the coors for futher use
   ){#5}%
@@ -1105,8 +1108,10 @@ end}%
 %  end){\pnode{#6}}% 
   \pnode(!
     tx@EcldDict begin
-    #5 { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
-    \pst@number\psxunit div 3 1 roll div x mul add } { #2 }
+    #5 
+    { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
+      \pst@number\psxunit div 3 1 roll div x mul add } 
+    { \ifPst@algebraic (#2) AlgParser cvx exec \else #2  \fi }
     NewtonSolving pop 2 copy end 
     /#5.Y exch def /#5.X exch def % save the coors for futher use
     ){#6}% 
@@ -1129,9 +1134,14 @@ end}%
 %  end){\pnode{#6}}% 
   \pnode(!
     tx@EcldDict begin
-    #5 { /N@#3 GetNode 2 copy /N@#4 GetNode ABDist \pst@number\psxunit div
-    3 1 roll \pst@number\psyunit div exch \pst@number\psxunit div exch x #2 ABDist sub } { 0 } NewtonSolving pop
-    pop dup /x exch def #2 2 copy end
+    #5 
+    { /N@#3 GetNode 2 copy /N@#4 GetNode ABDist \pst@number\psxunit div
+      3 1 roll \pst@number\psyunit div exch \pst@number\psxunit div exch x #2 ABDist sub } 
+    { 0 } 
+    NewtonSolving pop
+    pop dup /x exch def 
+    \ifPst@algebraic (#2) AlgParser cvx exec \else #2 \fi
+    2 copy end
     /#5.Y exch def /#5.X exch def % save the coors for futher use
     ){#6}% 
   \Pst@geonodelabel{#6}%