pst-eucl (29jan20)

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

6 files changed, 34 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index 31cbe6c090a..671f6701218 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -6,6 +6,8 @@ pst-eucl.pro --------
 
 
 pst-eucl.tex --------
+1.70  2020/01/29 - add optional argument RightAngleDotDistance to controll the the dot
+                   position for right angles (type german or swissromand)
 1.69  2020/01/09 - add macro to get the chord with specified length, \pstCircleChordNode.
                  - add macro to draw the center of the triangle's escribed circle, \pstTriangleEC.
                  - add macro to draw the orthocenter of triangle, \pstTriangleHC.
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
index 19eaf8f2ab5..9fc9a97eaf5 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.bib
@@ -55,7 +55,7 @@ version = {1.42}
   edition	= {7},
   publisher	= {DANTE -- Lehmanns},
   year		= {2016},
-  address	= {Heidelberg/Hamburg}
+  address	= {Heidelberg and Hamburg}
 }
 
 @Book{PSTricksE,
@@ -82,7 +82,7 @@ version = {1.42}
   edition	= {1},
   publisher	= {DANTE -- Lehmanns Media},
   year		= {2012},
-  address	= {Heidelberg/Berlin}
+  address	= {Heidelberg and Berlin}
 }
 
 
@@ -90,9 +90,9 @@ version = {1.42}
   author	= {Victor Eijkhout},
   title		= {\TeX\ by Topic -- {A} \TeX{}nician Reference},
   edition	= {1},
-  publisher	= {DANTE -- lehmanns media},
+  publisher	= {DANTE -- Lehmanns media},
   year		= {2014},
-  address	= {Heidelberg/Berlin}
+  address	= {Heidelberg and Berlin}
 }
 
 
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
index 5a40bbc7af1..65737c9ba15 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
index f719f56f39b..6100efcb86c 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
@@ -370,6 +370,8 @@ to display it.
 \end{pspicture}
 \end{LTXexample}
 
+%$
+
 \subsection{Triangles}
 
 The more classical figure, it has its own macro \Lcs{pstTriangle} for a quick definition:
@@ -413,6 +415,8 @@ or angles.
 \Lcs{pstTriangleASA}\OptArgs\Largr{pos}\Largb{A}\Largr{$\angle{A}$,c,$\angle{B}$}\Largb{B}\Largb{C}
 \end{BDef}
 
+%$
+
 - Macro \Lcs{pstTriangleSSS} create a triangle $ABC$ with given $A(x_1,y_1)$, and the three sides $a,b,c$,
 it output $B(x_2,y_2)$ and $C(x_3,y_3)$.\\
 - Macro \Lcs{pstTriangleSAS} create a triangle $ABC$ with given $A(x_1,y_1)$, the angle of $\angle{A}$, and the other two sides $b,c$,
@@ -527,12 +531,12 @@ right angle:
 
 
 \begin{sloppypar}
-Valid optional arguments are \Lkeyword{RightAngleType}, \Lkeyword{RightAngleSize}, and
-        \Lkeyword{RightAngleSize}
+Valid optional arguments are \Lkeyword{RightAngleType}, \Lkeyword{RightAngleSize}, 
+        \Lkeyword{RightAngleSize}, and \Lkeyword{RightAngleDotDistance}
 \end{sloppypar}
 
-The symbol used is controlled by the parameter \Lkeyword{RightAngleType}
-\nxLkeyval{default}. Its possible values are :
+The symbol is controlled by the parameter \Lkeyword{RightAngleType}
+\nxLkeyval{default}. Its possible values are:
 
 \begin{compactitem}
 \item \Lkeyval{*} : standard symbol ;
@@ -540,9 +544,16 @@ The symbol used is controlled by the parameter \Lkeyword{RightAngleType}
 \item \Lkeyval{suisseromand} : swiss romand symbol (given P. Schnewlin).
 \end{compactitem}
 
-The only parameter controlling this command, excepting the ones which
+The only parameters controlling this command, excepting the ones which
 controlled the line, is \Lkeyword{RightAngleSize} which defines the size
-of the symbol \DefaultVal{0.28 unit}.
+of the symbol \DefaultVal{0.28 unit} and \Lkeyword{RightAngleDotDistance}. For a 
+right angle style \Lkeyval{german} or \Lkeyval{swissromand} the distance of the dot
+is preset to 0.5 (\Lkeyval{german}) or 0.45 (\Lkeyval{swissromand}), relative to the radius.
+It can be controlled by the optional argument \Lkeyword{RightAngleDotDistance} which is
+preset to 1. A greater value moves the dot away from the reference point.
+
+
+
 
 For other angles, there is the command:
 
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 6cc2f9b54e9..68dbf939fb5 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -1,13 +1,13 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% pst-eucl.tex --- Generation of geometric figures in euclidean geometry
 %% Copyright 2000-2013 Dominique RODRIGUEZ
-%% Copyright 2014-     Dominique RODRIGUEZ, Herbert Voß
+%% Copyright 2014-...  Dominique RODRIGUEZ, Herbert Voß
 %%
 %% 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.
 %%
-%% Author          : Dominique RODRIGUEZ (EN) <dominique.rodriguez@waika9.com>
+%% Authors         : Dominique RODRIGUEZ (EN) <dominique.rodriguez@waika9.com>
 %%                 : hv hvoss@tug.org
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Require PSTricks and pst-node packages
@@ -20,8 +20,8 @@
 \csname PSTEuclideLoaded\endcsname
 \let\PSTEuclideLoaded\endinput
 %
-\def\fileversion{1.69}
-\def\filedate{2020/01/09}
+\def\fileversion{1.70}
+\def\filedate{2020/01/29}
 %%
 \message{`PST-Euclide v\fileversion, \filedate\space (dr,hv)}%
 %% prologue for postcript
@@ -73,7 +73,7 @@
 \iffalse
 \define@key[psset]{pst-eucl}{PosAngle}{\expandafter\psk@@Pos@Angle#1,,!}%
 \def\psk@@Pos@Angle#1,#2,#3#4#5!{%
-  \typeout{1: #1; 2: #2; 3: #3; 4: #4; 5: #5}%
+%  \typeout{1: #1; 2: #2; 3: #3; 4: #4; 5: #5}%
   \def\psk@PosAngle{#1}%
   \def\@temp{#1}%
   \ifx\@temp\@undef \typeout{Nichts machen}\else\typeout{Winkel setzen}%
@@ -89,6 +89,7 @@
 % dimension of the right angle mark
 \define@key[psset]{pst-eucl}{RightAngleSize}[4]{\def\psk@RightAngleSize{#1}}%
 \define@key[psset]{pst-eucl}{RightAngleType}[default]{\def\psk@RightAngleType{#1}}%
+\define@key[psset]{pst-eucl}{RightAngleDotDistance}[1]{\def\psk@RightAngleDotDistance{#1 }}%
 % radius of an angle mark
 \define@key[psset]{pst-eucl}{MarkAngleRadius}[0.4]{\def\psk@MarkAngleRadius{#1}}%
 \define@key[psset]{pst-eucl}{MarkAngleType}[default]{\def\psk@MarkAngleType{#1}}%
@@ -156,7 +157,8 @@
   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,
+  RightAngleSize=.4, RightAngleType=default, RightAngleDotDistance=1,
+  LabelAngleOffset=0, LabelSep=1,
   LabelRefPt=c, MarkAngle=undef, MarkAngleType=default, MarkAngleRadius=.4,
   HomCoef=.5, RotAngle=60,
   CurveType=none, TransformLabel=none, Central@Sym=false, DrawCirABC=true,
@@ -465,13 +467,13 @@
 %            \psline(0,0)
 %          }
 %        \fi
-        \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
+        \pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul \psk@RightAngleDotDistance mul]{#1}{#2}{#3}%
            {\psscalebox{\psk@RightAngleSize}{\pscircle*{!.08 \psk@xdotscale\space mul}}}%
       \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)%
+              2 copy lt { exch 360 sub exch } if add 2 div .45 \psk@RightAngleSize\space mul \psk@RightAngleDotDistance mul exch PtoC end)%
               {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
             \psline(0,0)%
               (!tx@EcldDict begin /N@#3 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )%
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 3d58b855d0c..0d6347c3d29 100644
--- a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
+++ b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
@@ -10,6 +10,6 @@
   [\filedate\space v\fileversion\space `PST-eucl' (dr,hv)]
 \IfFileExists{pst-eucl.pro}{%
   \ProvidesFile{pst-eucl.pro}
-    [2020/01/09 v. 1.02,  PostScript prologue file (hv)]
+    [2020/01/29 v. 1.03,  PostScript prologue file (hv)]
     \@addtofilelist{pst-eucl.pro}}{}%
 \endinput