summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-18 23:47:41 +0000
committerKarl Berry <karl@freefriends.org>2012-09-18 23:47:41 +0000
commit18bcd998ac1d2e58f992953b84366906ff3f86eb (patch)
tree4f22b1157bcbe1a28798b505c16f1a4b83637ca1 /Master
parent1437f86d9a9ab519f98066f49b87beb08c1881ea (diff)
pst-eucl (18sep12)
git-svn-id: svn://tug.org/texlive/trunk@27727 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/dvips/pst-eucl/pst-eucl.pro5
-rw-r--r--Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex64
-rw-r--r--Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty1
4 files changed, 53 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index fa347230f30..e4357bf0235 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -3,6 +3,7 @@ pst-eucl.pro --------
pst-eucl.tex --------
+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)
1.40 2011/11/16 - fix for \pstMarkAngle (hv)
diff --git a/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro b/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
index 64f01641148..0cf220ee4dc 100644
--- a/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
+++ b/Master/texmf-dist/dvips/pst-eucl/pst-eucl.pro
@@ -42,8 +42,9 @@
%% x1 y1 x2 y2 -> Dist
/ABDist { 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt } bind def
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% x1 y1 x2 y2 -> x1-x2 y1-y2
-/ABVect { 3 -1 roll exch sub 3 1 roll sub exch } bind def
+%% x1 y1 x2 y2 -> x2-x1 y2-y1
+%/ABVect { 3 -1 roll exch sub 3 1 roll sub exch } bind def
+/ABVect { 3 -1 roll sub 3 1 roll exch sub exch } bind def
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% x1 y1 x2 y2 x3 y3 x4 y4 -> x y
/InterLines {
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 f0b69417d0e..2824cbf2326 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -12,8 +12,8 @@
\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
\ifx\MultidoLoaded\endinput \else\input multido.tex \fi
-\def\fileversion{1.42}
-\def\filedate{2011/12/22}%
+\def\fileversion{1.43}
+\def\filedate{2012/09/18}%
%% 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.
@@ -143,6 +143,7 @@
\def\@polyline{polyline}
\def\@curve{curve}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\iffalse %%%%%%%%%% \pst@newnode is already defined in pst-node
%% CORRECTION OF BUG
\def\pst@newnode#1#2#3#4{%
% DG/SR modification begin - Nov. 9, 2000 - Patch 11
@@ -151,6 +152,11 @@
\leavevmode
\pst@getnode{#1}\pst@thenode
\pst@Verb{%
+ #3 \tx@UserCoor
+% startGlobal
+ /N-#1.y\space exch def
+ /N-#1.x\space exch def
+% endGlobal
\pst@nodedict
{#3}
\ifx\psk@name\relax false \else \psk@name true \fi
@@ -162,6 +168,8 @@ 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}
@@ -388,11 +396,16 @@ end}%
/N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
2 copy lt { exch 360 sub exch } if
add 2 div dup /psRawLabelPos ED
- \psk@LabelAngleOffset\space add dup /psAngle ED
+ \psk@LabelAngleOffset\space add
\psk@LabelSep\space exch PtoC%
){#5}%
\def\pst@tempA{Angleundef}%
- \rput[\psk@LabelRefPt]{! psAngle }%
+%% 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
+ /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
+ 2 copy lt \pslbrace exch 360 sub exch \psrbrace if
+ add 2 div \psk@LabelAngleOffset\space add }%
+ \rput[\psk@LabelRefPt]{!\pst@rot@angle}%
(! \psk@MarkAngleRadius\space psRawLabelPos PtoC )%
{\ifx\psk@mark\pst@tempA\csname\psk@Mark\endcsname\else\csname\psk@mark\endcsname\fi}%
}}}%
@@ -408,17 +421,25 @@ end}%
%\pst@killglue% <------------------------------------------------- hv - DR 050315
\bgroup\pst@killglue% <------------------------------------------- DR 050315
%%begin modif alaindelplanque 11/2003
- \pst@@getcoor{#1}\xdef\@@coordi{\pst@coor}%% <-------------------- hv
- \pst@@getcoor{#3}\xdef\@@coordiii{\pst@coor}%% <------------------ hv
- \pst@@getcoor{#5}\xdef\@@coordv{\pst@coor}%% <-------------------- hv
+ \pst@@getcoor{#1}\xdef\@@coordi{\pst@coor}%% A<------------------ hv
+ \pst@@getcoor{#3}\xdef\@@coordiii{\pst@coor}%% B<------------------ hv
+ \pst@@getcoor{#5}\xdef\@@coordv{\pst@coor}%% C<- ---------------- hv
+ \pstVerb{
+ \@@coordi\space\@@coordiii\space exch 4 1 roll \@@coordv\space exch 6 1 roll % x x x y y y
+ add add 3 div /YS exch def add add 3 div /XS exch def
+ }
%%end modif alaindelplanque 11/2003
%\bgroup\use@par% % Affectation of local parameters<---- DR 050315
\use@par% % Affectation of local parameters<---- DR 050315
%%begin modif alaindelplanque 11/2003
\bgroup\ifx\psk@PosAngleA\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordiii\space\@@coordi\space ABVect exch Atan dup
- \@@coordv\space\@@coordi\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \psset{PosAngleA={!
+ /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
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleA}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleA\@undef\else\psset{PosAngle=\psk@PosAngleA}\fi
@@ -427,9 +448,12 @@ end}%
\Pst@Geonode@i[](#1){#2}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
\bgroup\ifx\psk@PosAngleB\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordi\space\@@coordiii\space ABVect exch Atan dup
- \@@coordv\space\@@coordiii\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \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
+ \@@coordiii\space XS YS Pyth2 le { 180 add } if
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleB}\fi
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleB\@undef\else\psset{PosAngle=\psk@PosAngleB}\fi
@@ -438,9 +462,12 @@ end}%
\Pst@Geonode@i[](#3){#4}\egroup%%NEW DR 15112001
%%begin modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef
- \psset{PosAngle={!tx@EcldDict begin \@@coordiii\space\@@coordv\space ABVect exch Atan dup
- \@@coordi\space\@@coordv\space ABVect exch Atan exch sub dup abs 180 gt { dup
- dup abs div 360 mul sub } if 2 div add 180 add end}}%% <------ hv
+ \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
+ }}%% <------ hv
\else\psset{PosAngle=\psk@PosAngleC}\fi%% <----------------------- hv
%%end modif alaindelplanque 11/2003
\ifx\psk@PosAngleC\@undef\else\psset{PosAngle=\psk@PosAngleC}\fi
@@ -1468,6 +1495,11 @@ end}%
\psk@AngleCoef\space mul
\fi
}
+\catcode`\@=\PstAtCode\relax
+
+\endinput
+%%
+%% END pst-eps.tex
%% END: pst-euclide.tex
%%% Local Variables:
%%% mode: latex
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 68edede6983..c704e0b0494 100644
--- a/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
+++ b/Master/texmf-dist/tex/latex/pst-eucl/pst-eucl.sty
@@ -1,4 +1,5 @@
\RequirePackage{pstricks}
+\RequirePackage{pst-node}
\ProvidesPackage{pst-eucl}[2011/08/04 package wrapper for PSTricks pst-eucl.tex]
\DeclareOption{old}{\gdef\psteucl@old{}}% DR 10/05/2005
\ProcessOptions