From 6a1eca2ec87e69d7762d98299002759559b146c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Jan 2014 00:01:29 +0000 Subject: pict2e (13jan14) git-svn-id: svn://tug.org/texlive/trunk@32658 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pict2e/pict2e.pdf | Bin 619135 -> 549726 bytes Master/texmf-dist/source/latex/pict2e/pict2e.dtx | 31 ++++++++++++++++------- Master/texmf-dist/tex/latex/pict2e/pict2e.sty | 14 +++++++--- 3 files changed, 32 insertions(+), 13 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf b/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf index ee22a1a7bac..fe297d021a7 100644 Binary files a/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf and b/Master/texmf-dist/doc/latex/pict2e/pict2e.pdf differ 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. % % -%\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{pict2e} -% [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)] +% [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} % diff --git a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty index 2f764d3d90a..e4f8a364182 100644 --- a/Master/texmf-dist/tex/latex/pict2e/pict2e.sty +++ b/Master/texmf-dist/tex/latex/pict2e/pict2e.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pict2e} - [2011/04/05 v0.2y Improved picture commands (HjG,RN,JT)] + [2014/01/12 v0.2z Improved picture commands (HjG,RN,JT)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -662,9 +662,10 @@ \pIIe@addtoGraph\pIIe@curveto@op \fi \endgroup} - \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}% @@ -673,6 +674,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 \let\lp@r( \let\rp@r) \def\Line(#1,#2)(#3,#4){\polyline(#1,#2)(#3,#4)} \def\polyline(#1,#2){% -- cgit v1.2.3