CTAN sync 202004240303

2 files changed, 28 insertions, 8 deletions

diff --git a/macros/latex/contrib/picture/picture.dtx b/macros/latex/contrib/picture/picture.dtx
index 56cd8c8c47..7ffced525a 100644
--- a/macros/latex/contrib/picture/picture.dtx
+++ b/macros/latex/contrib/picture/picture.dtx
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: picture.dtx
-% Version: 2019/12/09 v1.5
+% Version: 2020-04-22 v1.6
 % Info: Dimens for picture macros
 %
 % Copyright (C)
 %    2006-2009 Heiko Oberdiek
-%    2016-2019 Oberdiek Package Support Group
+%    2016-2020 Oberdiek Package Support Group
 %    https://github.com/ho-tex/picture/issues
 %
 % This work may be distributed and/or modified under the
@@ -81,7 +81,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: picture 2019/12/09 v1.5 Dimens for picture macros (HO)}
+\Msg{* Package: picture 2020-04-22 v1.6 Dimens for picture macros (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -93,11 +93,11 @@
 This is a generated file.
 
 Project: picture
-Version: 2019/12/09 v1.5
+Version: 2020-04-22 v1.6
 
 Copyright (C)
    2006-2009 Heiko Oberdiek
-   2016-2019 Oberdiek Package Support Group
+   2016-2020 Oberdiek Package Support Group
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -157,7 +157,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{picture.drv}%
-  [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+  [2020-04-22 v1.6 Dimens for picture macros (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -171,7 +171,7 @@ and the derived files
 % \GetFileInfo{picture.drv}
 %
 % \title{The \xpackage{picture} package}
-% \date{2019/12/09 v1.5}
+% \date{2020-04-22 v1.6}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/picture/issues}}}
 %
@@ -268,7 +268,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{picture}%
-  [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+  [2020-04-22 v1.6 Dimens for picture macros (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Options}
@@ -546,6 +546,23 @@ and the derived files
 }
 %    \end{macrocode}
 %
+% \subsubsection{Package \xpackage{pict2e}}
+% Additions suggested in https://github.com/ho-tex/picture/issues/1
+%    \begin{macrocode}
+\@ifpackageloaded{pict2e}{%
+  \AtBeginDocument{%
+    \picture@redefine\@cbezier{[#1](&2,&3)(&4,&5)(&6,&7)(&8,&9)}%
+  }
+  \picture@redefine\pIIe@arc@@{(#1,#2)&3}
+  \picture@redefine\polyline{(&1,&2)}
+  \picture@redefine\@polyline{(&1,&2)}
+  \picture@redefine\@polygon{(&1,&2)}
+  \picture@redefine\@@polygon{(&1,&2)}
+  \picture@redefine\moveto{(&1,&2)}
+  \picture@redefine\lineto{(&1,&2)}
+  \picture@redefine\curveto{(&1,&2)(&3,&4)(&5,&6)}
+}{}
+%    \end{macrocode}
 % \subsection{Check package loading order}
 %
 %    \begin{macro}{\PC@checkpackage}
@@ -764,6 +781,9 @@ and the derived files
 %   \item
 %     Documentation updates.
 %   \end{Version}
+%   \begin{Version}{2020-04-22 v1.6}
+%   \item Added definitions for pict2e (https://github.com/ho-tex/picture/issues/1)
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/picture/picture.pdf b/macros/latex/contrib/picture/picture.pdf
index 7e500063e4..755e580aef 100644
--- a/macros/latex/contrib/picture/picture.pdf
+++ b/macros/latex/contrib/picture/picture.pdf