pict2e (13jan14)

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

1 files changed, 22 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
index acdfaa4aa81..d185c6b3be8 100644
--- a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
+++ b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx
@@ -2,7 +2,7 @@
 %
 %
 %
-% Copyright (C) 2003-2011
+% Copyright (C) 2003-2014
 % Rolf Niepraschk, Rolf.Niepraschk@ptb.de
 % Hubert Gaesslein
 % Josef Tkadlec, j.tkadlec@email.cz
@@ -21,9 +21,9 @@
 % This work consists of all files listed in manifest.txt.
 %
 %
-%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] 
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{pict2e}
-%<package>  [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)]
+%<package>  [2014/01/12 v0.2z Improved picture commands (HjG,RN,JT)]
 %
 %<*driver>
 \listfiles
@@ -59,9 +59,9 @@
 % \fi
 %
 % \GetFileInfo{pict2e.sty}
-% \def\docdate{2011/04/05}
+% \def\docdate{2014/01/12}
 %
-% \CheckSum{2135}
+% \CheckSum{2147}
 %
 % ^^A ========
 %
@@ -181,6 +181,7 @@
 % \changes{v0.2w}{2008/07/22}{Number of points in \cmd{\qbezier} not ignored. (JT)}
 % \changes{v0.2x}{2009/08/05}{Support for xetex. (JT)}
 % \changes{v0.2y}{2011/04/05}{Support for dvipdfmx. (JT)}
+% \changes{v0.2z}{2011/04/05}{Conflict wit epic, eepic solved. (JT)}
 % \fi
 %
 % \changes{v0.1a}{2003/07/18}{First version. (RN)}
@@ -204,6 +205,8 @@
 %                             (2009/08/08 v0.2x). (JT)}
 % \changes{v0.2y}{2011/04/05}{Nineth release to CTAN
 %                             (2011/04/05 v0.2y). (JT)}
+% \changes{v0.2z}{2014/01/12}{10th release to CTAN
+%                             (2011/04/05 v0.2y). (JT)}
 %
 %
 % \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
@@ -1268,6 +1271,9 @@
 % If \cmd{\squarecap} is active then \cmd{\arc\marg{RAD}} produces a circle
 % with a square.
 %
+% An equivalent \cmd{\pIIearc} to \cmd{\arc} is defined to solve possible
+% conflicts with other packages.
+%
 % \subsubsection{Lines, polygons}
 % \label{sec:usage:lines+polygons}
 %
@@ -3373,11 +3379,13 @@
 % The \cmd{\arc} command generalizes (except that the radius instead of the
 % diameter is used) the standard \cmd{\circle} adding as an
 % obligatory first parameter comma separated pair of angles (initial and
-% final).
+% final). We start with \cmd{\pIIearc} to avoid conflicts with other
+% packages.
 %    \begin{macrocode}
-  \newcommand*\arc{\@ifstar{\@tempswatrue\@arc}{\@tempswafalse\@arc}}
-  \newcommand*\@arc[2][0,360]{\@@arc(#1){#2}}
-  \def\@@arc(#1,#2)#3{%
+  \newcommand*\pIIearc
+    {\@ifstar{\@tempswatrue\pIIe@arc@}{\@tempswafalse\pIIe@arc@}}
+  \newcommand*\pIIe@arc@[2][0,360]{\pIIe@arc@@(#1){#2}}
+  \def\pIIe@arc@@(#1,#2)#3{%
     \if@tempswa
       \pIIe@moveto\z@\z@
       \pIIe@arc{\z@}{\z@}{#3\unitlength}{#1}{#2}%
@@ -3386,6 +3394,11 @@
       \pIIe@arc[1]{\z@}{\z@}{#3\unitlength}{#1}{#2}%
       \pIIe@strokeGraph
     \fi}
+  \ifx\undefined\arc
+  \else
+      \PackageWarning{pict2e}{\protect\arc\space redefined}%
+  \fi
+  \let\arc\pIIearc
 %    \end{macrocode}
 % \end{macro}
 %