2 files changed, 12 insertions, 4 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 50aed785dce..25d40e2ddce 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -17,8 +17,8 @@
 \ifx\MultidoLoaded\endinput \else\input multido.tex \fi
 \csname PSTEuclideLoaded\endcsname
 \let\PSTEuclideLoaded\endinput
-\def\fileversion{1.59}
-\def\filedate{2018/09/01}
+\def\fileversion{1.60}
+\def\filedate{2018/10/06}
 %% 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.
@@ -259,6 +259,7 @@
 %% #1 -> point coordinates
 \def\Pst@geonodelabel#1{%            % {nodename}
   \ifx\psk@PointSymbol\@none
+    \ifx\psk@PointName\@none\else \Pst@PutPointLabel{#1}\fi
   \else
 %      \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
       \psdot[dotstyle=\psk@PointSymbol](#1)%
@@ -1530,8 +1531,14 @@
   \fi
 }
 %% Distance specified with a number
-\def\pstDistVal#1{
-  #1 \pst@number\psxunit mul
+\def\pstDistVal#1{%
+ #1 \pst@number\psxunit mul
+  \ifx\psk@DistCoef\@none\else
+    \psk@DistCoef\space mul
+  \fi
+}
+\def\pstDistCalc#1{%
+  \pscalculate{#1} \pst@number\psxunit mul
   \ifx\psk@DistCoef\@none\else
     \psk@DistCoef\space mul
   \fi
diff --git a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
index 7168d0f5bb7..8b4a2c0e3c9 100644
--- a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
+++ b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
@@ -1,6 +1,7 @@
 \RequirePackage{pstricks}
 \RequirePackage{pst-node}
 \RequirePackage{pst-tools}
+\RequirePackage{pst-calculate}
 \ProvidesPackage{pst-eucl}[2014/05/17 package wrapper for PSTricks pst-eucl.tex]
 \DeclareOption{old}{\gdef\psteucl@old{}}%   DR 10/05/2005
 \ProcessOptions