pst-eucl (2sep16)

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

5 files changed, 35 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-eucl/Changes b/Master/texmf-dist/doc/generic/pst-eucl/Changes
index 81dee127506..e211dacc739 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/Changes
+++ b/Master/texmf-dist/doc/generic/pst-eucl/Changes
@@ -4,6 +4,8 @@ pst-eucl.pro --------
 
 
 pst-eucl.tex --------
+1.54 2016/09/01 - added MarkArrow, MarkArroww,MarkArrowww 
+1.53 2016/05/03 - revert changes of CodeFig(A|B)
 1.52 2015/10/19 - added more optional arguments (ts)
 1.51 2014/05/17 - added two new functions for angles and distances
 1.50 2014/04/05 - added MarkHashLength|Sep (hv)
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/README b/Master/texmf-dist/doc/generic/pst-eucl/README
index ede39a0ba17..26f4033039c 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/README
+++ b/Master/texmf-dist/doc/generic/pst-eucl/README
@@ -1,4 +1,4 @@
- the pst-eucl package
+pst-eucl package
 
 This program can be redistributed and/or modified under the terms
 of the LaTeX Project Public License Distributed from CTAN
@@ -27,10 +27,3 @@ INSTALLATION
 
    run `texhash`
 
-   if you don't have a local texmf directory, you can create it or ask
-   the root to create it by modifying the file:
-
-	$(TEXMF)/web2c/texmf.cnf
-
-	remove the original for the first line:
-
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
index f8537d2f8ce..c896eafbace 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
index 76a3e17faee..35101012841 100644
--- a/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-eucl/pst-eucl-doc.tex
@@ -258,6 +258,9 @@ Several commands are predefined for marking the segment:
   \item \Seg{MarkHashhh}
   \item \Seg{MarkCros}
   \item \Seg{MarkCross}
+  \item \Seg{MarkArrow}
+  \item \Seg{MarkArroww}
+  \item \Seg{MarkArrowww}
   \end{compactitem}
 \end{multicols}
 \endgroup
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 eb821695a8c..4e9559a8b55 100644
--- a/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
+++ b/Master/texmf-dist/tex/generic/pst-eucl/pst-eucl.tex
@@ -10,15 +10,15 @@
 %%                 : hv herbert@dante.de
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Require PSTricks and pst-node packages
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
 \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
+\ifx\PSTArrowLoaded\endinput\else\input pst-arrow.tex\fi
 \ifx\PSTtoolsLoaded\endinput\else\input pst-tools.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
+%\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
 \ifx\MultidoLoaded\endinput \else\input multido.tex \fi
 \csname PSTEuclideLoaded\endcsname
 \let\PSTEuclideLoaded\endinput
-\def\fileversion{1.52}
-\def\filedate{2015/10/19}
+\def\fileversion{1.54}
+\def\filedate{2016/09/01}
 %% 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.
@@ -48,12 +48,12 @@
 \newif\ifPst@PtNameMath%
 \define@key[psset]{pst-eucl}{PtNameMath}[false]{\@nameuse{Pst@PtNameMath#1}}%
 % symbol used for marking equal length segment
-\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\edef\psk@SegmentSymbol{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\edef\psk@SegmentSymbolA{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\edef\psk@SegmentSymbolB{#1}}%
-\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\edef\psk@SegmentSymbolC{#1}}%
-\define@key[psset]{pst-eucl}{Mark}[undef]{\edef\psk@Mark{#1}}%
-\define@key[psset]{pst-eucl}{mark}[undef]{\edef\psk@mark{Angle#1}}%  for angles
+\define@key[psset]{pst-eucl}{SegmentSymbol}[MarkHashh]{\def\psk@SegmentSymbol{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolA}[MarkHashh]{\def\psk@SegmentSymbolA{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolB}[MarkHashh]{\def\psk@SegmentSymbolB{#1}}%
+\define@key[psset]{pst-eucl}{SegmentSymbolC}[MarkHashh]{\def\psk@SegmentSymbolC{#1}}%
+\define@key[psset]{pst-eucl}{Mark}[undef]{\def\psk@Mark{#1}}%
+\define@key[psset]{pst-eucl}{mark}[undef]{\def\psk@mark{Angle#1}}%  for angles
 \define@key[psset]{pst-eucl}{MarkAngle}[undef]{\edef\psk@MarkAngle{#1}}%
 \newdimen\psMarkHashLength
 \newdimen\psMarkHashSep
@@ -277,7 +277,7 @@
 \def\Pst@SegmentMark[#1]#2#3{%
   \bgroup\psset{#1}%            % Affectation of local parameters
   \ncline[nodesep=0]{#2}{#3}
-  \ncput[nrot=:U]{$\csname\psk@SegmentSymbol\endcsname$}%
+  \ncput[nrot=:U]{$\expandafter\@nameuse\expandafter{\psk@SegmentSymbol}$}%  $
   \egroup%
 }%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -348,6 +348,19 @@
 \let\AngleMarkCross\MarkCross
 \def\MarkCirc{\pscircle(0,0){2\pslinewidth}}
 \let\AngleMarkCirc\MarkCirc
+% MarkArrow >
+\def\MarkArrow{%
+  \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+          veearrowangle=90,veearrowlinewidth=\pslinewidth,
+          ArrowInside=-v](-\psMarkHashLength,0)(\psMarkHashLength,0)}%
+\def\MarkArroww{%
+  \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+          veearrowangle=90,veearrowlinewidth=\pslinewidth,
+          ArrowInsideNo=2,ArrowInside=-v](-2\psMarkHashLength,0)(2\psMarkHashLength,0)}%
+\def\MarkArrowww{%
+  \psline[linestyle=none,veearrowlength=\psMarkHashLength,
+          veearrowangle=90,veearrowlinewidth=\pslinewidth,
+          ArrowInsideNo=3,ArrowInside=-v](-2.5\psMarkHashLength,0)(2.5\psMarkHashLength,0)}%
 %
 %%end modif alaindelplanque 11/2003
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1084,14 +1097,14 @@
   \egroup
   \psset{linecolor=\psk@CodeFigColor, linestyle=\psk@CodeFigStyle, arcsep=-1}%
   \ifx\psk@CodeFigA\@undef%
-    \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi
+    \ifx\psk@CodeFigB\@undef\ifPst@CodeFig\pstArcOAB{#2}{#6}{#7}\fi\fi
   \else%
-    \ifx\psk@CodeFigA\@none \ifPst@CodeFigA\ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi\fi\fi
+    \ifPst@CodeFigAarc\pstArcOAB{#2}{#6}{#7}\else\pstArcnOAB{#2}{#6}{#7}\fi%
   \fi
   \ifx\psk@CodeFigB\@undef%
-    \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi
-  \else
-    \ifx\psk@CodeFigB\@none \ifPst@CodeFigB\ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi\fi\fi
+    \ifx\psk@CodeFigA\@undef\ifPst@CodeFig\pstArcOAB{#4}{#6}{#7}\fi\fi
+  \else%
+    \ifPst@CodeFigBarc\pstArcOAB{#4}{#6}{#7}\else\pstArcnOAB{#4}{#6}{#7}\fi%
   \fi
   \egroup
 }%