pst-eucl 1.37 (10may11)

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

2 files changed, 34 insertions, 218 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 f737a4fc660..df1b8481418 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -1,77 +1,35 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- Mode: Latex -*- %%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% pst-eucl.tex --- Generation of geometric figures in euclidean geometry
-%% Copyright 2000-2005 Dominique RODRIGUEZ
+%% $Id: pst-eucl.tex 467 2011-03-01 21:04:36Z herbert $
 %%
-%% Author          : Dominique RODRIGUEZ (EN) <dominique.rodriguez@waika9.com>
-%% Created the     : Mon Oct 16 21:15:11 CEST 2000
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% HISTORY
+%% This is file `pst-eucl.tex',
 %%
-%% 2000-10-16 : creation of the file from a first LaTeX protype sty file
+%% IMPORTANT NOTICE:
 %%
-%% 2001-05-7  : distribution of the first beta version
+%% Package `pst-eucl.tex'
 %%
-%% 2002-03-21 : distribution of the second beta version
+%% Dominique RODRIGUEZ <dominique.rodriguez _at_waika9.com> 
+%% with contributions of Herbert Voss <hvoss _at_ tug.org>
+%% Copyright 2000-2011 Dominique RODRIGUEZ
 %%
-%% 2002-12-01 : distribution of the pre-release 1.0
-%%
-%% 2003-03-23 : direct computation of coordinates for the center of gravity and
-%%              the center of the circum circle, avoiding creation of intermediates
-%%              nodes.
-%%
-%% 2003-12-16 : Integration of modifications given by Alain DELPLANQUE
-%%              automatic computation of PosAngle for several commands,
-%%              and ability to give a list of point for pstGeonode, pstOIJGeonode
-%%
-%% 2004-09-05 : Improvement of the management of the Point name end of the param lists
-%%
-%% 2004-11-04 : Improvement of the management of the display of the Point name
-%%
-%% 2004-12-10 : New parameters for coding the circum circle : SegmentSymbolA B & C
-%%
-%% 2004-12-14 : New parametre RightAngleType for regional difference
-%%
-%% 2005-01-17 : transition towards pst-xkey (thanks to "Hendri Adriaens" <Hendri@uvt.nl>)
-%%
-%% 2005-02-21 : correction for spurious blank (thanks to Herbert Voss <Herbert.Voss@alumni.TU-Berlin.DE>)
-%%              in pstTriangleABC (search for "-- hv")
-%%
-%% 2005-03-25 : Modification of the transformations macros: management of a points list
-%%              coding for rotation & translation
-%%              draw a curve for a points list (geonode & oijgeonode & transform macros)
-%%
-%% 2005-04-10 : Modification of the transformations macros: management of a points list
-%%              management directly within the first point argument
-%%              Plotting of a curve linking a list of points
-%%
-%% 2005-10-09 : problem solved with CodeFigAB
-%%
-%% 2005-12-31 : use \psscalbox instead of \scalebox (hv)
-%%
-%% 2006-01-29 : minor changes for file version (hv)
+%% 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.
 %%
-%% 2006-01-30 : correction of pstArcOAB for pscustom (dr)
+%% DESCRIPTION:
+%%   `pst-eucl' is a PSTricks package to draw geometric figures in euclidean geometry,
 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Require PSTricks and pst-node packages
-\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.3.5}
-\def\filedate{2006/01/30}%
-%% 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.
-\message{`PST-Euclide v\fileversion, \filedate\space (Dominique RODRIGUEZ)}%
-\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
+\ifx\PSTricksLoaded\endinput\else   \input pstricks.tex\fi
+\ifx\PSTnodeLoaded\endinput\else    \input pst-node.tex\fi
+\ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
+%
+\def\fileversion{1.37}
+\def\filedate{2011/05/05}%
+\message{`PST-Euclide v\fileversion, \filedate\space (DR)}%
 %% 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
@@ -397,16 +355,9 @@ end}%
 %% #2 #3 #4 -> 3 nodes for defining the angle
 %% #5 -> label
 \def\pstMarkAngle{\@ifnextchar[\Pst@MarkAngle{\Pst@MarkAngle[]}}%
-%\def\pstMarkAngle{\@ifnextchar[\Pst@MarkAngle@i{\Pst@MarkAngle@i[]}}%
-%\def\Pst@MarkAngle@i[#1]{\@ifnextchar+{\Pst@MarkAngle@ii[#1]}{\Pst@MarkAngle@iii[#1]}}%
-%\def\Pst@MarkAngle@ii[#1]+#2#3#4#5{%
-%
 %%  here we should check the angle size for right angles
-%
-%}
-%\def\Pst@MarkAngle@iii[#1]#2#3#4#5{%
 \def\Pst@MarkAngle[#1]#2#3#4#5{%
-  \bgroup\psset{#1}%            % Affectation of local parameters
+  \begingroup\ifx\relax#1\relax\else\psset{#1}\fi%            % 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}%
@@ -416,17 +367,21 @@ end}%
       (!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}}
+    \rput{! tx@EcldDict begin
+            /N@#4 GetNode /N@#3 GetNode ABVect exch atan %dup == 
+            /N@#2 GetNode /N@#3 GetNode ABVect exch atan %dup ==
+           end 
+        2 copy lt \pslbrace exch 360 sub \psrbrace if 
+        add 2 div cvi 90 mod 45 sub   
+        }(!\psk@MarkAngleRadius\space tx@EcldDict begin
+            /N@#4 GetNode /N@#3 GetNode ABVect exch atan %dup == 
+            /N@#2 GetNode /N@#3 GetNode ABVect exch atan %dup ==
+           end 
+        2 copy lt { exch 360 sub } if 
+        add 2 div PtoC ){\csname\psk@Mark\endcsname}
     \fi}
-    %%end modif alaindelplanque 11/2003
-  \egroup%
+  \endgroup%
 }%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% #2 #4 #6 -> coordinates for nodes
diff --git a/Master/texmf-dist/tex/latex/pst-eucl/euclide.sty b/Master/texmf-dist/tex/latex/pst-eucl/euclide.sty
deleted file mode 100644
index 818a1d9ba1b..00000000000
--- a/Master/texmf-dist/tex/latex/pst-eucl/euclide.sty
+++ /dev/null
@@ -1,139 +0,0 @@
-%% Package style for the pst-eucl documentation package
-\DeclareOption{french}{\gdef\euclide@language{frenchb}}%
-\def\fileversion{1.0}
-\def\filedate{2005/01/19}%
-%% 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.
-\csname EuclideManualLoaded\endcsname
-\let\EuclideManualLoaded\endinput
-\def\@english{english}%
-\def\@frenchb{frenchb}%
-\def\euclide@language{english}%
-\ProcessOptions
-\message{`Euclide manual package v\fileversion, \filedate\space (Dominique RODRIGUEZ)}%
-\message{ all declarations for the pst-eucl manual}%
-\message{ BEWARE you are using the \euclide@language\ language setting}%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%\PassOptionsToPackage{greek}{babel}%%\PassOptionsToPackage{LGR}{fontenc}
-\usepackage[T1]{fontenc}
-%\expandafter\ifx\csname PDF\endcsname\relax\else
-\usepackage{ae,aecompl,aeguill}
-%\usepackage{pslatex}%for generating a pdf-file with ps2pdf
-%\fi
-\usepackage[\euclide@language]{babel}
-\usepackage[latin1]{inputenc}
-\usepackage[a4paper]{geometry}
-\usepackage[usenames]{pstcol}
-\usepackage{pst-eucl}
-\usepackage{pst-plot}
-\usepackage{ifthen}
-\usepackage{calc}
-\usepackage{array}
-\usepackage{moreverb}
-\usepackage{multicol}
-\usepackage{mathrsfs}
-\usepackage{changebar}
-\usepackage{xspace}
-\usepackage{fancyhdr}
-\usepackage{multind}
-\usepackage{textcomp}
-%\usepackage{yhmath}
-\usepackage{longtable}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% QQ DEFINITIONS
-\def\Vecteur#1{\ensuremath{\overrightarrow{#1\hspace{.3em}}}}%
-\def\Angle#1{\ensuremath{\widehat{#1}}}%
-\def\Segment#1{\ensuremath{[#1]}}%
-\def\Arg#1{{\normalfont$\{$\@Arg{#1}$\}$}}%
-\def\Argsans#1{\@Arg{#1}}%
-\def\OptArg#1{{\normalfont[{\@Arg{#1}}]}}%
-\def\@Arg#1%
-  {$\protect\langle${\itshape\mdseries\rmfamily#1}$\protect\rangle$}%
-%% le backslash \
-\newcommand{\bs}{\symbol{'134}}%
-\newcommand{\defcom}[3][\null]{%
-  \begin{trivlist}\item\fbox{\texttt{\upshape\bs#2}#3}\end{trivlist}
-  \glossary{#2}%%pour le numéro de page dans le glossaire des commandes
-  \glossary{#2!\protect\indexcom{#2}\protect#3}% pour le glossaire
-  \Glos{#2}{\protect\indexcom{#2}\protect#3}{\hspace{1.5em}#1}%
-}%
-\newcommand{\Glos}[3]{\glossary{#1!#2!#3}}%
-\newcommand{\indexcom}[1]%
-  {\textmd{\texttt{\upshape\bs#1}}}%
-%  {\index{latex}{#1@{\texttt{\upshape\bs#1}}}\textmd{\texttt{\upshape\bs#1}}}%
-\newcommand{\ComUnDescr}{\null}
-\newcommand{\ComDeuxDescr}{\null}
-\newcommand{\defcomdeux}[4]{%
-    \begin{center}%
-    \begin{minipage}[t]{.45\linewidth}%
-      \begin{trivlist}\item\fbox{\texttt{\upshape\bs#1}#2}\end{trivlist}%
-      \glossary{#3}%%pour le numéro de page dans le glossaire des commandes
-      \glossary{#1!\protect\indexcom{#1}\protect#2}% pour le glossaire
-      \Glos{#1}{\protect\indexcom{#1}\protect#2}{\hspace{1.5em}\expandafter\ComUnDescr}%
-    \end{minipage}%
-    \hfill%
-    \begin{minipage}[t]{.45\linewidth}%
-      \begin{trivlist}\item\fbox{\texttt{\upshape\bs#3}#4}\end{trivlist}%
-      \glossary{#3}%%pour le numéro de page dans le glossaire des commandes
-      \glossary{#3!\protect\indexcom{#3}\protect#4}% pour le glossaire
-      \Glos{#3}{\protect\indexcom{#3}\protect#4}{\hspace{1.5em}\expandafter\ComDeuxDescr}%
-    \end{minipage}
-    \end{center}}%end defcomdeux
-\newcommand{\ParamList}[1]{\par
-  \small\hspace{1.5em}Param\ifx\euclide@language\@english eters\else ètres \fi: #1}
-\newenvironment{tabexemple}[1]%
-  [@{}m{.3\linewidth}@{\hspace{.013\linewidth}}>{\small}m{.677\linewidth}@{}]%
-  {\vspace{1em}\noindent\small\begin{center}%
-   \noindent\begin{tabular}{#1}}%
-  {\mbox{}\vspace{-1.5em}\end{tabular}\end{center}}%
-\newcommand{\tabex}[2]%
-  [@{}m{.3\linewidth}@{\hspace{.013\linewidth}}m{.677\linewidth}@{}]%
-{%
-  \begin{tabexemple}[#1]%
-    \input{Exemples/#2}&\smallverbatiminput{Exemples/#2_in}%
-  \end{tabexemple}%
-}%
-\def\smallverbatiminput#1{\small\verbatiminput{#1}}%
-\def\param#1{\texttt{#1}}
-\def\com#1{\texttt{\bs #1}}
-\def\DefaultVal#1%
-  {(\ifx\euclide@language\@english by default \fi\texttt{#1}\ifx\euclide@language\@frenchb\ par défaut\fi)\xspace}
-\def\PStricks{\texttt{PSTricks}\xspace}
-\def\PostScript{\textsf{PostScript}\xspace}
-\def\Version{Version 1{.}3{.}2\xspace}
-\def\Date{\ifx\euclide@language\@english march 28th \else 28 mars \fi 2005}
-\newcommand{\MonEuro}{\texteuro\xspace}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\geometry{bottom=2.5cm, left=1cm, headheight=15.8pt, verbose}%, verbose}
-\psset{subgriddiv=0,griddots=5}
-\setlength{\changebarsep}{10pt}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% entête et pied de page
-\pagestyle{fancy}
-\renewcommand{\headrulewidth}{0.4pt}
-\renewcommand{\footrulewidth}{0.4pt}
-%\lhead{\Version -- \Date}
-%\chead{}
-%\rhead{Extension \texttt{pst-eucl} -- D. \textsc{Rodriguez}}
-%\cfoot{\psshadowbox{\thepage}}
-\lfoot{\Version --\Date}
-\rfoot{Extension \texttt{pst-eucl} -- D. \textsc{Rodriguez}}
-%%%%%%%%%%%%%%%%%%%%
-\newcounter{i}
-%%%%%%%%%%%%%%%%%%%%
-\def\twocoltoc{%
-  \chapter*{\contentsname
-      \@mkboth{%
-         \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
-  \begin{multicols}{2}
-    \@starttoc{toc}%
-  \end{multicols}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% GLOSSAIRE
-\makeglossary
-\endinput
\ No newline at end of file