diff options
| -rw-r--r-- | Master/texmf-dist/doc/generic/pst-eucl/Changes | 1 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex | 35 |
2 files changed, 19 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes index 41959aa742c..ead07e0ffed 100644 --- a/Master/texmf-dist/doc/generic/pst-eucl/Changes +++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes @@ -4,6 +4,7 @@ pst-eucl.pro -------- pst-eucl.tex -------- +1.48 2013/05/02 - take \MarkAngle into account (hv) 1.47 2013/03/12 - insert \ignorespaces in \pstRightAngle (hv) 1.46 2013/01/09 - use the eucl dictionary when only needed (hv) 1.45 2012/12/31 - fixed introduced bug with PtoC (hv) 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 bc0593166ba..9e84c66648e 100644 --- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex +++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex @@ -1,12 +1,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%% %% pst-eucl.tex --- Generation of geometric figures in euclidean geometry -%% Copyright 2000-2011 Dominique RODRIGUEZ +%% Copyright 2000-2013 Dominique RODRIGUEZ %% %% 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. %% %% Author : Dominique RODRIGUEZ (EN) <dominique.rodriguez@waika9.com> +%% : hv herbert@dante.de %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Require PSTricks and pst-node packages \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi @@ -15,9 +16,8 @@ \ifx\MultidoLoaded\endinput \else\input multido.tex \fi \csname PSTEuclideLoaded\endcsname \let\PSTEuclideLoaded\endinput -\def\fileversion{1.47} -\def\filedate{2013/03/12 -}% +\def\fileversion{1.48} +\def\filedate{2013/05/02} %% 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. @@ -382,26 +382,26 @@ end}% %% here we should check the angle size for right angles % \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 + \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 dup /psRawLabelPos ED \psk@LabelAngleOffset\space add - \psk@LabelSep\space exch PtoC% - ){#5}% - \def\pst@tempA{Angleundef}% + \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 + \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}% -}}}% + \rput[\psk@LabelRefPt]{!\pst@rot@angle\space \ifx\psk@MarkAngle\@undef 0 \else\psk@MarkAngle\space\fi add }% + (! \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 @@ -965,7 +965,8 @@ end}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \def\pstInterLC{\@ifnextchar[\Pst@InterLC{\Pst@InterLC[]}}% \def\Pst@InterLC[#1]#2#3#4#5#6#7{% - \bgroup\psset{#1}% % Affectation of local parameters + \bgroup% + \psset{#1}% % Affectation of local parameters \rput(#4){% \pnode(! tx@EcldDict begin |