From b5cfe0628998f7a30d60ece2bc23d785102d6bc3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Apr 2020 21:04:37 +0000 Subject: picture (24apr20) git-svn-id: svn://tug.org/texlive/trunk@54867 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/picture/picture-example.tex | 5 ++- Master/texmf-dist/doc/latex/picture/picture.pdf | Bin 295737 -> 303758 bytes Master/texmf-dist/source/latex/picture/picture.dtx | 36 ++++++++++++++++----- Master/texmf-dist/tex/latex/picture/picture.sty | 20 +++++++++--- Master/tlpkg/libexec/ctan2tds | 8 ++++- 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/Master/texmf-dist/doc/latex/picture/picture-example.tex b/Master/texmf-dist/doc/latex/picture/picture-example.tex index 9dc5ac7d26d..41248f4adf6 100644 --- a/Master/texmf-dist/doc/latex/picture/picture-example.tex +++ b/Master/texmf-dist/doc/latex/picture/picture-example.tex @@ -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, diff --git a/Master/texmf-dist/doc/latex/picture/picture.pdf b/Master/texmf-dist/doc/latex/picture/picture.pdf index 7e500063e4e..755e580aef2 100644 Binary files a/Master/texmf-dist/doc/latex/picture/picture.pdf and b/Master/texmf-dist/doc/latex/picture/picture.pdf differ diff --git a/Master/texmf-dist/source/latex/picture/picture.dtx b/Master/texmf-dist/source/latex/picture/picture.dtx index 56cd8c8c477..7ffced525a0 100644 --- a/Master/texmf-dist/source/latex/picture/picture.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/tex/latex/picture/picture.sty b/Master/texmf-dist/tex/latex/picture/picture.sty index 14d2fee1654..00373abd441 100644 --- a/Master/texmf-dist/tex/latex/picture/picture.sty +++ b/Master/texmf-dist/tex/latex/picture/picture.sty @@ -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@calcname{calc} \def\Pc@etexname{etex} \def\Pc@plainname{plain} @@ -219,6 +218,19 @@ }{% \picture@redefine\@oval{(&1,&2)}% } +\@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)} +}{} \def\Pc@checkpackage#1{% \@ifpackageloaded{#1}{% }{% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 1e9b49fd1d2..032a98174e6 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2822,6 +2822,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; '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 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' '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 @@ sub runins { 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"; } } -- cgit v1.2.3