pst-eucl (23dec11)

git-svn-id: svn://tug.org/texlive/trunk@24926 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 49 insertions, 52 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 29347a0116c..f0b69417d0e 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.40}
-\def\filedate{2011/11/16}%
+\def\fileversion{1.42}
+\def\filedate{2011/12/22}%
 %% 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.
@@ -38,10 +38,10 @@
 \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}{\edef\psk@PointName{#1}}%
-\define@key[psset]{pst-eucl}{PointNameA}{\edef\psk@PointNameA{#1}}%
-\define@key[psset]{pst-eucl}{PointNameB}{\edef\psk@PointNameB{#1}}%
-\define@key[psset]{pst-eucl}{PointNameC}{\edef\psk@PointNameC{#1}}%
+\define@key[psset]{pst-eucl}{PointName}{\def\psk@PointName{#1}}%
+\define@key[psset]{pst-eucl}{PointNameA}{\def\psk@PointNameA{#1}}%
+\define@key[psset]{pst-eucl}{PointNameB}{\def\psk@PointNameB{#1}}%
+\define@key[psset]{pst-eucl}{PointNameC}{\def\psk@PointNameC{#1}}%
 % use math mode in point name
 \newif\ifPst@PtNameMath%
 \define@key[psset]{pst-eucl}{PtNameMath}[false]{\@nameuse{Pst@PtNameMath#1}}%
@@ -50,8 +50,9 @@
 \define@key[psset]{pst-eucl}{SegmentSymbolA}{\edef\psk@SegmentSymbolA{#1}}%
 \define@key[psset]{pst-eucl}{SegmentSymbolB}{\edef\psk@SegmentSymbolB{#1}}%
 \define@key[psset]{pst-eucl}{SegmentSymbolC}{\edef\psk@SegmentSymbolC{#1}}%
-\define@key[psset]{pst-eucl}{Mark}{\edef\psk@Mark{#1}}%
-\define@key[psset]{pst-eucl}{MarkAngle}{\edef\psk@MarkAngle{#1}}%
+\define@key[psset]{pst-eucl}{Mark}{\def\psk@Mark{#1}}%
+\define@key[psset]{pst-eucl}{mark}{\def\psk@mark{Angle#1}}%  for angles
+\define@key[psset]{pst-eucl}{MarkAngle}{\def\psk@MarkAngle{#1}}%
 % disance from point to its label
 \define@key[psset]{pst-eucl}{PointNameSep}{\edef\psk@PointNameSep{#1}}%
 % position angle for positionning a point name
@@ -122,7 +123,7 @@
   PointSymbol=default, PointSymbolA=undef, PointSymbolB=undef, PointSymbolC=undef,
   PointName=default, PointNameA=undef, PointNameB=undef, PointNameC=undef,
   PtNameMath=true, PointNameSep=default, PosAngle=undef, PosAngleA=undef,
-  PosAngleB=undef, PosAngleC=undef, Mark=undef, SegmentSymbol=MarkHashh,
+  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,
@@ -288,17 +289,29 @@ end}%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for marking
 \def\pstslash{/}%
-\def\pstslashh{/\!\!/}\let\pstslashslash=\pstslashh%
-\def\pstslashhh{/\!\!/\!\!/}\let\pstslashslashslash=\pstslashhh%
+\def\pstslashh{/\kern-2pt/}
+\let\pstslashslash=\pstslashh%
+\def\pstslashhh{/\kern-1.4pt/\kern-1.4pt/}
+\let\pstslashslashslash=\pstslashhh%
+\def\Anglepstslash{\rput{\ifx\psk@MarkAngle\@undef0\else\psk@MarkAngle\fi}(0,0){\pstslash}}
+\def\Anglepstslashh{\rput{\ifx\psk@MarkAngle\@undef0\else\psk@MarkAngle\fi}(0,0){\pstslashh}}
+\def\Anglepstslashhh{\rput{\ifx\psk@MarkAngle\@undef0\else\psk@MarkAngle\fi}(0,0){\pstslashhh}}
+\let\Anglepstslashslash=\Anglepstslashh%
+\let\Anglepstslashslashslash=\Anglepstslashhh%
 %%begin modif alaindelplanque 11/2003
 \def\MarkHash{%
   \rput{\ifx\psk@MarkAngle\@undef45\else\psk@MarkAngle\fi}
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}}
+\let\AngleMarkHash\MarkHash
 \def\MarkHashh{%
   \rput{\ifx\psk@MarkAngle\@undef45\else\psk@MarkAngle\fi}(-3\pslinewidth,0)
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}
   \rput{\ifx\psk@MarkAngle\@undef45\else\psk@MarkAngle\fi}(3\pslinewidth,0)
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}}
+\def\AngleMarkHashh{%
+  \rput{\ifx\psk@MarkAngle\@undef0\else\psk@MarkAngle\fi}(0,0){%
+    \psline(-10\pslinewidth,-3\pslinewidth)(10\pslinewidth,-3\pslinewidth)
+    \psline(-10\pslinewidth,3\pslinewidth)(10\pslinewidth,3\pslinewidth)}}
 \def\MarkHashhh{%
   \rput{\ifx\psk@MarkAngle\@undef45\else\psk@MarkAngle\fi}(-6\pslinewidth,0)
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}
@@ -306,15 +319,24 @@ end}%
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}
   \rput{\ifx\psk@MarkAngle\@undef45\else\psk@MarkAngle\fi}(6\pslinewidth,0)
     {\psline(-10\pslinewidth,0)(10\pslinewidth,0)}}
+\def\AngleMarkHashhh{%
+  \rput[c]{\ifx\psk@MarkAngle\@undef0\else\psk@MarkAngle\fi}(0,0){%
+    \psline(-10\pslinewidth,-4\pslinewidth)(10\pslinewidth,-4\pslinewidth)
+    \psline(-10\pslinewidth,0)(10\pslinewidth,0)
+    \psline(-10\pslinewidth,4\pslinewidth)(10\pslinewidth,4\pslinewidth)}}
 \def\MarkCros{
   \psline(-4\pslinewidth,4\pslinewidth)(4\pslinewidth,-4\pslinewidth)
   \psline(-4\pslinewidth,-4\pslinewidth)(4\pslinewidth,4\pslinewidth)}
+\let\AngleMarkCros\MarkCros
 \def\MarkCross{
   \psline(-4\pslinewidth,8\pslinewidth)(4\pslinewidth,0)
   \psline(-4\pslinewidth,0)(4\pslinewidth,8\pslinewidth)
   \psline(-4\pslinewidth,-8\pslinewidth)(4\pslinewidth,0)
   \psline(-4\pslinewidth,0)(4\pslinewidth,-8\pslinewidth)}
+\let\AngleMarkCross\MarkCross
 \def\MarkCirc{\pscircle(0,0){2\pslinewidth}}
+\let\AngleMarkCirc\MarkCirc
+%
 %%end modif alaindelplanque 11/2003
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% #2 #3 #4 -> 3 nodes for defining the right angle
@@ -358,48 +380,23 @@ end}%
 %
 %%  here we should check the angle size for right angles
 %
-%}
-\def\Pst@MarkAngle[#1]#2#3#4#5{{%  new version from 111116 hv
-  \psset{#1}%
-  \rput(#3){%
-   \psarc(0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
-   \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
-     add 2 div \psk@LabelAngleOffset\space add
-     \psk@LabelSep\space exch PtoC){#5}
-   \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
-     add 2 div \psk@MarkAngleRadius\space exch PtoC)%
-       {\csname\psk@Mark\endcsname}
-}}}%
-%\def\Pst@MarkAngle@iii[#1]#2#3#4#5{%
-\iffalse
-\def\Pst@MarkAngle[#1]#2#3#4#5{%
-  \bgroup\psset{#1}%            % Affectation of local parameters
-  %\rput(#3){\psarc(0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}}%
-  %\rput[\psk@LabelRefPt]%
-  %  {*0}([nodesep=\psk@LabelSep, angle= \psk@LabelAngle]#3){#5}%
-  \rput(#3){%
-    \psarc(0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
-    \rput[\psk@LabelRefPt]{*0}
-      (!tx@EcldDict begin /N@#4 GetNode exch Atan /N@#2 GetNode exch Atan end
+\def\Pst@MarkAngle[#1]#2#3#4#5{{%
+    \psset{MarkAngle=0,#1}%
+    \rput(#3){%
+      \psarc(0,0){\psk@MarkAngleRadius}{(#2)}{(#4)}%
+      \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
-        add 2 div \psk@LabelAngleOffset\space add \psk@LabelSep\space exch PtoC){#5}
-    %%begin modif alaindelplanque 11/2003
-    \ifx\psk@MarkAngle\@undef\psset{MarkAngle=90}\fi
-    \ifx\psk@Mark\@undef\else
-    \rput{!tx@EcldDict begin
-            /N@#3 GetNode /N@#4 GetNode ABVect Atan
-            /N@#3 GetNode /N@#2 GetNode ABVect Atan
-           end 2 copy lt \pslbrace exch 360 sub exch \psrbrace if add 2 div 90 add}
-      (0,0){\rput{-90}(\psk@MarkAngleRadius,0){\csname\psk@Mark\endcsname}}%
-    \fi}
-    %%end modif alaindelplanque 11/2003
-  \egroup%
-}%
-\fi
+        add 2 div dup /psRawLabelPos ED 
+        \psk@LabelAngleOffset\space add dup /psAngle ED 
+        \psk@LabelSep\space exch PtoC%
+      ){#5}%
+      \def\pst@tempA{Angleundef}%
+      \rput[\psk@LabelRefPt]{! psAngle }%
+         (! \psk@MarkAngleRadius\space psRawLabelPos PtoC )%
+           {\ifx\psk@mark\pst@tempA\csname\psk@Mark\endcsname\else\csname\psk@mark\endcsname\fi}%
+}}}%
+%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% #2 #4 #6 -> coordinates for nodes
 %% #3 #5 #7 -> nodes name