texlive[53081] Master: picture split from oberdiek (10dec19)

commits+karl at tug.org commits+karl at tug.org
Tue Dec 10 23:10:21 CET 2019


Revision: 53081
          http://tug.org/svn/texlive?view=revision&revision=53081
Author:   karl
Date:     2019-12-10 23:10:21 +0100 (Tue, 10 Dec 2019)
Log Message:
-----------
picture split from oberdiek (10dec19)

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tlpkg-ctan-check
    trunk/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/picture/
    trunk/Master/texmf-dist/doc/latex/picture/README.md
    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/
    trunk/Master/texmf-dist/source/latex/picture/picture.dtx
    trunk/Master/texmf-dist/tex/latex/picture/
    trunk/Master/texmf-dist/tex/latex/picture/picture.sty
    trunk/Master/tlpkg/tlpsrc/picture.tlpsrc

Added: trunk/Master/texmf-dist/doc/latex/picture/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/picture/README.md	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/picture/README.md	2019-12-10 22:10:21 UTC (rev 53081)
@@ -0,0 +1,11 @@
+# picture
+
+picture package for LaTeX
+
+
+There are macro and environment arguments that expect numbers
+that will internally be multiplicated with \unitlength.
+This package extends the syntax of these arguments that
+dimens with calculation support can be added for these arguments.
+
+


Property changes on: trunk/Master/texmf-dist/doc/latex/picture/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex	2019-12-10 22:10:21 UTC (rev 53081)
@@ -0,0 +1,61 @@
+%%
+%% This is file `picture-example.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% picture.dtx  (with options: `example')
+%% 
+%% This is a generated file.
+%% 
+%% Project: picture
+%% Version: 2019/12/09 v1.5
+%% 
+%% Copyright (C)
+%%    2006-2009 Heiko Oberdiek
+%%    2016-2019 Oberdiek Package Support Group
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    https://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainers of this work are
+%% 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,
+%%    picture-example.tex.
+%% 
+\documentclass{article}
+
+\usepackage[calc]{picture}
+
+\begin{document}
+
+\setlength{\unitlength}{1pt}
+
+\begin{picture}(\widthof{Hello World}, 10mm)
+  \put(0, 0){\makebox(0,0)[lb]{Hello World}}%
+  \put(0, \heightof{Hello World} + \fboxsep){%
+    \line(1, 0){\widthof{Hello World}}%
+  }%
+  \put(\widthof{Hello World}, 10mm){%
+    \line(0, -1){10mm}%
+  }%
+\end{picture}
+
+\end{document}
+\endinput
+%%
+%% End of file `picture-example.tex'.


Property changes on: trunk/Master/texmf-dist/doc/latex/picture/picture-example.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/picture/picture.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/latex/picture/picture.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/picture/picture.pdf	2019-12-10 22:08:55 UTC (rev 53080)
+++ trunk/Master/texmf-dist/doc/latex/picture/picture.pdf	2019-12-10 22:10:21 UTC (rev 53081)

Property changes on: trunk/Master/texmf-dist/doc/latex/picture/picture.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/source/latex/picture/picture.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/picture/picture.dtx	                        (rev 0)
+++ trunk/Master/texmf-dist/source/latex/picture/picture.dtx	2019-12-10 22:10:21 UTC (rev 53081)
@@ -0,0 +1,772 @@
+% \iffalse meta-comment
+%
+% File: picture.dtx
+% Version: 2019/12/09 v1.5
+% Info: Dimens for picture macros
+%
+% Copyright (C)
+%    2006-2009 Heiko Oberdiek
+%    2016-2019 Oberdiek Package Support Group
+%    https://github.com/ho-tex/picture/issues
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any later
+% version. This version of this license is in
+%    https://www.latex-project.org/lppl/lppl-1-3c.txt
+% and the latest version of this license is in
+%    https://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of
+% LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainers of this work are
+% 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,
+%    picture-example.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/picture/picture.dtx
+%    CTAN:macros/latex/contrib/picture/picture.pdf
+%
+% Unpacking:
+%    (a) If picture.ins is present:
+%           tex picture.ins
+%    (b) Without picture.ins:
+%           tex picture.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{picture.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If picture.drv is present:
+%           latex picture.drv
+%    (b) Without picture.drv:
+%           latex picture.dtx; ...
+%    The class ltxdoc loads the configuration file ltxdoc.cfg
+%    if available. Here you can specify further options, e.g.
+%    use A4 as paper format:
+%       \PassOptionsToClass{a4paper}{article}
+%
+%    Programm calls to get the documentation (example):
+%       pdflatex picture.dtx
+%       makeindex -s gind.ist picture.idx
+%       pdflatex picture.dtx
+%       makeindex -s gind.ist picture.idx
+%       pdflatex picture.dtx
+%
+% Installation:
+%    TDS:tex/latex/picture/picture.sty
+%    TDS:doc/latex/picture/picture.pdf
+%    TDS:doc/latex/picture/picture-example.tex
+%    TDS:source/latex/picture/picture.dtx
+%
+%<*ignore>
+\begingroup
+  \catcode123=1 %
+  \catcode125=2 %
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: picture 2019/12/09 v1.5 Dimens for picture macros (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\let\MetaPrefix\relax
+\preamble
+
+This is a generated file.
+
+Project: picture
+Version: 2019/12/09 v1.5
+
+Copyright (C)
+   2006-2009 Heiko Oberdiek
+   2016-2019 Oberdiek Package Support Group
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3c of this license or (at your option) any later
+version. This version of this license is in
+   https://www.latex-project.org/lppl/lppl-1-3c.txt
+and the latest version of this license is in
+   https://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+
+This work has the LPPL maintenance status "maintained".
+
+The Current Maintainers of this work are
+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,
+   picture-example.tex.
+
+\endpreamble
+\let\MetaPrefix\DoubleperCent
+
+\generate{%
+  \file{picture.ins}{\from{picture.dtx}{install}}%
+  \file{picture.drv}{\from{picture.dtx}{driver}}%
+  \usedir{tex/latex/picture}%
+  \file{picture.sty}{\from{picture.dtx}{package}}%
+  \usedir{doc/latex/picture}%
+  \file{picture-example.tex}{\from{picture.dtx}{example}}%
+}
+
+\catcode32=13\relax% active space
+\let =\space%
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     picture.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `picture.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{picture.drv}%
+  [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}[2011/11/22]
+\begin{document}
+  \DocInput{picture.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+%
+%
+% \GetFileInfo{picture.drv}
+%
+% \title{The \xpackage{picture} package}
+% \date{2019/12/09 v1.5}
+% \author{Heiko Oberdiek\thanks
+% {Please report any issues at \url{https://github.com/ho-tex/picture/issues}}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% There are macro and environment arguments that expect numbers
+% that will internally be multiplicated with \cs{unitlength}.
+% This package extends the syntax of these arguments that
+% dimens with calculation support can be added for these arguments.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{User interface}
+%
+% \subsection{Introduction}
+%
+% The environment |picture| and macros such as \cs{put}, \cs{line},
+% \cs{vector} and other macros have arguments that expect numbers
+% that are used as factor for \cs{unitlength}.
+% This package redefines such macros and adds code that detects
+% whether such an argument is given as number or as length.
+% In the latter case, the length is used directly without multiplying
+% with \cs{unitlength}.
+%
+% \subsection{Options}
+%
+% Depending on the available features, also length expressions
+% can be given. Option \xoption{calc} loads package \xpackage{calc}.
+% Then expressions of these package may be used.
+% Otherwise \xoption{etex} wraps the length argument inside
+% \cs{dimexpr}\dots\cs{relax}, if \eTeX\ is available. Otherwise
+% option \xoption{plain} uses plain assignments without calculation
+% support.
+%
+% The default is \xoption{calc} if package \xpackage{calc}
+% is loaded before package \xoption{picture}. If you specify
+% option \xoption{calc} the loading of \xpackage{calc} is ensured.
+% Otherwise package \xpackage{picture} looks whether \cs{dimexpr}
+% is available and uses then option \xoption{etex} as default.
+% If \eTeX\ also could not be found, then \xoption{plain} is used.
+%
+% \subsection{Example}
+%
+%    \begin{macrocode}
+%<*example>
+\documentclass{article}
+
+\usepackage[calc]{picture}
+
+\begin{document}
+
+\setlength{\unitlength}{1pt}
+
+\begin{picture}(\widthof{Hello World}, 10mm)
+  \put(0, 0){\makebox(0,0)[lb]{Hello World}}%
+  \put(0, \heightof{Hello World} + \fboxsep){%
+    \line(1, 0){\widthof{Hello World}}%
+  }%
+  \put(\widthof{Hello World}, 10mm){%
+    \line(0, -1){10mm}%
+  }%
+\end{picture}
+
+\end{document}
+%</example>
+%    \end{macrocode}
+%
+% \subsection{Supported packages}
+%
+% Packages \xpackage{pspicture} and \xpackage{pict2e} are supported,
+% but they must be loaded before package \xpackage{picture}.
+%
+% New macros can be supported by \cs{picture at redefine}.
+% The first argument is the macro which contains the arguments
+% in its parameter text that you want to support by package \xpackage{picture}.
+% The second argument contains the parameter text. Change \# to \& for
+% the arguments in question.
+% Examples (already used by package \xpackage{picture}):
+% \begin{quote}
+% |\picture at redefine\put{(&1,&2)}|\\
+% |\picture at redefine\line{(#1,#2)&3}|
+% \end{quote}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \subsection{Identification}
+%
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{picture}%
+  [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+%    \end{macrocode}
+%
+% \subsection{Options}
+%
+%    \begin{macrocode}
+\def\Pc at calcname{calc}
+\def\Pc at etexname{etex}
+\def\Pc at plainname{plain}
+%    \end{macrocode}
+%    \begin{macro}{\Pc at method}
+%    Macro \cs{Pc at method} stores the method to use for calculations.
+%    Check which features are available and set the default for \cs{Pc at method}.
+%    \begin{macrocode}
+\@ifpackageloaded{calc}{%
+  \let\Pc at method\Pc at calcname
+}{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname dimexpr\endcsname\relax
+    \let\Pc at method\Pc at plainname
+  \else
+    \let\Pc at method\Pc at etexname
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+\DeclareOption{plain}{%
+  \let\Pc at method\Pc at plainname
+}
+\DeclareOption{etex}{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname dimexpr\endcsname\relax
+    \PackageError{picture}{%
+      e-TeX is not available%
+    }\@ehc
+  \else
+    \let\Pc at method\Pc at etexname
+  \fi
+}
+\DeclareOption{calc}{%
+  \let\Pc at method\Pc at calcname
+}
+\ProcessOptions*
+\begingroup
+  \let\on at line\@empty
+  \PackageInfo{picture}{Calculation method: \Pc at method}%
+\endgroup
+%    \end{macrocode}
+%
+% \subsection{Calculation method}
+%
+%    \begin{macrocode}
+\ifx\Pc at method\Pc at calcname
+  \RequirePackage{calc}%
+\fi
+%    \end{macrocode}
+%
+% \subsubsection{Method \xoption{calc}}
+%
+%    \begin{macrocode}
+\ifx\Pc at method\Pc at calcname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \let\calc at error\Pc at calc@error
+      \setlength\dimen@{#1\unitlength}\Pc at next\Pc at nil{#1}%
+  }%
+  \let\PcOrg at calc@error\calc at error
+  \@ifpackagelater{calc}{2007/08/22}{% v4.3
+    \def\Pc at calc@error#1{%
+      \expandafter\ifx\expandafter\unitlength\noexpand#1\relax
+        \def\calc at next##1!{%
+          \endgroup
+          \aftergroup\afterassignment
+          \aftergroup\Pc at next
+        }%
+        \expandafter\@firstoftwo
+      \else
+        \expandafter\@secondoftwo
+      \fi
+      {%
+        \calc at next{#1}%
+      }{%
+        \PcOrg at calc@error{#1}%
+      }%
+    }%
+  }{%
+    \def\Pc at calc@error#1{%
+      \expandafter\ifx\expandafter\unitlength\noexpand#1\relax
+        \def\calc at next##1!{%
+          \endgroup
+          \aftergroup\afterassignment
+          \aftergroup\Pc at next
+        }%
+        \expandafter\@gobble
+      \else
+        \expandafter\@firstofone
+      \fi
+      {%
+        \PcOrg at calc@error{#1}%
+      }%
+    }%
+  }%
+\fi
+%    \end{macrocode}
+%
+% \subsubsection{Method \xoption{etex}}
+%
+%    \begin{macrocode}
+\ifx\Pc at method\Pc at etexname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \afterassignment\Pc at next
+      \dimen@=\dimexpr#1\unitlength\Pc at nil{#1}%
+  }%
+\fi
+%    \end{macrocode}
+%
+% \subsubsection{Method \xoption{plain}}
+%
+%    \begin{macrocode}
+\ifx\Pc at method\Pc at plainname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \afterassignment\Pc at next
+      \dimen@=#1\unitlength\Pc at nil{#1}%
+  }%
+\fi
+%    \end{macrocode}
+%
+% \subsubsection{Help macros}
+%
+%    \begin{macrocode}
+\def\Pc at next#1\Pc at nil#2{%
+  \ifx\\#1\\%
+    \endgroup
+    \Pc at addtoks{{#2}}%
+  \else
+    \expandafter\endgroup
+    \expandafter\Pc at addtoks\expandafter{%
+      \expandafter{\the\dimen@\@gobble}%
+    }%
+  \fi
+}
+%    \end{macrocode}
+%    \begin{macro}{\Pc at nil}
+%    \cs{Pc at nil} must not have the meaning of \cs{relax} because of
+%    \cs{dimexpr}.
+%    \begin{macrocode}
+\let\Pc at nil\message
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at addtoks}
+%    \begin{macrocode}
+\def\Pc at addtoks#1{%
+  \toks@=\expandafter{\the\toks@#1}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at init}
+%    \begin{macrocode}
+\def\Pc at init#1{%
+  \begingroup
+    \toks@={#1}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at finish}
+%    \begin{macrocode}
+\def\Pc at finish#1{%
+  \expandafter\endgroup
+  \expandafter#1\the\toks@
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Redefinitions}
+%
+%    \begin{macro}{\picture at redefine}
+%    \begin{tabular}[t]{@{}l@{ }l@{}}
+%    |#1|:& command name\\
+%    |#2|:& parameter text, length parameter with \& instead of \#
+%    \end{tabular}
+%    \begin{macrocode}
+\def\picture at redefine#1#2{%
+  \begingroup
+    \edef\reserved at a{%
+      \noexpand\noexpand
+      \expandafter\noexpand
+          \csname PcOrg@\expandafter\@gobble\string#1\endcsname
+    }%
+    \toks0{#1}%
+    \Pc at first#2&0%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at first}
+%    \begin{macrocode}
+\def\Pc at first#1&{%
+  \toks1={#1}%
+  \toks2={\Pc at init{#1}}%
+  \Pc at scanlength
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at scanlength}
+%    |#1|: number of length parameter or zero
+%    \begin{macrocode}
+\def\Pc at scanlength#1{%
+  \ifcase#1 %
+    \expandafter\Pc at last
+  \else
+    \toks1=\expandafter{\the\toks1 ###1}%
+    \toks2=\expandafter{\the\toks2 \Pc at tokslength{###1}}%
+    \expandafter\Pc at scannext
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at scannext}
+%    \begin{macrocode}
+\def\Pc at scannext#1&{%
+  \ifx\\#1\\%
+  \else
+    \toks1=\expandafter{\the\toks1 #1}%
+    \toks2=\expandafter{\the\toks2 \Pc at addtoks{#1}}%
+  \fi
+  \Pc at scanlength
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Pc at last}
+%    \begin{macrocode}
+\def\Pc at last{%
+  \edef\x{%
+    \endgroup
+    \let\reserved at a\the\toks0 %
+    \def\the\toks0 \the\toks1 {%
+      \the\toks2 %
+      \noexpand\Pc at finish\reserved at a
+    }%
+  }%
+  \x
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{\LaTeX\ base macros}
+%
+%    \begin{macrocode}
+\picture at redefine\@picture{(&1,&2)(&3,&4)}
+\picture at redefine\put{(&1,&2)}
+\picture at redefine\multiput{(&1,&2)}
+\picture at redefine\@multiput{(&1,&2)}
+\picture at redefine\line{(#1,#2)&3}
+\picture at redefine\vector{(#1,#2)&3}
+\picture at redefine\dashbox{&1(&2,&3)}
+\picture at redefine\@circle{&1}
+\picture at redefine\@dot{&1}
+\picture at redefine\@bezier{#1(&2,&3)(&4,&5)(&6,&7)}
+\picture at redefine\@imakepicbox{(&1,&2)}
+%    \end{macrocode}
+%
+% \subsubsection{Package \xpackage{pspicture}}
+%
+%     Package \xpackage{pspicture} changes the signature of \cs{@oval}
+%     by adding an optional argument.
+%    \begin{macrocode}
+\@ifpackageloaded{pspicture}{%
+  \picture at redefine\@oval{[&1](&2,&3)}%
+  \picture at redefine\Line{(&1,&2)}%
+  \picture at redefine\Curve{(&1,&2)}%
+  \picture at redefine\Vector{(&1,&2)}%
+}{%
+  \picture at redefine\@oval{(&1,&2)}%
+}
+%    \end{macrocode}
+%
+% \subsection{Check package loading order}
+%
+%    \begin{macro}{\PC at checkpackage}
+%    \begin{macrocode}
+\def\Pc at checkpackage#1{%
+  \@ifpackageloaded{#1}{%
+  }{%
+    \AtBeginDocument{%
+      \@ifpackageloaded{#1}{%
+        \PackageWarningNoLine{picture}{%
+          Package `#1' is loaded after `picture'.\MessageBreak
+          Load package `picture' afterwards to get full support%
+          \MessageBreak
+          of its additional syntax with length specifications%
+        }%
+      }{}%
+    }%
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+\Pc at checkpackage{pict2e}
+\Pc at checkpackage{pspicture}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\CTANpkg{picture}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/picture/picture.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/picture/picture.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `picture'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTANinstall{install/macros/latex/contrib/picture.tds.zip}]
+% \end{description}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTANpkg{tds}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{picture.tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip picture.tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+%   \verb|tex picture.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+%   picture.sty & tex/latex/picture/picture.sty\\
+%   picture.pdf & doc/latex/picture/picture.pdf\\
+%   picture-example.tex & doc/latex/picture/picture-example.tex\\
+%   picture.dtx & source/latex/picture/picture.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+%   \begingroup
+%     \advance\linewidth by\leftmargin
+%     \advance\linewidth by\rightmargin
+%   \edef\x{\endgroup
+%     \def\noexpand\lw{\the\linewidth}^^A
+%   }\x
+%   \def\lwbox{^^A
+%     \leavevmode
+%     \hbox to \linewidth{^^A
+%       \kern-\leftmargin\relax
+%       \hss
+%       \usebox0
+%       \hss
+%       \kern-\rightmargin\relax
+%     }^^A
+%   }^^A
+%   \ifdim\wd0>\lw
+%     \sbox0{\small\t}^^A
+%     \ifdim\wd0>\linewidth
+%       \ifdim\wd0>\lw
+%         \sbox0{\footnotesize\t}^^A
+%         \ifdim\wd0>\linewidth
+%           \ifdim\wd0>\lw
+%             \sbox0{\scriptsize\t}^^A
+%             \ifdim\wd0>\linewidth
+%               \ifdim\wd0>\lw
+%                 \sbox0{\tiny\t}^^A
+%                 \ifdim\wd0>\linewidth
+%                   \lwbox
+%                 \else
+%                   \usebox0
+%                 \fi
+%               \else
+%                 \lwbox
+%               \fi
+%             \else
+%               \usebox0
+%             \fi
+%           \else
+%             \lwbox
+%           \fi
+%         \else
+%           \usebox0
+%         \fi
+%       \else
+%         \lwbox
+%       \fi
+%     \else
+%       \usebox0
+%     \fi
+%   \else
+%     \lwbox
+%   \fi
+% \else
+%   \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\TeX\,Live, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \TeX\,Live\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+%   \verb|latex \let\install=y\input{picture.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+%   \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex picture.dtx
+%makeindex -s gind.ist picture.idx
+%pdflatex picture.dtx
+%makeindex -s gind.ist picture.idx
+%pdflatex picture.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{History}
+%   \begin{Version}{2006/08/26 v1.0}
+%   \item
+%     First released version. (First start of the project was June/July 2002.)
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
+%   \begin{Version}{2008/11/26 v1.2}
+%   \item
+%     Package \xpackage{pict2e} added to documentation section ``Supported
+%     packages''.
+%   \item
+%     Package order of supported packages is checked.
+%   \end{Version}
+%   \begin{Version}{2009/10/11 v1.3}
+%   \item
+%     Fix because of new version v4.3 of package \xpackage{calc}.
+%   \end{Version}
+%   \begin{Version}{2016/05/16 v1.4}
+%   \item
+%     Documentation updates.
+%   \end{Version}
+%   \begin{Version}{2019/12/09 v1.5}
+%   \item
+%     Documentation updates.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput


Property changes on: trunk/Master/texmf-dist/source/latex/picture/picture.dtx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/picture/picture.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/picture/picture.sty	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/picture/picture.sty	2019-12-10 22:10:21 UTC (rev 53081)
@@ -0,0 +1,241 @@
+%%
+%% This is file `picture.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% picture.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Project: picture
+%% Version: 2019/12/09 v1.5
+%% 
+%% Copyright (C)
+%%    2006-2009 Heiko Oberdiek
+%%    2016-2019 Oberdiek Package Support Group
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    https://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainers of this work are
+%% 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,
+%%    picture-example.tex.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{picture}%
+  [2019/12/09 v1.5 Dimens for picture macros (HO)]%
+\def\Pc at calcname{calc}
+\def\Pc at etexname{etex}
+\def\Pc at plainname{plain}
+\@ifpackageloaded{calc}{%
+  \let\Pc at method\Pc at calcname
+}{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname dimexpr\endcsname\relax
+    \let\Pc at method\Pc at plainname
+  \else
+    \let\Pc at method\Pc at etexname
+  \fi
+}
+\DeclareOption{plain}{%
+  \let\Pc at method\Pc at plainname
+}
+\DeclareOption{etex}{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname dimexpr\endcsname\relax
+    \PackageError{picture}{%
+      e-TeX is not available%
+    }\@ehc
+  \else
+    \let\Pc at method\Pc at etexname
+  \fi
+}
+\DeclareOption{calc}{%
+  \let\Pc at method\Pc at calcname
+}
+\ProcessOptions*
+\begingroup
+  \let\on at line\@empty
+  \PackageInfo{picture}{Calculation method: \Pc at method}%
+\endgroup
+\ifx\Pc at method\Pc at calcname
+  \RequirePackage{calc}%
+\fi
+\ifx\Pc at method\Pc at calcname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \let\calc at error\Pc at calc@error
+      \setlength\dimen@{#1\unitlength}\Pc at next\Pc at nil{#1}%
+  }%
+  \let\PcOrg at calc@error\calc at error
+  \@ifpackagelater{calc}{2007/08/22}{% v4.3
+    \def\Pc at calc@error#1{%
+      \expandafter\ifx\expandafter\unitlength\noexpand#1\relax
+        \def\calc at next##1!{%
+          \endgroup
+          \aftergroup\afterassignment
+          \aftergroup\Pc at next
+        }%
+        \expandafter\@firstoftwo
+      \else
+        \expandafter\@secondoftwo
+      \fi
+      {%
+        \calc at next{#1}%
+      }{%
+        \PcOrg at calc@error{#1}%
+      }%
+    }%
+  }{%
+    \def\Pc at calc@error#1{%
+      \expandafter\ifx\expandafter\unitlength\noexpand#1\relax
+        \def\calc at next##1!{%
+          \endgroup
+          \aftergroup\afterassignment
+          \aftergroup\Pc at next
+        }%
+        \expandafter\@gobble
+      \else
+        \expandafter\@firstofone
+      \fi
+      {%
+        \PcOrg at calc@error{#1}%
+      }%
+    }%
+  }%
+\fi
+\ifx\Pc at method\Pc at etexname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \afterassignment\Pc at next
+      \dimen@=\dimexpr#1\unitlength\Pc at nil{#1}%
+  }%
+\fi
+\ifx\Pc at method\Pc at plainname
+  \def\Pc at tokslength#1{%
+    \begingroup
+      \afterassignment\Pc at next
+      \dimen@=#1\unitlength\Pc at nil{#1}%
+  }%
+\fi
+\def\Pc at next#1\Pc at nil#2{%
+  \ifx\\#1\\%
+    \endgroup
+    \Pc at addtoks{{#2}}%
+  \else
+    \expandafter\endgroup
+    \expandafter\Pc at addtoks\expandafter{%
+      \expandafter{\the\dimen@\@gobble}%
+    }%
+  \fi
+}
+\let\Pc at nil\message
+\def\Pc at addtoks#1{%
+  \toks@=\expandafter{\the\toks@#1}%
+}
+\def\Pc at init#1{%
+  \begingroup
+    \toks@={#1}%
+}
+\def\Pc at finish#1{%
+  \expandafter\endgroup
+  \expandafter#1\the\toks@
+}
+\def\picture at redefine#1#2{%
+  \begingroup
+    \edef\reserved at a{%
+      \noexpand\noexpand
+      \expandafter\noexpand
+          \csname PcOrg@\expandafter\@gobble\string#1\endcsname
+    }%
+    \toks0{#1}%
+    \Pc at first#2&0%
+}
+\def\Pc at first#1&{%
+  \toks1={#1}%
+  \toks2={\Pc at init{#1}}%
+  \Pc at scanlength
+}
+\def\Pc at scanlength#1{%
+  \ifcase#1 %
+    \expandafter\Pc at last
+  \else
+    \toks1=\expandafter{\the\toks1 ###1}%
+    \toks2=\expandafter{\the\toks2 \Pc at tokslength{###1}}%
+    \expandafter\Pc at scannext
+  \fi
+}
+\def\Pc at scannext#1&{%
+  \ifx\\#1\\%
+  \else
+    \toks1=\expandafter{\the\toks1 #1}%
+    \toks2=\expandafter{\the\toks2 \Pc at addtoks{#1}}%
+  \fi
+  \Pc at scanlength
+}
+\def\Pc at last{%
+  \edef\x{%
+    \endgroup
+    \let\reserved at a\the\toks0 %
+    \def\the\toks0 \the\toks1 {%
+      \the\toks2 %
+      \noexpand\Pc at finish\reserved at a
+    }%
+  }%
+  \x
+}
+\picture at redefine\@picture{(&1,&2)(&3,&4)}
+\picture at redefine\put{(&1,&2)}
+\picture at redefine\multiput{(&1,&2)}
+\picture at redefine\@multiput{(&1,&2)}
+\picture at redefine\line{(#1,#2)&3}
+\picture at redefine\vector{(#1,#2)&3}
+\picture at redefine\dashbox{&1(&2,&3)}
+\picture at redefine\@circle{&1}
+\picture at redefine\@dot{&1}
+\picture at redefine\@bezier{#1(&2,&3)(&4,&5)(&6,&7)}
+\picture at redefine\@imakepicbox{(&1,&2)}
+\@ifpackageloaded{pspicture}{%
+  \picture at redefine\@oval{[&1](&2,&3)}%
+  \picture at redefine\Line{(&1,&2)}%
+  \picture at redefine\Curve{(&1,&2)}%
+  \picture at redefine\Vector{(&1,&2)}%
+}{%
+  \picture at redefine\@oval{(&1,&2)}%
+}
+\def\Pc at checkpackage#1{%
+  \@ifpackageloaded{#1}{%
+  }{%
+    \AtBeginDocument{%
+      \@ifpackageloaded{#1}{%
+        \PackageWarningNoLine{picture}{%
+          Package `#1' is loaded after `picture'.\MessageBreak
+          Load package `picture' afterwards to get full support%
+          \MessageBreak
+          of its additional syntax with length specifications%
+        }%
+      }{}%
+    }%
+  }%
+}
+\Pc at checkpackage{pict2e}
+\Pc at checkpackage{pspicture}
+\endinput
+%%
+%% End of file `picture.sty'.


Property changes on: trunk/Master/texmf-dist/tex/latex/picture/picture.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/tlpkg/bin/tlpkg-ctan-check
===================================================================
--- trunk/Master/tlpkg/bin/tlpkg-ctan-check	2019-12-10 22:08:55 UTC (rev 53080)
+++ trunk/Master/tlpkg/bin/tlpkg-ctan-check	2019-12-10 22:10:21 UTC (rev 53081)
@@ -541,7 +541,7 @@
     phfsvnwatermark phfthm
     philex philokalia philosophersimprint
     phonenumbers phonetic phonrule photo physics piano picinpar pict2e
-    pictex pictex2 pictexsum piechartmp piff pigpen
+    pictex pictex2 pictexsum picture piechartmp piff pigpen
     pinlabel pinoutikz pitex pittetd pixelart
     pkfix pkfix-helper pkgloader pkuthss
     pl placeat placeins placeins-plain

Modified: trunk/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc	2019-12-10 22:08:55 UTC (rev 53080)
+++ trunk/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc	2019-12-10 22:10:21 UTC (rev 53081)
@@ -910,6 +910,7 @@
 depend philex
 depend phonenumbers
 depend photo
+depend picture
 depend piff
 depend pkgloader
 depend placeins

Added: trunk/Master/tlpkg/tlpsrc/picture.tlpsrc
===================================================================


More information about the tex-live-commits mailing list