pst-eucl (18apr17)

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

1 files changed, 39 insertions, 42 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 4c9b37c8f90..850f4cf860f 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.55}
-\def\filedate{2016/10/11}
+\def\fileversion{1.56}
+\def\filedate{2017/04/18}
 %% 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.
@@ -134,7 +134,7 @@
 \psset[pst-eucl]{%
   PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
   PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
-  PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize, 
+  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,
@@ -254,7 +254,7 @@
   \xdef\@@GenCourbe{\@@GenCourbe(#5)}%%for accumulating points% DR 22032005
   \Pst@ManageParamList{#5}%
   \@ifnextchar({\Pst@OIJGeonode@iii{#1}{#2}{#3}}{\pst@MngTransformCurve\endgroup}}% DR 22032005
-%%end modif DR 11/2003 
+%%end modif DR 11/2003
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% #1 -> point coordinates
 \def\Pst@geonodelabel#1{%            % {nodename}
@@ -376,14 +376,14 @@
   %% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
   \rput(#2){%
     \ifx\psk@RightAngleType\@default%
-      \psline(!tx@EcldDict begin /N@#1 GetNode exch Atan 
+      \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  
+             (!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 
+             (!tx@EcldDict begin /N@#3 GetNode exch Atan
                \psk@RightAngleSize\space exch PtoC end)%
     \else
       \ifx\psk@RightAngleType\@german
@@ -392,7 +392,7 @@
       \else
         \ifx\psk@RightAngleType\@suisseromand
           \rput{*0}%
-            (!tx@EcldDict begin /N@#3 GetNode exch Atan /N@#1 GetNode exch Atan 
+            (!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)%
@@ -420,8 +420,8 @@
     \rput[\psk@LabelRefPt]{*0}(! tx@EcldDict begin
         /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
         2 copy lt { exch 360 sub exch } if
-        add 2 div dup /psRawLabelPos ED 
-        \psk@LabelAngleOffset\space add  
+        add 2 div dup /psRawLabelPos ED
+        \psk@LabelAngleOffset\space add
         \psk@LabelSep\space exch PtoC ){#5}%
     \def\pst@tempA{Angleundef}%
 %% define \pst@rot@angle to make it compatible with xelatex for later use
@@ -460,9 +460,9 @@
     \psset{PosAngleA={!
       /AngleAB \@@coordi\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
       /AngleAC \@@coordi\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def
-      AngleAB AngleAC add 2 div dup 
+      AngleAB AngleAC add 2 div dup
       1 exch \tx@PtoC exch \@@coordi\space 4 1 roll add 3 1 roll add XS YS Pyth2 % test if inside/outside
-      \@@coordi\space XS YS Pyth2 le { 180 add } if 
+      \@@coordi\space XS YS Pyth2 le { 180 add } if
     }}%% <------ hv
   \else\psset{PosAngle=\psk@PosAngleA}\fi
   %%end modif alaindelplanque 11/2003
@@ -487,10 +487,10 @@
   %%begin modif alaindelplanque 11/2003
   \ifx\psk@PosAngleC\@undef
    \psset{PosAngleC={!
-      /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def 
-      /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def 
+      /AngleCB \@@coordv\space\@@coordiii\space tx@EcldDict begin ABVect end exch Atan def
+      /AngleCA \@@coordv\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
       AngleCB AngleCA add 2 div dup 1 exch \tx@PtoC exch \@@coordv\space  4 1 roll add 3 1 roll add XS YS Pyth2
-      \@@coordv\space XS YS Pyth2 le { 180 add } if 
+      \@@coordv\space XS YS Pyth2 le { 180 add } if
    }}%% <------ hv
   \else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
   %%end modif alaindelplanque 11/2003
@@ -980,7 +980,7 @@
       /N@#2 GetNode /N@#3 GetNode /N@#4 GetNode /N@#5 GetNode InterLines
     end
     \pst@number\psyunit div exch \pst@number\psxunit div exch
-    2 copy 
+    2 copy
     /#6.Y exch def /#6.X exch def % save the coors for futher use
     ){#6}%
   \Pst@geonodelabel{#6}%
@@ -1128,10 +1128,10 @@
 %  end){\pnode{#5}}%
   \pnode(!
     tx@EcldDict begin
-    #4 
+    #4
     { \ifPst@algebraic (#3) AlgParser cvx exec \else #3  \fi }
     { \ifPst@algebraic (#2) AlgParser cvx exec \else #2  \fi }
-    NewtonSolving pop 
+    NewtonSolving pop
     2 copy end
     /#5.Y exch def /#5.X exch def % save the coors for futher use
   ){#5}%
@@ -1151,16 +1151,16 @@
 %    #5 { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
 %  \pst@number\psxunit div 3 1 roll div x mul add } { #2 }
 %  NewtonSolving pop
-%  end){\pnode{#6}}% 
+%  end){\pnode{#6}}%
   \pnode(!
     tx@EcldDict begin
-    #5 
+    #5
     { /N@#3 GetNode /N@#4 GetNode EqDr 1 index div
-      \pst@number\psxunit div 3 1 roll div x mul add } 
+      \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 
+    NewtonSolving pop 2 copy end
     /#5.Y exch def /#5.X exch def % save the coors for futher use
-    ){#6}% 
+    ){#6}%
   \Pst@geonodelabel{#6}%
   \egroup%
 }
@@ -1177,17 +1177,17 @@
   \edef\@function{ \ifPst@algebraic (#1) AlgParser cvx exec \else #1 \fi\space }%
   \pnode(!
     tx@EcldDict begin
-    #4 
+    #4
     { /N@#2 GetNode 2 copy /N@#3 GetNode ABDist \pst@number\psxunit div
       3 1 roll \pst@number\psyunit div exch \pst@number\psxunit div exch x \@function
-       ABDist sub } 
-    { 0 } 
+       ABDist sub }
+    { 0 }
     NewtonSolving pop
-    pop dup /x exch def 
+    pop dup /x exch def
     \@function
     2 copy end
     /#4.Y exch def /#4.X exch def % save the coors for futher use
-    ){#5}% 
+    ){#5}%
   \Pst@geonodelabel{#5}%
   \endgroup
   \ignorespaces
@@ -1536,10 +1536,10 @@
   \fi
 }
 %% angle defined by three points
-\def\pstAngleAOB#1#2#3{% 
+\def\pstAngleAOB#1#2#3{%
 %  \pstGeonode[PointName=none,PointSymbol=none](#1){temp@1}(#2){temp@2}(#3){temp@3}%
 %  \pstAngleAOB@i{temp@1}{temp@2}{temp@3}}
-%\def\pstAngleAOB@i#1#2#3{% 
+%\def\pstAngleAOB@i#1#2#3{%
   tx@EcldDict begin /N@#2 GetNode /N@#3 GetNode ABVect /N@#2 GetNode /N@#1 GetNode ABVect end
   4 copy exch 4 -1 roll mul
   3 -2 roll mul add
@@ -1549,19 +1549,19 @@
   \fi
 }
 %
-\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}%   Thmoas Söll 20140512
+\def\psGetDistanceAB{\pst@object{psGetDistanceAB}}%   Thmoas S\"{o}ll 20140512
 \def\psGetDistanceAB@i(#1)(#2)#3{%
 \begingroup%
 \pst@killglue
 \use@par
 \pst@getcoor{#1}\pst@tempA
 \pst@getcoor{#2}\pst@tempB
-\pnode(! 
+\pnode(!
   15 dict begin
   /dec \psk@decimals\space def
   \psk@PSfont findfont \psk@fontscale scalefont setfont
   /laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
-  /Wert { 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
+  /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq {cvi 15 string cvs} {15 string cvs } ifelse
           \ifPst@comma dot2comma \fi show } def
   \pst@tempA \tx@UserCoor /y1 ED /x1 ED
   \pst@tempB \tx@UserCoor /y2 ED /x2 ED
@@ -1588,8 +1588,8 @@
 \define@key[psset]{pst-eucl}{WedgeOpacity}{\def\psk@WedgeOpacity{#1}}%
 \psset[pst-eucl]{ArcColor=black,WedgeColor=blue,WedgeOpacity=0.2,AngleValue=false,
                   AngleArc,ShowWedge,ArcLinestyle=solid,ArcLinewidth=0.8pt,WedgeFillstyle=solid}
- 
-\def\psGetAngleABC{\pst@object{psGetAngleABC}}%   Thmoas Söll 20151018
+
+\def\psGetAngleABC{\pst@object{psGetAngleABC}}%   Thmoas S\"{o}ll 20151018
 \def\psGetAngleABC@i(#1)(#2)(#3)#4{%
   \begingroup
   \use@par
@@ -1613,10 +1613,10 @@
   \fi
   \pnode(! %
     /dec \psk@decimals\space def
-    \psk@PSfont findfont \psk@fontscale scalefont setfont
+    \psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\pslinecolor 
     /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
     /laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
-    /WertZeigen {10 dec exp mul round 10 dec exp div dec 0 eq  {cvi 15 string cvs} {15 string cvs } ifelse
+    /WertZeigen { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq  {cvi 15 string cvs} {15 string cvs } ifelse
     \ifPst@comma dot2comma \fi show s1 (\string\260) show} def
     \pst@tempA \tx@UserCoor /y1 ED /x1 ED
     \pst@tempB \tx@UserCoor /y2 ED /x2 ED
@@ -1638,8 +1638,5 @@
 \catcode`\@=\PstAtCode\relax
 %
 \endinput
-%%
-%%
-%% END pst-eps.tex
 %% END: pst-euclide.tex
 %