summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-20 20:45:09 +0000
committerKarl Berry <karl@freefriends.org>2019-08-20 20:45:09 +0000
commitbb7f51d3878611aaf85b982bc2a525e355019a07 (patch)
treeb81f6d7a44d54c5af25110e801a4ad4b4babba0a /Master
parentcbb5e2fbb4d58170c4b508755e2b104192a48966 (diff)
pst-eucl (20aug19)
git-svn-id: svn://tug.org/texlive/trunk@51916 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdfbin537356 -> 543319 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex21
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex41
4 files changed, 48 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index 683ab12ca22..70509f1f1b4 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -5,6 +5,7 @@ pst-eucl.pro --------
pst-eucl.tex --------
+1.65 2019/08/19 - new type for angle
1.64 2019/01/31 - fix for PointName and pstInterCC
1.63 2019/01/27 - fix for PointSymbol=none for pstTriangle
1.62 2019/01/13 - added fillstyle for angles
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 1fc58ebfb1f..f1a31520f17 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
Binary files differ
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 de4e52980e0..e81b7cf8d52 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
@@ -379,7 +379,8 @@ For other angles, there is the command:
\begin{sloppypar}
-Valid optional arguments are \Lkeyword{MarkAngleRadius}, \Lkeyword{LabelAngleOffset}, and
+Valid optional arguments are \Lkeyword{MarkAngleRadius}, \Lkeyword{LabelAngleOffset},
+ \Lkeyword{MarkAngleType} and
\Lkeyword{Mark}
%
The \Lkeyword{label} can be any valid \TeX\ box, it is put at \Lkeyword{LabelSep}
@@ -430,7 +431,23 @@ the angle by specifying a \TeX{} command as argument of parameter \Lkeyword{Mark
\end{pspicture}
\end{LTXexample}
-
+\begin{LTXexample}[width=\linewidth,pos=t]
+\begin{pspicture}[showgrid=false](-1.0,-1.0)(4,4)
+\pstGeonode[PosAngle=-90](0.0,0.0){A}
+\pstGeonode[PosAngle=-90](3.0,0.0){B}
+\pstGeonode[PosAngle=90](1.8,2.5){C}
+\pstGeonode[PosAngle=-90](1.5,0.0){D}
+\pstMarkAngle[LabelSep=.6,MarkAngleRadius=.4,MarkAngleType=double]{A}{C}{B}{$\gamma$}
+\pstMarkAngle[LabelSep=.6,MarkAngleRadius=.4,MarkAngleType=default]{C}{B}{A}{$\beta$}
+\pstMarkAngle[LabelSep=.6,MarkAngleRadius=.4,MarkAngleType=double,fillcolor=red!30,fillstyle=solid]{B}{A}{C}{$\alpha$}
+\pstMarkAngle[LabelSep=.6,MarkAngleRadius=.4,MarkAngleType=triple,fillcolor=red!30,fillstyle=solid]{B}{D}{C}{$\theta$}
+\pstMarkAngle[LabelSep=.6,MarkAngleRadius=.4,MarkAngleType=triple]{C}{D}{A}{$\zeta$}
+\pstLineAB{A}{B}
+\pstLineAB{B}{C}
+\pstLineAB{C}{A}
+\pstLineAB{C}{D}
+\end{pspicture}
+\end{LTXexample}
\subsection{Lines, half-lines and segments}
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 1baee9894d9..df8d75a0093 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -19,8 +19,8 @@
\csname PSTEuclideLoaded\endcsname
\let\PSTEuclideLoaded\endinput
%
-\def\fileversion{1.64}
-\def\filedate{2019/01/31}
+\def\fileversion{1.65}
+\def\filedate{2019/08/19}
%%
\message{`PST-Euclide v\fileversion, \filedate\space (dr,hv)}%
%% prologue for postcript
@@ -86,22 +86,23 @@
\define@key[psset]{pst-eucl}{PosAngleB}[undef]{\def\psk@PosAngleB{#1}}%
\define@key[psset]{pst-eucl}{PosAngleC}[undef]{\def\psk@PosAngleC{#1}}%
% dimension of the right angle mark
-\define@key[psset]{pst-eucl}{RightAngleSize}[4]{\edef\psk@RightAngleSize{#1}}%
-\define@key[psset]{pst-eucl}{RightAngleType}[default]{\edef\psk@RightAngleType{#1}}%
+\define@key[psset]{pst-eucl}{RightAngleSize}[4]{\def\psk@RightAngleSize{#1}}%
+\define@key[psset]{pst-eucl}{RightAngleType}[default]{\def\psk@RightAngleType{#1}}%
% radius of an angle mark
-\define@key[psset]{pst-eucl}{MarkAngleRadius}[0.4]{\edef\psk@MarkAngleRadius{#1}}%
+\define@key[psset]{pst-eucl}{MarkAngleRadius}[0.4]{\def\psk@MarkAngleRadius{#1}}%
+\define@key[psset]{pst-eucl}{MarkAngleType}[default]{\def\psk@MarkAngleType{#1}}%
% angular offset position of the label for marking an angle
-\define@key[psset]{pst-eucl}{LabelAngleOffset}[0]{\edef\psk@LabelAngleOffset{#1}}%
+\define@key[psset]{pst-eucl}{LabelAngleOffset}[0]{\def\psk@LabelAngleOffset{#1}}%
% position radius of the label for marking an angle
-\define@key[psset]{pst-eucl}{LabelSep}[1]{\edef\psk@LabelSep{#1}}%
+\define@key[psset]{pst-eucl}{LabelSep}[1]{\def\psk@LabelSep{#1}}%
% ref point of the label
-\define@key[psset]{pst-eucl}{LabelRefPt}[c]{\edef\psk@LabelRefPt{#1}}%
+\define@key[psset]{pst-eucl}{LabelRefPt}[c]{\def\psk@LabelRefPt{#1}}%
% curve type for point list
-\define@key[psset]{pst-eucl}{CurveType}[none]{\edef\psk@CurveType{#1}}%
+\define@key[psset]{pst-eucl}{CurveType}[none]{\def\psk@CurveType{#1}}%
% coefficient of homothetie
-\define@key[psset]{pst-eucl}{HomCoef}[0.5]{\edef\psk@HomCoef{#1}}%
+\define@key[psset]{pst-eucl}{HomCoef}[0.5]{\def\psk@HomCoef{#1}}%
% angle of rotation
-\define@key[psset]{pst-eucl}{RotAngle}[60]{\edef\psk@RotAngle{#1}}%
+\define@key[psset]{pst-eucl}{RotAngle}[60]{\def\psk@RotAngle{#1}}%
% label for coding the transfortion
\define@key[psset]{pst-eucl}{TransformLabel}[none]{\edef\psk@TransformLabel{#1}}%
% private parameter
@@ -155,7 +156,8 @@
PosAngleB=undef, PosAngleC=undef, Mark=undef, mark=undef,SegmentSymbol=MarkHashh,
SegmentSymbolA=MarkHashh, SegmentSymbolB=MarkHash, SegmentSymbolC=MarkHashhh,
RightAngleSize=.4, RightAngleType=default, LabelAngleOffset=0, LabelSep=1,
- LabelRefPt=c, MarkAngle=undef, MarkAngleRadius=.4, HomCoef=.5, RotAngle=60,
+ LabelRefPt=c, MarkAngle=undef, MarkAngleType=default, MarkAngleRadius=.4,
+ HomCoef=.5, RotAngle=60,
CurveType=none, TransformLabel=none, Central@Sym=false, DrawCirABC=true,
CodeFig=false, CodeFigColor=cyan, CodeFigStyle=dashed, CodeFigA=undef,
CodeFigB=undef, CodeFigAarc=true, CodeFigBarc=true, Radius=none, RadiusA=undef,
@@ -169,6 +171,8 @@
\def\@default{default}%
\def\@german{german}%
\def\@suisseromand{suisseromand}%
+\def\@double{double}%
+\def\@triple{triple}%
\def\@polygon{polygon}
\def\@polyline{polyline}
\def\@curve{curve}
@@ -458,7 +462,18 @@
\psline(0,0)
}
\fi
- \psarc[fillstyle=none](0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
+ \ifx\psk@MarkAngleType\@default
+ \psarc[fillstyle=none](0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
+ \else
+ \ifx\psk@MarkAngleType\@double
+ \psarc[fillstyle=none](0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
+ \psarc[fillstyle=none](0,0){! \psk@MarkAngleRadius\space 0.85 mul}{(#2)}{(#4)}%
+ \else
+ \ifx\psk@MarkAngleType\@triple
+ \psarc[fillstyle=none](0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
+ \psarc[fillstyle=none](0,0){! \psk@MarkAngleRadius\space 0.85 mul}{(#2)}{(#4)}%
+ \psarc[fillstyle=none](0,0){! \psk@MarkAngleRadius\space 0.70 mul}{(#2)}{(#4)}%
+ \fi\fi\fi
\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