summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-01-02 22:55:57 +0000
committerKarl Berry <karl@freefriends.org>2013-01-02 22:55:57 +0000
commit77180107ed1f272af1f1e2f03469f7dbd996b602 (patch)
treef98752c2b805c7d8d2f07f8bc5d6806663f2a586
parent820117064d5ae6292fd17b27855a18eee75e2487 (diff)
pst-eucl (2jan13)
git-svn-id: svn://tug.org/texlive/trunk@28696 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-eucl/Changes3
-rw-r--r--Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro2
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex47
3 files changed, 28 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index f59cf7de94d..409727c7bf0 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -4,6 +4,9 @@ pst-eucl.pro --------
pst-eucl.tex --------
+1.45 2012/12/31 - fixed introduced bug with PtoC (hv)
+ moved loading of pst-xkey to the beginning
+1.44 2012/09/28 - allow filling of angles (hv)
1.43 2012/08/22 - delete the node macro from pst-node (hv)
1.42 2011/12/22 - modified code for marks (hv)
1.41 2011/11/19 - added different marks for angles (hv)
diff --git a/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro b/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
index 0641b4a2383..d45dfca68a9 100644
--- a/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
+++ b/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
@@ -65,7 +65,7 @@
ABVect /Vy exch def /Vx exch def
%% Dc==0 then O belong to the line
%% First project O on the line -> M (-ca;-cb)
- %% l'abscisse de M sur (OM) divisée par R donne le cosinus
+ %% l'abscisse de M sur (OM) divisee par R donne le cosinus
%Dc neg dup Db mul exch Da mul 2 copy 0 0
%ABDist dup CR gt { pop pop pop 0 0 0 0 }
%{ ZeroEq { pop pop Db Da } if Atan /alpha exch def
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 b9ea64bf746..91ab9a0e6b0 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -11,9 +11,12 @@
% Require PSTricks and pst-node packages
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
\ifx\MultidoLoaded\endinput \else\input multido.tex \fi
-\def\fileversion{1.43}
-\def\filedate{2012/09/18}%
+\csname PSTEuclideLoaded\endcsname
+\let\PSTEuclideLoaded\endinput
+\def\fileversion{1.45}
+\def\filedate{2012/12/31}%
%% 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.
@@ -21,15 +24,11 @@
\message{ This version uses the pst-xkey package for managing parameters}%
\message{ Please read the doc, some macros have a new syntax}%
\message{ use option old for upward compatibility}%
-\csname PSTEuclideLoaded\endcsname
-\let\PSTEuclideLoaded\endinput
%% prologue for postcript
\pstheader{pst-eucl.pro}%
-% interface to the `xkeyval' package
-\input pst-xkey.tex
-\pst@addfams{pst-eucl}
\edef\PstAtCode{\the\catcode`\@}%
\catcode`\@=11\relax
+\pst@addfams{pst-eucl}
% Definition of the parameters
% ----------------------------
% symbol used for the point
@@ -142,6 +141,7 @@
\def\@polygon{polygon}
\def\@polyline{polyline}
\def\@curve{curve}
+\def\tx@PtoC{ tx@Dict begin PtoC end }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\iffalse %%%%%%%%%% \pst@newnode is already defined in pst-node
\def\pst@newnode#1#2#3#4{%
@@ -349,26 +349,26 @@ end}%
\rput(#3){%
\ifx\psk@RightAngleType\@default
\pspolygon(0,0)%%modif 12/2004
- (!tx@EcldDict begin /N@#4 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
- (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end)
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan
2 copy sub abs 91 gt
{ 2 copy lt { exch 360 add exch } { 360 add } ifelse } if %%DR 2005/01/14
%%2 copy lt { exch 360 sub exch } if
- add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC)
- (!tx@EcldDict begin /N@#2 GetNode exch Atan end \psk@RightAngleSize\space
- exch PtoC)
+ add 2 div 2 sqrt \psk@RightAngleSize\space mul exch PtoC end)
+ (!tx@EcldDict begin /N@#2 GetNode exch Atan \psk@RightAngleSize\space
+ exch PtoC end)
\else\ifx\psk@RightAngleType\@german
\pstMarkAngle[MarkAngleRadius=\psk@RightAngleSize,
LabelSep=\psk@RightAngleSize\space .5 mul]{#2}{#3}{#4}
{\psscalebox{\psk@RightAngleSize}{\pscircle*{.08}}}
\else\ifx\psk@RightAngleType\@suisseromand
\rput{*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 .45 \psk@RightAngleSize\space mul exch PtoC)
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 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)
- (!tx@EcldDict begin /N@#4 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
- (!tx@EcldDict begin /N@#2 GetNode exch Atan end \psk@RightAngleSize\space exch PtoC)
+ (!tx@EcldDict begin /N@#4 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )
+ (!tx@EcldDict begin /N@#2 GetNode exch Atan \psk@RightAngleSize\space exch PtoC end )
\fi\fi\fi}
\egroup%
}%
@@ -431,8 +431,8 @@ end}%
/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
- 1 exch 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
+ 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
}}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
@@ -445,7 +445,7 @@ end}%
\psset{PosAngleB={!
/AngleBC \@@coordiii\space\@@coordv\space tx@EcldDict begin ABVect end exch Atan def
/AngleBA \@@coordiii\space\@@coordi\space tx@EcldDict begin ABVect end exch Atan def
- AngleBA AngleBC add 2 div dup 1 exch PtoC exch \@@coordiii\space 4 1 roll add 3 1 roll add XS YS Pyth2
+ AngleBA AngleBC add 2 div dup 1 exch \tx@PtoC exch \@@coordiii\space 4 1 roll add 3 1 roll add XS YS Pyth2
\@@coordiii\space XS YS Pyth2 le { 180 add } if
}}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleB}\fi
@@ -459,8 +459,8 @@ end}%
\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 AngleCA add 2 div dup 1 exch PtoC exch \@@coordv\space 4 1 roll add 3 1 roll add XS YS Pyth2
- \@@coordv\space XS YS Pyth2 le { 180 add } if
+ 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
}}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
@@ -554,16 +554,17 @@ end}%
\ifcase \psarc@type add \or sub \fi def
/angleB
%OLD%%tx@EcldDict begin /N@#2 GetNode end
- tx@EcldDict begin /N@#3 GetNode /N@#1 GetNode ABVect end
+ tx@EcldDict begin /N@#3 GetNode /N@#1 GetNode ABVect
exch Atan \psk@arcsepB c mul 2 div
\ifcase \psarc@type sub \or add \fi def
%ifshowpoints\psarc@showpoints\fi
\ifx\psk@arrowA\@empty
- \ifnum\psk@liftpen=2 r angleA \tx@PtoC
+ \ifnum\psk@liftpen=2 r angleA PtoC
y add exch x add exch
moveto
\fi
\fi%
+ end
}%% end \pstArcOAB@iv
\def\pstArcOAB@v{%
x y r angleA