summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/curve2e/README56
-rw-r--r--Master/texmf-dist/doc/latex/curve2e/README.txt4
-rw-r--r--Master/texmf-dist/doc/latex/curve2e/curve2e.pdfbin635603 -> 636364 bytes
-rw-r--r--Master/texmf-dist/doc/latex/curve2e/manifest.txt4
-rw-r--r--Master/texmf-dist/source/latex/curve2e/curve2e.dtx57
-rw-r--r--Master/texmf-dist/tex/latex/curve2e/curve2e.sty46
6 files changed, 89 insertions, 78 deletions
diff --git a/Master/texmf-dist/doc/latex/curve2e/README b/Master/texmf-dist/doc/latex/curve2e/README
deleted file mode 100644
index 8392f572ae5..00000000000
--- a/Master/texmf-dist/doc/latex/curve2e/README
+++ /dev/null
@@ -1,56 +0,0 @@
-%%
-%% This is file `README.txt',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% curve2e.dtx (with options: `readme')
-%%
-%% Copyright (C) 2005--2015 Claudio Beccari all rights reserved.
-%% License information appended
-%%
-File README.txt for package curve2e
- [2015/07/11 v.1.60 Extension package for pict2e]
-
-
-This file is an extension of the package pict2e.sty which extends the standard
-picture LaTeX environment according to what Leslie Lamport specified in the
-second edition of his LaTeX manual.
-
-This further extension allows to draw lines and vectors with any non integer
-slope parameters, to draw dashed lined of any slope, to draw arcs and curved
-vectors, to draw curves where just the interpolating nodes are specified
-together with the slopes at the nodes; closed paths of any shape can be filled
-with color; all coordinates are treated as ordered pairs, i.e. 'complex numbers'.
-Some of these features have been incorporated in the 2011 version of pict2e;
-therefore this package avoids any modification to the original pict2e commands.
-
-Curve2e now accepts polar coordinates in addition to the usual cartesian ones;
-several macros have been upgraded and a new macro for tracing cubic Bezier
-splines with their control nodes specified in polar form is available.
-
-This version solves a conflict with package eso-pic.
-
-This version of curve2e is fully compatible with pict2e dated 2014/01/12
-version 0.2z.
-
-If you specify
-
-\usepackage[<pict2e options>]{curve2e}
-
-the package pict2e is automatically invoked with the specified options.
-
-%%
-%%
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%%
-%% This work is "author-maintained"
-%%
-%% This work consists of file curve2e.dtx, and the derived files
-%% curve2e.sty and curve2e.pdf, plus the auxiliary derived files
-%% README.txt and manifest.txt.
-%%
-%%
-%% End of file `README.txt'.
diff --git a/Master/texmf-dist/doc/latex/curve2e/README.txt b/Master/texmf-dist/doc/latex/curve2e/README.txt
index 8392f572ae5..d6345867ba9 100644
--- a/Master/texmf-dist/doc/latex/curve2e/README.txt
+++ b/Master/texmf-dist/doc/latex/curve2e/README.txt
@@ -6,11 +6,11 @@
%%
%% curve2e.dtx (with options: `readme')
%%
-%% Copyright (C) 2005--2015 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
%% License information appended
%%
File README.txt for package curve2e
- [2015/07/11 v.1.60 Extension package for pict2e]
+ [2019/02/07 v.1.61 Extension package for pict2e]
This file is an extension of the package pict2e.sty which extends the standard
diff --git a/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf b/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
index d36a9741152..2996792e137 100644
--- a/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
+++ b/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/curve2e/manifest.txt b/Master/texmf-dist/doc/latex/curve2e/manifest.txt
index b8b6c6af2d4..ec39b2d9ebc 100644
--- a/Master/texmf-dist/doc/latex/curve2e/manifest.txt
+++ b/Master/texmf-dist/doc/latex/curve2e/manifest.txt
@@ -6,11 +6,11 @@
%%
%% curve2e.dtx (with options: `manifest')
%%
-%% Copyright (C) 2005--2015 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
%% License information appended
%%
File manifest.txt for package curve2e
- [2015/07/11 v.1.60 Extension package for pict2e]
+ [2019/02/07 v.1.61 Extension package for pict2e]
The package bundle curve2e is composed of the following files
diff --git a/Master/texmf-dist/source/latex/curve2e/curve2e.dtx b/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
index 9b2336f5c4f..d0672852dd7 100644
--- a/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
+++ b/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
@@ -6,7 +6,7 @@
\keepsilent
\preamble
- Copyright (C) 2005--2015 Claudio Beccari all rights reserved.
+ Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
License information appended
\endpreamble
@@ -39,7 +39,7 @@ README.txt and manifest.txt.
%
% \iffalse
%<*package>
-%<package>\NeedsTeXFormat{LaTeX2e}[2014/05/01]
+%<package>\NeedsTeXFormat{LaTeX2e}[2016/01/01]
%</package>
%<*driver>
\ProvidesFile{curve2e.dtx}%
@@ -48,7 +48,7 @@ README.txt and manifest.txt.
%<+readme>File README.txt for package curve2e
%<+manifest>File manifest.txt for package curve2e
%<*package|readme|manifest>
- [2015/07/11 v.1.60 Extension package for pict2e]
+ [2019/02/07 v.1.61 Extension package for pict2e]
%</package|readme|manifest>
%<*driver>
\documentclass{ltxdoc}\errorcontextlines=9
@@ -100,7 +100,7 @@ README.txt and manifest.txt.
%</driver>
% \fi
%
-% \CheckSum{3087}
+% \CheckSum{3138}
% \begin{abstract}
% This file documents the |curve2e| extension package to the recent
% implementation of the |pict2e| bundle that has been described by Lamport
@@ -641,7 +641,7 @@ README.txt and manifest.txt.
% \Curve*(2.5,0)<1,1>(5,3.5)<0,1>(4,5)<-1,0>(2.5,3.5)<-0.5,-1.2>[-0.5,1.2](1,5)<-1,0>(0,3.5)<0,-1>(2.5,0)<1,-1>}
% \end{picture}
% \end{minipage}
-%\caption{Coloring the inside of a closeded path drawn with \texttt{\string\Curve*}}
+%\caption{Coloring the inside of a closed path drawn with \texttt{\string\Curve*}}
%\label{fig:colored-curve}
% \end{figure}
@@ -734,6 +734,7 @@ README.txt and manifest.txt.
% \begin{macrocode}
\RequirePackage{color}
\RequirePackageWithOptions{pict2e}[2014/01/01]
+\RequirePackage{xparse}
% \end{macrocode}
%
% The next macros are just for debugging. With the \texttt{trace} package it
@@ -1343,6 +1344,52 @@ README.txt and manifest.txt.
\@ifnextchar\lp@r{\p@lyline}{\strokepath\ignorespaces}}
% \end{macrocode}
%
+% The same treatment must be done for the \cs{polygon} macros
+% \begin{macrocode}
+\providecommand\polygon{}
+\RenewDocumentCommand\polygon{s O{\beveljoin} }{\@killglue\begingroup
+\IfBooleanTF{#1}{\@tempswatrue}{\@tempswafalse}%
+\@polygon[#2]}
+
+\def\@polygon[#1](#2){\@killglue#1\GetCoord(#2)\d@mX\d@mY
+ \pIIe@moveto{\d@mX\unitlength}{\d@mY\unitlength}%
+ \@ifnextchar\lp@r{\@@polygon}{%
+ \PackageWarning{curve2e}%
+ {Polygons require at least two vertices!\MessageBreak
+ Control your polygon specification\MessageBreak}%
+ \ignorespaces}}
+
+ \def\@@polygon(#1){\GetCoord(#1)\d@mX\d@mY
+ \pIIe@lineto{\d@mX\unitlength}{\d@mY\unitlength}%
+ \@ifnextchar\lp@r{\@@polygon}{\pIIe@closepath
+ \if@tempswa\pIIe@fillGraph\else\pIIe@strokeGraph\fi
+ \endgroup
+ \ignorespaces}}
+% \end{macrocode}
+% Now, for example, a filled polygon can be drawn using polar coordinates
+% for its vertices; see figure~\ref{fig:filled-polygon}
+%
+% \begin{figure}
+% \begin{minipage}{0.55\textwidth}
+%\begin{verbatim}
+% \unitlength=0.07\hsize
+% \begin{picture}(8,8)(-4,-4)\color{red}
+% \polygon*(45:4)(135:4)(-135:4)(-45:4)
+% \end{picture}
+%\end{verbatim}
+% \end{minipage}
+% \hfill
+% \begin{minipage}{0.4\textwidth}\centering
+% \unitlength=0.07\hsize
+% \begin{picture}(8,8)(-4,-4)\color{red}
+% \polygon*(45:4)(135:4)(-135:4)(-45:4)
+% \end{picture}
+% \end{minipage}
+% \caption{The code and the result of defining a polygon with its vertex
+% polar coordinates}\label{fig:filled-polygon}
+% \end{figure}
+%
+%
% \subsection{The red service grid}
% The next command is very useful for debugging while editing one's drawings;
% it draws a red grid with square meshes that are ten drawing units apart;
diff --git a/Master/texmf-dist/tex/latex/curve2e/curve2e.sty b/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
index 3a72e84ffd2..0224f13d05a 100644
--- a/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
+++ b/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
@@ -6,16 +6,17 @@
%%
%% curve2e.dtx (with options: `package')
%%
-%% Copyright (C) 2005--2015 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2014/05/01]
+\NeedsTeXFormat{LaTeX2e}[2016/01/01]
\ProvidesPackage{curve2e}%
- [2015/07/11 v.1.60 Extension package for pict2e]
+ [2019/02/07 v.1.61 Extension package for pict2e]
\RequirePackage{color}
\RequirePackageWithOptions{pict2e}[2014/01/01]
+\RequirePackage{xparse}
\def\TRON{\tracingcommands\tw@ \tracingmacros\tw@}%
\def\TROF{\tracingcommands\z@ \tracingmacros\z@}%
\ifx\undefined\@tdA \newdimen\@tdA \fi
@@ -55,17 +56,17 @@
\countdef\NumA3254\countdef\NumB3252\relax
\GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
\GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
- \SubVect\V@ttA from\V@ttB to\V@ttC
- \ModOfVect\V@ttC to\DlineMod
- \DivideFN\DlineMod by#3 to\NumD
- \NumA\expandafter\Integer\NumD.??
- \ifodd\NumA\else\advance\NumA\@ne\fi
- \NumB=\NumA \divide\NumB\tw@
- \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
- \DividE\p@ by\NumA\p@ to \@tempa
- \MultVect\V@ttC by\@tempa,0 to\V@ttB
+ \SubVect\V@ttA from\V@ttB to\V@ttC
+ \ModOfVect\V@ttC to\DlineMod
+ \DivideFN\DlineMod by#3 to\NumD
+ \NumA\expandafter\Integer\NumD.??
+ \ifodd\NumA\else\advance\NumA\@ne\fi
+ \NumB=\NumA \divide\NumB\tw@
+ \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
+ \DividE\p@ by\NumA\p@ to \@tempa
+ \MultVect\V@ttC by\@tempa,0 to\V@ttB
\MultVect\V@ttB by 2,0 to\V@ttC
- \advance\NumB\@ne
+ \advance\NumB\@ne
\edef\@mpt{\noexpand\egroup
\noexpand\multiput(\V@ttA)(\V@ttC){\number\NumB}%
{\noexpand\LIne(\V@ttB)}}%
@@ -177,6 +178,25 @@
\def\p@lyline(#1){\GetCoord(#1)\d@mX\d@mY
\pIIe@lineto{\d@mX\unitlength}{\d@mY\unitlength}%
\@ifnextchar\lp@r{\p@lyline}{\strokepath\ignorespaces}}
+\providecommand\polygon{}
+\RenewDocumentCommand\polygon{s O{\beveljoin} }{\@killglue\begingroup
+\IfBooleanTF{#1}{\@tempswatrue}{\@tempswafalse}%
+\@polygon[#2]}
+
+\def\@polygon[#1](#2){\@killglue#1\GetCoord(#2)\d@mX\d@mY
+ \pIIe@moveto{\d@mX\unitlength}{\d@mY\unitlength}%
+ \@ifnextchar\lp@r{\@@polygon}{%
+ \PackageWarning{curve2e}%
+ {Polygons require at least two vertices!\MessageBreak
+ Control your polygon specification\MessageBreak}%
+ \ignorespaces}}
+
+ \def\@@polygon(#1){\GetCoord(#1)\d@mX\d@mY
+ \pIIe@lineto{\d@mX\unitlength}{\d@mY\unitlength}%
+ \@ifnextchar\lp@r{\@@polygon}{\pIIe@closepath
+ \if@tempswa\pIIe@fillGraph\else\pIIe@strokeGraph\fi
+ \endgroup
+ \ignorespaces}}
\def\GraphGrid(#1,#2){\bgroup\textcolor{red}{\linethickness{.1\p@}%
\RoundUp#1modulo10to\@GridWd \RoundUp#2modulo10to\@GridHt
\@tempcnta=\@GridWd \divide\@tempcnta10\relax \advance\@tempcnta\@ne