summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-eucl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-20 21:19:10 +0000
committerKarl Berry <karl@freefriends.org>2015-10-20 21:19:10 +0000
commit636fa00b61a9442fe17d46fcd57eb6a9a1b140bf (patch)
tree6032792c2215b1ed27da2ca435632e2b0c656b9c /Master/texmf-dist/tex/generic/pst-eucl
parentcd07c2dbce7225ae6f1efa27430cbbbe74793b4b (diff)
pst-eucl (20oct15)
git-svn-id: svn://tug.org/texlive/trunk@38678 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-eucl')
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex54
1 files changed, 18 insertions, 36 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 e93085ddcb5..eb821695a8c 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.51}
-\def\filedate{2014/05/17}
+\def\fileversion{1.52}
+\def\filedate{2015/10/19}
%% 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.
@@ -129,7 +129,7 @@
%% Default values
% --------------
\def\resetEUCLvalues{%
-\psset{%
+\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,
@@ -156,28 +156,6 @@
\def\@none{none}
\def\tx@PtoC{ tx@Dict begin PtoC end }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\iffalse %%%%%%%%%% \pst@newnode is already defined in pst-node
-\def\pst@newnode#1#2#3#4{%
-% DG/SR modification begin - Nov. 9, 2000 - Patch 11
- \pst@killglue
-% DG/SR modification end
-\leavevmode
-\pst@getnode{#1}\pst@thenode
-\pst@Verb{%
-\pst@nodedict
-{#3}
-\ifx\psk@name\relax false \else \psk@name true \fi
-\pst@thenode
-#2
-{#4}
-\tx@NewNode
-end}%
-\global\let\psk@name\relax
-\pstree@nodehook
-\global\let\pstree@nodehook\relax}
-\fi
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% list for marking segment
\def\SegSymLst{MarkHash,MarkHashh,MarkHashhh,MarkCros,MarkCross,pstslash,pstslashh,pstslashhh,circ,times,cup,triangle,wedge}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -377,7 +355,7 @@ end}%
\def\pstRightAngle{\pst@object{pstRightAngle}}
\def\pstRightAngle@i#1#2#3{%
\begingroup
- \addbefore@par{linestyle=solid,linecolor=black,linewidth=\pslinewidth}
+% \addbefore@par{linestyle=solid,linecolor=black,linewidth=\pslinewidth}
\use@par% % Affectation of local parameters
%% not good at all, but \rput{0}(#3){\rput{(#2)}{stuff}} doesn't work...
\rput(#2){%
@@ -1538,7 +1516,10 @@ end}%
\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{%
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
@@ -1580,12 +1561,15 @@ end}%
\define@boolkey[psset]{pst-eucl}[Pst@]{AngleArc}[true]{}
\define@boolkey[psset]{pst-eucl}[Pst@]{ShowWedge}[true]{}
\define@key[psset]{pst-eucl}{ArcColor}{\def\psk@ArcColor{#1}}%
+\define@key[psset]{pst-eucl}{ArcLinestyle}{\def\psk@ArcLinestyle{#1}}%
+\define@key[psset]{pst-eucl}{ArcLinewidth}{\def\psk@ArcLinewidth{#1}}%
\define@key[psset]{pst-eucl}{WedgeColor}{\def\psk@WedgeColor{#1}}%
+\define@key[psset]{pst-eucl}{WedgeFillstyle}{\def\psk@WedgeFillstyle{#1}}%
\define@key[psset]{pst-eucl}{WedgeOpacity}{\def\psk@WedgeOpacity{#1}}%
\psset[pst-eucl]{ArcColor=black,WedgeColor=blue,WedgeOpacity=0.2,AngleValue=false,
- AngleArc,ShowWedge}
-
-\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas Söll 20140512
+ AngleArc,ShowWedge,ArcLinestyle=solid,ArcLinewidth=0.8pt,WedgeFillstyle=solid}
+
+\def\psGetAngleABC{\pst@object{psGetAngleABC}}% Thmoas Söll 20151018
\def\psGetAngleABC@i(#1)(#2)(#3)#4{%
\begingroup
\use@par
@@ -1602,10 +1586,10 @@ end}%
delta1 delta2 le {180 delta2 delta1 add 2 div neg add /WiM ED} {delta2 delta1 add 2 div neg /WiM ED} ifelse
}
\ifPst@ShowWedge
- \pswedge[fillstyle=solid,fillcolor=\psk@WedgeColor,opacity=\psk@WedgeOpacity](#2){\psk@MarkAngleRadius}{! delta1}{! delta2}%
+ \pswedge[fillstyle=\psk@WedgeFillstyle,fillcolor=\psk@WedgeColor,opacity=\psk@WedgeOpacity](#2){\psk@MarkAngleRadius}{! delta1}{! delta2}%
\fi
\ifPst@AngleArc
- \psarc[linecolor=\psk@ArcColor](#2){\psk@MarkAngleRadius}{! delta1}{! delta2}%
+ \psarc[linestyle=\psk@ArcLinestyle,linewidth=\psk@ArcLinewidth,linecolor=\psk@ArcColor](#2){\psk@MarkAngleRadius}{! delta1}{! delta2}%
\fi
\pnode(! %
/dec \psk@decimals\space def
@@ -1635,9 +1619,7 @@ end}%
%
\endinput
%%
+%%
%% END pst-eps.tex
%% END: pst-euclide.tex
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: t
-%%% End:
+%