6 files changed, 259 insertions, 64 deletions
diff --git a/Master/texmf-dist/doc/latex/curve2e/README b/Master/texmf-dist/doc/latex/curve2e/README
index 3a0800ebf63..8392f572ae5 100644
--- a/Master/texmf-dist/doc/latex/curve2e/README
+++ b/Master/texmf-dist/doc/latex/curve2e/README
@@ -1,19 +1,56 @@
-Curve2e.sty
-version: 1.54
-filedate: 27 June 2015
+%%
+%% 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 BŽzier splines with their control nodes specified in polar form is available.
+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 version is fully compatible with pict2e version 0.2x dated 2011/05/01.
+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.    
-\ No newline at end of file
+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
new file mode 100644
index 00000000000..8392f572ae5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/curve2e/README.txt
@@ -0,0 +1,56 @@
+%%
+%% 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/curve2e.pdf b/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
index 23b401b7417..d36a9741152 100644
--- a/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
+++ b/Master/texmf-dist/doc/latex/curve2e/curve2e.pdf
diff --git a/Master/texmf-dist/doc/latex/curve2e/manifest.txt b/Master/texmf-dist/doc/latex/curve2e/manifest.txt
index b717de9f259..b8b6c6af2d4 100644
--- a/Master/texmf-dist/doc/latex/curve2e/manifest.txt
+++ b/Master/texmf-dist/doc/latex/curve2e/manifest.txt
@@ -1,34 +1,61 @@
+%%
+%% This is file `manifest.txt',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% curve2e.dtx  (with options: `manifest')
+%% 
+%%   Copyright (C)  2005--2015 Claudio Beccari  all rights reserved.
+%%   License information appended
+%% 
+File manifest.txt for package curve2e
+        [2015/07/11 v.1.60 Extension package for pict2e]
+
+
 The package bundle curve2e is composed of the following files
 
 curve2e.dtx
 curve2e.pdf
 mainfest.txt
-README
+README.txt
 
 Manifest.txt is this file.
 
-curve2e.dtx is the documented TeX source file of package curve2e.sty; you get both
-curve2e.sty and curve2e.pdf by running pdflatex on curve2e.dtx.
+curve2e.dtx is the documented TeX source file of file curve2e.sty; you get
+both curve2e.sty and curve2e.pdf by running pdflatex on curve2e.dtx.
 
-README contains general information
+README.txt contains general information.
 
 The package has the LPPL status of author maintained.
 
-This package is subject to the LaTeX Project Public Licence, LPPL, version 1.3 or any
-successive version.
-
-Therefore, according to the licence, you are entitled to modify this package, 
+According to the LPPL licence, you are entitled to modify this package,
 as long as you fulfil the few conditions set forth by the Licence.
 
-Nevertheless this package is an extension to the standard LaTeX package pict2e 
-(2014). Therefore  any change must be controlled  against the parent package 
-pict2e so as to avoid redefining what has already been incorporated in the 
-official package. 
+Nevertheless this package is an extension to the standard LaTeX package pict2e
+(2014). Therefore  any change must be controlled  against the parent package
+pict2e so as to avoid redefining what has already been incorporated in the
+official package.
 
 If you prefer sending me your modifications, as long as I will maintain this
-package, I will possibly include every (documented) suggestion or modification 
+package, I will possibly include every (documented) suggestion or modification
 into this package.
 
 Claudio Beccari
 
-claudio.beccari@gmail.com
-\ No newline at end of file
+claudio.beccari@gmail.com
+
+%% 
+%% 
+%% 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 `manifest.txt'.
diff --git a/Master/texmf-dist/source/latex/curve2e/curve2e.dtx b/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
index 55ef4c3f96b..9b2336f5c4f 100644
--- a/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
+++ b/Master/texmf-dist/source/latex/curve2e/curve2e.dtx
@@ -5,16 +5,14 @@
 \input docstrip.tex
 \keepsilent
 \preamble
-  ______________________________________________________
-  The curve2e package for LaTeX and XeLATeX
-  Copyright (C) 2010 Claudio Beccari 
-  All rights reserved
-  License information appended
 
+  Copyright (C)  2005--2015 Claudio Beccari  all rights reserved.
+  License information appended
+  
 \endpreamble
+
 \postamble
 
-Copyright 2005-2015 Claudio Beccari
 
 Distributable under the LaTeX Project Public License,
 version 1.3c or higher (your choice). The latest version of
@@ -22,30 +20,21 @@ this license is at: http://www.latex-project.org/lppl.txt
 
 This work is "author-maintained"
 
-This work consists of this file curve2e.dtx, a README file
-and the derived files curve2e.sty and curve2e.pdf.
+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.
 
 \endpostamble
 \askforoverwritefalse
 
 \generate{\file{curve2e.sty}{\from{curve2e.dtx}{package}}}
+\generate{\file{README.txt}{\from{curve2e.dtx}{readme}}}
+\generate{\file{manifest.txt}{\from{curve2e.dtx}{manifest}}}
 
 \def\tmpa{plain}
 \ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
 \endgroup
 %</internal>
-%
-%%
-%% File `curve2e.dtx'.
-%% Copyright (C)  2005--2015 Claudio Beccari  all rights reserved.
-%%
-% What follows is the usual trick that is not typeset in the documentation
-% dvi file that is produced by LaTeX. It is used to define the date, the version
-% and the short description that characterizes both this file and the package;
-% the point is that |\ProvidesFile| is being read only by the driver, while
-% |\ProvidePackage| goes to the stripped package file; it must be done before
-% starting the documentation otherwise |\GetFileInfo|  can't get the necessary
-% information.
 % \fi
 %
 % \iffalse
@@ -56,9 +45,11 @@ and the derived files curve2e.sty and curve2e.pdf.
 \ProvidesFile{curve2e.dtx}%
 %</driver>
 %<+package>\ProvidesPackage{curve2e}%
-%<*package>
-        [2015/06/27 v.1.54 Extension package for pict2e]
-%</package>
+%<+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]
+%</package|readme|manifest>
 %<*driver>
 \documentclass{ltxdoc}\errorcontextlines=9
 \hfuzz 10pt
@@ -85,7 +76,7 @@ and the derived files curve2e.sty and curve2e.pdf.
 \newcommand*\Pall[1][1.5]{\def\circdiam{#1}\@Pall}
    \def\@Pall(#1){\put(#1){\circle*{\circdiam}}}
 
-\def\legenda(#1,#2)#3{\put(#1,#2){\setbox3333\hbox{$#3$}%
+\def\legenda(#1)#2{\put(#1){\setbox3333\hbox{$#2$}%
    \dimen3333\dimexpr\wd3333*\p@/\unitlength +3\p@\relax
    \edef\@tempA{\strip@pt\dimen3333}%
    \framebox(\@tempA,7){\box3333}}}
@@ -109,7 +100,7 @@ and the derived files curve2e.sty and curve2e.pdf.
 %</driver>
 % \fi
 %
-% \CheckSum{3078}
+% \CheckSum{3087}
 % \begin{abstract}
 % This file documents the |curve2e| extension package to the recent
 % implementation of the |pict2e| bundle that has been described by Lamport
@@ -1060,7 +1051,18 @@ and the derived files curve2e.sty and curve2e.pdf.
 % \meta{angle\texttt{:}radius}. The |\put| command is redefined to accept
 % the same syntax; the whole work is done by |\SplitNod@|
 % and its subsidiaries.
-%    \begin{macrocode}
+% Notice that package |eso-pic| uses macros in its definitions but its
+% original macro |\LenToUnit| is incompatible with  this |\GetCoord| macro;
+% its function is to translate real lengths into coefficients to be used as
+% multipliers of the current |\unitlength|; in case that the |eso-pic|
+% had been loaded at the |\begin{document}| execution, the |eso-pic|
+% macro is redefined using the e-\TeX\ commands so as to make it compatible
+% with these local macros. Thanks to Franz-Joseph Berthold who was so kind
+% to spot the bug.
+%    \begin{macrocode}
+\AtBeginDocument{\@ifpackageloaded{eso-pic}{%
+\renewcommand\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}}{}}
+
 \def\GetCoord(#1)#2#3{%
 \expandafter\SplitNod@\expandafter(#1)#2#3\ignorespaces}
 %    \end{macrocode}
@@ -2794,7 +2796,8 @@ and the derived files curve2e.sty and curve2e.pdf.
 % |\CurveTo|,  that will become the main building block for a general path
 % construction macro, |\Curve|. 
 %
-% The ``naÃ¯ve'' macro |\CBezierTo| simply uses the previous point direction saved in |\@Dzero| as a unit vector by the starting macro; specifies
+% The ``naÃ¯ve'' macro |\CBezierTo| simply uses the previous point direction
+% saved in |\@Dzero| as a unit vector by the starting macro; specifies
 % a destination point, the distance of the first control point from the
 % starting point, the destination point direction that will save also for the
 % next arc drawing macro as a unit vector, and the distance of the second
@@ -3458,6 +3461,81 @@ and the derived files curve2e.sty and curve2e.pdf.
 %</package>
 %\fi
 %
+%\iffalse
+%<*manifest>
+%\fi
+%    \begin{macrocode}
+The package bundle curve2e is composed of the following files
+
+curve2e.dtx
+curve2e.pdf
+mainfest.txt
+README.txt
+
+Manifest.txt is this file.
+
+curve2e.dtx is the documented TeX source file of file curve2e.sty; you get 
+both curve2e.sty and curve2e.pdf by running pdflatex on curve2e.dtx.
+
+README.txt contains general information.
+
+The package has the LPPL status of author maintained.
+
+According to the LPPL licence, you are entitled to modify this package, 
+as long as you fulfil the few conditions set forth by the Licence.
+
+Nevertheless this package is an extension to the standard LaTeX package pict2e 
+(2014). Therefore  any change must be controlled  against the parent package 
+pict2e so as to avoid redefining what has already been incorporated in the 
+official package. 
+
+If you prefer sending me your modifications, as long as I will maintain this
+package, I will possibly include every (documented) suggestion or modification 
+into this package.
+
+Claudio Beccari
+
+claudio.beccari@gmail.com
+%    \end{macrocode}
+%\iffalse
+%</manifest>
+%\fi
+%
+%\iffalse
+%<*readme>
+%\fi
+%    \begin{macrocode}
+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.
+%    \end{macrocode}
+%\iffalse
+%</readme>
+%\fi
 % \Finale
 % \endinput
 
diff --git a/Master/texmf-dist/tex/latex/curve2e/curve2e.sty b/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
index 818c1e986c1..3a72e84ffd2 100644
--- a/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
+++ b/Master/texmf-dist/tex/latex/curve2e/curve2e.sty
@@ -5,19 +5,13 @@
 %% The original source files were:
 %%
 %% curve2e.dtx  (with options: `package')
-%%   ______________________________________________________
-%%   The curve2e package for LaTeX and XeLATeX
-%%   Copyright (C) 2010 Claudio Beccari
-%%   All rights reserved
+%% 
+%%   Copyright (C)  2005--2015 Claudio Beccari  all rights reserved.
 %%   License information appended
 %% 
-%%
-%% File `curve2e.dtx'.
-%% Copyright (C)  2005--2015 Claudio Beccari  all rights reserved.
-%%
 \NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesPackage{curve2e}%
-        [2015/06/27 v.1.54 Extension package for pict2e]
+        [2015/07/11 v.1.60 Extension package for pict2e]
 
 
 \RequirePackage{color}
@@ -100,6 +94,9 @@
 
 \def\Dotline@@(#1)(#2)#3{\put(#1){\Dotline@(0,0)(#2){#3}}}
 \fi
+\AtBeginDocument{\@ifpackageloaded{eso-pic}{%
+\renewcommand\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}}{}}
+
 \def\GetCoord(#1)#2#3{%
 \expandafter\SplitNod@\expandafter(#1)#2#3\ignorespaces}
 \def\isnot@polar#1:#2!!{\def\@tempOne{#2}\ifx\@tempOne\empty
@@ -869,7 +866,6 @@
 \ignorespaces}
 
 %% 
-%% Copyright 2005-2015 Claudio Beccari
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -877,8 +873,9 @@
 %% 
 %% This work is "author-maintained"
 %% 
-%% This work consists of this file curve2e.dtx, a README file
-%% and the derived files curve2e.sty and curve2e.pdf.
+%% 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 `curve2e.sty'.