summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-eucl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-01 22:16:10 +0000
committerKarl Berry <karl@freefriends.org>2018-09-01 22:16:10 +0000
commit78a6ecd28b5c518a367acbd281a87f04c353a477 (patch)
tree02e4262b617de77ec4d5552522c67683f8bb41a6 /Master/texmf-dist/tex/generic/pst-eucl
parent4a2f96d8d387cc9311743a067e2c4f80b1b55a78 (diff)
pst-eucl (1sep18)
git-svn-id: svn://tug.org/texlive/trunk@48533 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.tex65
1 files changed, 35 insertions, 30 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 850f4cf860f..50aed785dce 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.56}
-\def\filedate{2017/04/18}
+\def\fileversion{1.59}
+\def\filedate{2018/09/01}
%% 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.
@@ -34,10 +34,10 @@
% Definition of the parameters
% ----------------------------
% symbol used for the point
-\define@key[psset]{pst-eucl}{PointSymbol}[default]{\def\psk@PointSymbol{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolA}[undef]{\edef\psk@PointSymbolA{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolB}[undef]{\edef\psk@PointSymbolB{#1}}%
-\define@key[psset]{pst-eucl}{PointSymbolC}[undef]{\edef\psk@PointSymbolC{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbol}[*]{\def\psk@PointSymbol{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolA}[*]{\edef\psk@PointSymbolA{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolB}[*]{\edef\psk@PointSymbolB{#1}}%
+\define@key[psset]{pst-eucl}{PointSymbolC}[*]{\edef\psk@PointSymbolC{#1}}%
% name used for the point
\define@key[psset]{pst-eucl}{PointName}[default]{\def\psk@PointName{#1}}%
@@ -132,7 +132,7 @@
% --------------
\def\resetEUCLvalues{%
\psset[pst-eucl]{%
- PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
+ PointSymbol=*, PointSymbolA=*, PointSymbolB=*, PointSymbolC=*,
PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
PtNameMath=true, PointNameMathSize=\textstyle, PointNameSize=\normalsize,
PointNameSep=default, PosAngle=undef, PosAngleA=undef,
@@ -258,12 +258,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% #1 -> point coordinates
\def\Pst@geonodelabel#1{% % {nodename}
- \ifx\psk@PointSymbol\@none\else
- \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi
- \psdot[dotstyle=\psk@PointSymbol](#1)%
- \Pst@PutPointLabel{#1}%DR 041104
+ \ifx\psk@PointSymbol\@none
+ \else
+% \ifx\psk@PointSymbol\@default \def\psk@PointSymbol{*}\fi%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ \psdot[dotstyle=\psk@PointSymbol](#1)%
+ \Pst@PutPointLabel{#1}%DR 041104
\fi%DR 02092004
- \ifx\psk@PointName\@none\else\Pst@PutPointLabel{#1}\fi%DR 041104
+% \ifx\psk@PointName\@none\else\Pst@PutPointLabel{#1}\fi%DR 041104
}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\Pst@PutPointLabel#1{%DR 041104
@@ -371,7 +372,7 @@
\def\pstRightAngle{\pst@object{pstRightAngle}}
\def\pstRightAngle@i#1#2#3{%
\begingroup
-% \addbefore@par{linestyle=solid,linecolor=black,linewidth=\pslinewidth}
+ \addbefore@par{dotscale=1}%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){%
@@ -388,7 +389,7 @@
\else
\ifx\psk@RightAngleType\@german
\pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,LabelSep=\psk@RightAngleSize\space .5 mul]{#1}{#2}{#3}%
- {\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}%
+ {\psscalebox{\psk@RightAngleSize}{\pscircle*{!.08 \psk@xdotscale\space mul}}}%
\else
\ifx\psk@RightAngleType\@suisseromand
\rput{*0}%
@@ -422,7 +423,7 @@
2 copy lt { exch 360 sub exch } if
add 2 div dup /psRawLabelPos ED
\psk@LabelAngleOffset\space add
- \psk@LabelSep\space exch PtoC ){#5}%
+ \psk@LabelSep\space exch PtoC){#5}%
\def\pst@tempA{Angleundef}%
%% define \pst@rot@angle to make it compatible with xelatex for later use
\edef\pst@rot@angle{ tx@EcldDict begin % expand the #4 and #2
@@ -430,7 +431,7 @@
2 copy lt \pslbrace exch 360 sub exch \psrbrace if
add 2 div \psk@LabelAngleOffset\space add }%
\rput[\psk@LabelRefPt]{!\pst@rot@angle\space \ifx\psk@MarkAngle\@undef 0 \else\psk@MarkAngle\space\fi add }%
- (! \psk@MarkAngleRadius\space psRawLabelPos PtoC )%
+ (! \psk@MarkAngleRadius\space psRawLabelPos PtoC)%
{\ifx\psk@mark\pst@tempA\csname\psk@Mark\endcsname\else\csname\psk@mark\endcsname\fi}%
}}}
%
@@ -467,7 +468,7 @@
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
+ \let\psk@PointSymbol=\psk@PointSymbolA
\ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
\Pst@Geonode@i[](#1){#2}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
@@ -481,7 +482,7 @@
\else\psset{PosAngle=\psk@PosAngleB}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\PointSymbol=\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\Pst@Geonode@i[](#3){#4}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
@@ -495,7 +496,7 @@
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef\else\psset{PosAngle=\psk@PosAngleC}\fi
- \ifx\psk@PointSymbolC\@undef\else\psset{PointSymbol=\psk@PointSymbolC}\fi
+ \let\PointSymbol=\psk@PointSymbolC
\ifx\psk@PointNameC\@undef\else\psset{PointName=\psk@PointNameC}\fi
\Pst@Geonode@i[](#5){#6}%%NEW DR 15112001
\pst@TraceTriangle{#2}{#4}{#6}%
@@ -1020,14 +1021,14 @@
Glbx \pst@number\psxunit div Glby \pst@number\psyunit div
end){\pnode{#6}}
}%
- \bgroup
- \ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
- \ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
+ \begingroup
+ \ifx\psk@PosAngleA\@undef \else\psset{PosAngle=\psk@PosAngleA}\fi
+ \let\psk@PointSymbol\psk@PointSymbolA
+ \ifx\psk@PointNameA\@undef \else\psset{PointName=\psk@PointNameA}\fi
\Pst@geonodelabel{#5}
- \egroup
+ \endgroup
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\psk@PointSymbol\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\Pst@geonodelabel{#6}%
\endgroup
@@ -1089,7 +1090,7 @@
% \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
% \ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PosAngleA\@none\else\psset{PosAngle=\psk@PosAngleA}\fi\fi
- \ifx\psk@PointSymbolA\@undef\else\ifx\psk@PointSymbolA\@none\else\psset{PointSymbol=\psk@PointSymbolA}\fi\fi
+ \ifx\psk@PointSymbolA\@none\else\let\PointSymbol=\psk@PointSymbolA\fi
\ifx\psk@PointNameA\@undef\else\ifx\psk@PointNameA\@none\else\psset{PointName=\psk@PointNameA}\fi\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PointSymbolA\@none\else\Pst@geonodelabel{#6}\fi\fi
\egroup
@@ -1098,7 +1099,7 @@
% \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
% \ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\ifx\psk@PosAngleA\@undef\else\ifx\psk@PosAngleB\@none\else\psset{PosAngle=\psk@PosAngleB}\fi\fi
- \ifx\psk@PointSymbolB\@undef\else\ifx\psk@PointSymbolB\@none\else\psset{PointSymbol=\psk@PointSymbolB}\fi\fi
+ \ifx\psk@PointSymbolB\@none\else\let\PointSymbol=\psk@PointSymbolB\fi
\ifx\psk@PointNameB\@undef\else\ifx\psk@PointNameB\@none\else\psset{PointName=\psk@PointNameB}\fi\fi
\ifx\psk@PosAngleB\@undef\else\ifx\psk@PointSymbolB\@none\else\Pst@geonodelabel{#7}\fi\fi
\egroup
@@ -1384,13 +1385,13 @@
\def\Pst@MediatorAB[#1]#2#3#4#5{%
\bgroup\psset{#1}% % Affectation of local parameters
\bgroup
- \ifx\psk@PointSymbolA\@undef\else\psset{PointSymbol=\psk@PointSymbolA}\fi
+ \let\PointSymbol=\psk@PointSymbolA
\ifx\psk@PointNameA\@undef\else\psset{PointName=\psk@PointNameA}\fi
%\Pst@HomO[HomCoef=.5]{#2}{#3}{#4}
\Pst@MiddleAB[]{#2}{#3}{#4}
\egroup
\bgroup
- \ifx\psk@PointSymbolB\@undef\else\psset{PointSymbol=\psk@PointSymbolB}\fi
+ \let\PointSymbol=\psk@PointSymbolB
\ifx\psk@PointNameB\@undef\else\psset{PointName=\psk@PointNameB}\fi
\expandafter\ifx\csname psteucl@old\endcsname\relax%
\Pst@Rotation[RotAngle=90, CodeFig=false]{#4}{#3}[#5]%%%DR 26032005
@@ -1614,7 +1615,11 @@
\pnode(! %
/dec \psk@decimals\space def
\psk@PSfont findfont \psk@fontscale scalefont setfont \pst@usecolor\pslinecolor
- /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
+ \ifpst@psfonts
+ /s1 { /Symbol findfont \psk@fontscale\space scalefont setfont } bind def
+ \else
+ /s1 { /StandardSymL findfont \psk@fontscale\space scalefont setfont } bind def
+ \fi
/laenge {10 dec exp mul round 10 dec exp div 15 string cvs stringwidth } def
/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