texlive[54867] Master: picture (24apr20)
commits+karl at tug.org
commits+karl at tug.org
Fri Apr 24 23:04:37 CEST 2020
Revision: 54867
http://tug.org/svn/texlive?view=revision&revision=54867
Author: karl
Date: 2020-04-24 23:04:37 +0200 (Fri, 24 Apr 2020)
Log Message:
-----------
picture (24apr20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex
trunk/Master/texmf-dist/doc/latex/picture/picture.pdf
trunk/Master/texmf-dist/source/latex/picture/picture.dtx
trunk/Master/texmf-dist/tex/latex/picture/picture.sty
trunk/Master/tlpkg/libexec/ctan2tds
Modified: trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex 2020-04-24 20:59:23 UTC (rev 54866)
+++ trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex 2020-04-24 21:04:37 UTC (rev 54867)
@@ -9,11 +9,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
@@ -31,7 +31,6 @@
%% Heiko Oberdiek and the Oberdiek Package Support Group
%% https://github.com/ho-tex/picture/issues
%%
-%%
%% This work consists of the main source file picture.dtx
%% and the derived files
%% picture.sty, picture.pdf, picture.ins, picture.drv,
Modified: trunk/Master/texmf-dist/doc/latex/picture/picture.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/picture/picture.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/picture/picture.dtx 2020-04-24 20:59:23 UTC (rev 54866)
+++ trunk/Master/texmf-dist/source/latex/picture/picture.dtx 2020-04-24 21:04:37 UTC (rev 54867)
@@ -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 @@
%<*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 @@
% \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 @@
%<*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 @@
}
% \end{macrocode}
%
+% \subsubsection{Package \xpackage{pict2e}}
+% Additions suggested in https://github.com/ho-tex/picture/issues/1
+% \begin{macrocode}
+\@ifpackageloaded{pict2e}{%
+ \AtBeginDocument{%
+ \picture at redefine\@cbezier{[#1](&2,&3)(&4,&5)(&6,&7)(&8,&9)}%
+ }
+ \picture at redefine\pIIe at arc@@{(#1,#2)&3}
+ \picture at redefine\polyline{(&1,&2)}
+ \picture at redefine\@polyline{(&1,&2)}
+ \picture at redefine\@polygon{(&1,&2)}
+ \picture at redefine\@@polygon{(&1,&2)}
+ \picture at redefine\moveto{(&1,&2)}
+ \picture at redefine\lineto{(&1,&2)}
+ \picture at redefine\curveto{(&1,&2)(&3,&4)(&5,&6)}
+}{}
+% \end{macrocode}
% \subsection{Check package loading order}
%
% \begin{macro}{\PC at checkpackage}
@@ -764,6 +781,9 @@
% \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
Modified: trunk/Master/texmf-dist/tex/latex/picture/picture.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/picture/picture.sty 2020-04-24 20:59:23 UTC (rev 54866)
+++ trunk/Master/texmf-dist/tex/latex/picture/picture.sty 2020-04-24 21:04:37 UTC (rev 54867)
@@ -9,11 +9,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
@@ -31,7 +31,6 @@
%% Heiko Oberdiek and the Oberdiek Package Support Group
%% https://github.com/ho-tex/picture/issues
%%
-%%
%% This work consists of the main source file picture.dtx
%% and the derived files
%% picture.sty, picture.pdf, picture.ins, picture.drv,
@@ -39,7 +38,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{picture}%
- [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+ [2020-04-22 v1.6 Dimens for picture macros (HO)]%
\def\Pc at calcname{calc}
\def\Pc at etexname{etex}
\def\Pc at plainname{plain}
@@ -219,6 +218,19 @@
}{%
\picture at redefine\@oval{(&1,&2)}%
}
+\@ifpackageloaded{pict2e}{%
+ \AtBeginDocument{%
+ \picture at redefine\@cbezier{[#1](&2,&3)(&4,&5)(&6,&7)(&8,&9)}%
+ }
+ \picture at redefine\pIIe at arc@@{(#1,#2)&3}
+ \picture at redefine\polyline{(&1,&2)}
+ \picture at redefine\@polyline{(&1,&2)}
+ \picture at redefine\@polygon{(&1,&2)}
+ \picture at redefine\@@polygon{(&1,&2)}
+ \picture at redefine\moveto{(&1,&2)}
+ \picture at redefine\lineto{(&1,&2)}
+ \picture at redefine\curveto{(&1,&2)(&3,&4)(&5,&6)}
+}{}
\def\Pc at checkpackage#1{%
\@ifpackageloaded{#1}{%
}{%
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2020-04-24 20:59:23 UTC (rev 54866)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2020-04-24 21:04:37 UTC (rev 54867)
@@ -2822,6 +2822,7 @@
'pageslts' => 'tex -translate-file=empty.tcx', # no 8-bit
'papermas' => 'tex',
'pauldoc' => 'latex', # requires interaction
+ 'picture' => 'etex',
'placeat' => 'luatex',
'poemscol' => 'latex', # requires interaction
'polski' => 'latex', # requires interaction
@@ -3347,7 +3348,6 @@
'accfonts' => $standardclean . '|dvips.enc', # dup enc
'acmconf' => $standardclean . '|flushend.sty', # dup with sttools
'apalike' => "apalike2.bst", # does not belong
- 'askinclude' => $standardclean . '|askinclude\.(drv|ins)', # made from dtx
'axodraw2' => 'axohelp.exe', # done with binaries
'bardiag' => "example/.*(aux|log)", # junk on CTAN
'bibleref' => $standardclean . '|sample.tex|sample-.*', # derived uploaded
@@ -3879,6 +3879,12 @@
if (! grep (/$package\.ins$/, @filenames) && -r "$package.ins") {
#&runjob ("yes | sed 10q | $env_mktex $insrunner $package.ins");
&runjob ("$invoke_insrunner $package.ins");
+ # and this will normally create .drv and .ins files,
+ # which don't need to be distributed.
+ $specialclean{$package}
+ = $standardclean . "|$package\.(drv|ins)\$" # made from dtx
+ if ! exists $specialclean{$package};
+ warn "set specialclean{$package} = $specialclean{$package}\n";
}
}
More information about the tex-live-commits
mailing list.