pst-eucl (12oct16)

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

1 files changed, 30 insertions, 23 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 4e9559a8b55..4c9b37c8f90 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.54}
-\def\filedate{2016/09/01}
+\def\fileversion{1.55}
+\def\filedate{2016/10/11}
 %% 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.
@@ -47,6 +47,8 @@
 % use math mode in point name
 \newif\ifPst@PtNameMath%
 \define@key[psset]{pst-eucl}{PtNameMath}[false]{\@nameuse{Pst@PtNameMath#1}}%
+\define@key[psset]{pst-eucl}{PointNameSize}[\normalsize]{\def\Point@Name@Size{#1}}%
+\define@key[psset]{pst-eucl}{PointNameMathSize}[\textnormal]{\def\Point@Name@MathSize{#1}}%
 % symbol used for marking equal length segment
 \define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\def\psk@SegmentSymbol{#1}}%
 \define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\def\psk@SegmentSymbolA{#1}}%
@@ -132,7 +134,8 @@
 \psset[pst-eucl]{%
   PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
   PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
-  PtNameMath=true, PointNameSep=default, PosAngle=undef, PosAngleA=undef,
+  PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize, 
+  PointNameSep=default, PosAngle=undef, PosAngleA=undef,
   PosAngleB=undef, PosAngleC=undef, Mark=undef, mark=undef,SegmentSymbol=MarkHashh,
   SegmentSymbolA=MarkHashh, SegmentSymbolB=MarkHash, SegmentSymbolC=MarkHashhh,
   RightAngleSize=.4, RightAngleType=default, LabelAngleOffset=0, LabelSep=1,
@@ -267,7 +270,7 @@
   \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 $\Point@Name@MathSize\Pst@WhichLabel{#1}$\else\Point@Name@Size\Pst@WhichLabel{#1}\fi}
   \fi}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \def\Pst@WhichLabel#1{\ifx\psk@PointName\@default#1\else\psk@PointName\fi}%DR 0
@@ -373,25 +376,29 @@
   %% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
   \rput(#2){%
     \ifx\psk@RightAngleType\@default%
-    \pspolygon(0,0)%%modif 12/2004
-           (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
-           (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan 
-              2 copy sub abs 91 gt
-                { 2 copy lt { exch 360 add exch } { 360 add } ifelse  } if %%DR 2005/01/14
-             %%2 copy lt { exch 360 sub exch } if
-              add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC end)%
-           (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)%
-    \else\ifx\psk@RightAngleType\@german%
-    \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
-       {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
-    \else\ifx\psk@RightAngleType\@suisseromand%
-    \rput{*0}%
-      (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan 
-        2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)%
-      {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
-    \pspolygon(0,0)%
-           (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
-           (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+      \psline(!tx@EcldDict begin /N@#1 GetNode exch Atan 
+               \psk@RightAngleSize\space exch PtoC end)%
+             (!tx@EcldDict begin /N@#1 GetNode exch Atan /AngleNo1 ED 
+               tx@EcldDict begin /N@#3 GetNode exch Atan /AngleNo3 ED 
+               AngleNo1 AngleNo3 sub abs 180 gt { /Diff -45 def }{ /Diff 45 def } ifelse  
+               AngleNo1 AngleNo3 gt { AngleNo1 Diff sub }{ AngleNo3 Diff sub } ifelse
+                 \psk@RightAngleSize\space 2 sqrt mul exch PtoC end)%
+             (!tx@EcldDict begin /N@#3 GetNode exch Atan 
+               \psk@RightAngleSize\space exch PtoC end)%
+    \else
+      \ifx\psk@RightAngleType\@german
+        \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
+           {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+      \else
+        \ifx\psk@RightAngleType\@suisseromand
+          \rput{*0}%
+            (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan 
+              2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul exch PtoC end)%
+              {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+%    \pspolygon(0,0)%
+            \psline(0,0)%
+              (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
+              (!tx@EcldDict begin /N@#1 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
     \fi\fi\fi}%
   \endgroup\ignorespaces%  hv 20130312
 }%