From 64399a1600fa8e39de85e76ad4ac6511e8acf053 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Jan 2016 22:30:43 +0000 Subject: pict2e (9jan16) git-svn-id: svn://tug.org/texlive/trunk@39336 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/pict2e/pict2e.dtx | 69 ++++++++++++------------ 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source/latex/pict2e') diff --git a/Master/texmf-dist/source/latex/pict2e/pict2e.dtx b/Master/texmf-dist/source/latex/pict2e/pict2e.dtx index d185c6b3be8..accb46019eb 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-2014 +% Copyright (C) 2003-2016 % Rolf Niepraschk, Rolf.Niepraschk@ptb.de % Hubert Gaesslein % Josef Tkadlec, j.tkadlec@email.cz @@ -23,7 +23,7 @@ % %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{pict2e} -% [2014/01/12 v0.2z Improved picture commands (HjG,RN,JT)] +% [2016/01/09 v0.2z Improved picture commands (HjG,RN,JT)] % %<*driver> \listfiles @@ -44,7 +44,7 @@ \IfFileExists{url.sty}{\usepackage{url}} {\newcommand*\url[1]{\texttt{#1}}} \OnlyDescription -\AlsoImplementation +%\AlsoImplementation \EnableCrossrefs \CodelineIndex \RecordChanges @@ -59,9 +59,9 @@ % \fi % % \GetFileInfo{pict2e.sty} -% \def\docdate{2014/01/12} +% \def\docdate{2016/01/09} % -% \CheckSum{2147} +% \CheckSum{2155} % % ^^A ======== % @@ -181,7 +181,8 @@ % \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)} +% \changes{v0.2z}{2014/01/12}{Conflict wit epic, eepic solved. (JT)} +% \changes{v0.3a}{2016/01/09}{Local line types, documentation fixes. (JT)} % \fi % % \changes{v0.1a}{2003/07/18}{First version. (RN)} @@ -206,7 +207,9 @@ % \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)} +% (2011/04/05 v0.2z). (JT)} +% \changes{v0.3a}{2016/01/09}{11th release to CTAN +% (2016/01/09 v0.3a). (JT)} % % % \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment} @@ -1240,7 +1243,7 @@ % % This section desribe new commands that extend the possibilities of the % \texttt{picture} environment. It is not our aim to create a powerful -% collection of macros (like \texttt{pstricks} or \texttt{pgf}). The main goal +% collection of macros (like \texttt{pstricks} or \texttt{tikz}). The main goal % of this package is to eliminate the limitations of the standard % \texttt{picture} commands. But this is done by \PS\ and \PDF\ operators % that might be easily used for user-level commands and hence significantly @@ -1355,14 +1358,14 @@ % adds a halfdisc, \cmd{\squarecap} adds a halfsquare. While \cmd{\squarecap} % is ignored for the path with zero length, \cmd{\roundcap} places a disc to % the given point. These commands do not apply to \cmd{\vector} and to -% closed paths (\cmd{\circle}, full \cmd{\oval}, path constructions ended by -% \cmd{\closepath}). +% closed paths (\cmd{\circle}, full \cmd{\oval}, +% parameter, path constructions ended by \cmd{\closepath}). % -% \DescribeMacro\mitterjoin +% \DescribeMacro\miterjoin % \DescribeMacro\roundjoin % \DescribeMacro\beveljoin % The shape of joins of subpaths is controlled by the following commands: -% \cmd{\mitterjoin} (implicit) might be defined in such a way that +% \cmd{\miterjoin} (implicit) might be defined in such a way that % ``boundaries'' of subpaths are prolonged until they intersect (it might be a % rather long distance for lines with a small angle between them); % \cmd{\roundjoin} corresponds to \cmd{\roundcap} for both subpaths; @@ -1902,8 +1905,9 @@ \if@tempswa \edef\y{\pIIe@fill@op}% \else - \edef\x{\x\space\strip@pt\@wholewidth - \space\pIIe@setlinewidth@op}% + \edef\x{\x\space + \strip@pt\@wholewidth\space\pIIe@setlinewidth@op + \pIIe@linecap\pIIe@linejoin\space}% \edef\y{\pIIe@stroke@op}% \fi \expandafter\pIIe@code\expandafter{% @@ -2873,7 +2877,7 @@ % Use of the |@tempswa| switch both here and inside quarter-circle! % Hence a group is necessary there.) % \begin{macrocode} - \if@tempswa \pIIe@fillGraph \else \pIIe@strokeGraph \fi + \if@tempswa \pIIe@fillGraph \else \buttcap \pIIe@strokeGraph \fi \endgroup} % \end{macrocode} % \end{macro} @@ -2881,16 +2885,13 @@ % \begin{macro}{\pIIe@circle} % Approximate a full circle by four quarter circles, use the standard shape % of ends. -% \changes{v0.1g}{2003/08/23}{Changed code (using -% \cmd{\pIIe@add@qcircle}). (HjG,RN)} -% \changes{v0.1t}{2008/05/11}{Changed code (using \cmd{\buttcap}. (JT)} +% \changes{v0.1g}{2003/08/23}{Changed code (using% +% \cmd{\pIIe@add@qcircle}). (HjG,RN)} +% \changes{v03.a}{2016/01/09}{Changed code, closepath seems to be necessary.} % \begin{macrocode} \newcommand*\pIIe@circle[1]{% - \begingroup - \pIIe@buttcap \pIIe@qcircle[1]\z@{#1}\pIIe@qcircle \@ne{#1}% - \pIIe@qcircle \tw@{#1}\pIIe@qcircle\thr@@{#1}% - \endgroup} + \pIIe@qcircle \tw@{#1}\pIIe@qcircle\thr@@{#1}\pIIe@closepath} % \end{macrocode} % \end{macro} % @@ -3494,20 +3495,20 @@ % \begin{macrocode} \ifcase\pIIe@mode\relax \or - \def\buttcap{\special{ps:: 0 setlinecap}} - \def\roundcap{\special{ps:: 1 setlinecap}} - \def\squarecap{\special{ps:: 2 setlinecap}} - \def\miterjoin{\special{ps:: 0 setlinejoin}} - \def\roundjoin{\special{ps:: 1 setlinejoin}} - \def\beveljoin{\special{ps:: 2 setlinejoin}} + \newcommand*\pIIe@linecap@op{setlinecap} + \newcommand*\pIIe@linejoin@op{setlinejoin} \or - \def\buttcap{\pIIe@pdfliteral{0 J}}% - \def\roundcap{\pIIe@pdfliteral{1 J}}% - \def\squarecap{\pIIe@pdfliteral{2 J}}% - \def\miterjoin{\pIIe@pdfliteral{0 j}}% - \def\roundjoin{\pIIe@pdfliteral{1 j}}% - \def\beveljoin{\pIIe@pdfliteral{2 j}}% + \newcommand*\pIIe@linecap@op{J} + \newcommand*\pIIe@linejoin@op{j} \fi + \def\pIIe@linecap{} + \def\pIIe@linejoin{} + \def\buttcap{\edef\pIIe@linecap{ 0 \pIIe@linecap@op}} + \def\roundcap{\edef\pIIe@linecap{ 1 \pIIe@linecap@op}} + \def\squarecap{\edef\pIIe@linecap{ 2 \pIIe@linecap@op}} + \def\miterjoin{\edef\pIIe@linejoin{ 0 \pIIe@linejoin@op}} + \def\roundjoin{\edef\pIIe@linejoin{ 1 \pIIe@linejoin@op}} + \def\beveljoin{\edef\pIIe@linejoin{ 2 \pIIe@linejoin@op}} % \end{macrocode} % \end{macro} % \end{macro} -- cgit v1.2.3