From 8201bf657ae25c1e01f3821b37586c10620f5342 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Sep 2021 20:37:25 +0000 Subject: pst-dart (11sep21) git-svn-id: svn://tug.org/texlive/trunk@60476 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-dart/Changes | 3 +- Master/texmf-dist/doc/generic/pst-dart/README.md | 7 ++- .../doc/generic/pst-dart/pst-dart-doc.pdf | Bin 408049 -> 421175 bytes .../doc/generic/pst-dart/pst-dart-doc.tex | 47 +++++++++++++-------- .../texmf-dist/tex/generic/pst-dart/pst-dart.tex | 35 +++++++++------ Master/texmf-dist/tex/latex/pst-dart/pst-dart.sty | 12 +++--- 6 files changed, 64 insertions(+), 40 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pst-dart/Changes b/Master/texmf-dist/doc/generic/pst-dart/Changes index 09f94ce443b..5446e2bee87 100644 --- a/Master/texmf-dist/doc/generic/pst-dart/Changes +++ b/Master/texmf-dist/doc/generic/pst-dart/Changes @@ -1,6 +1,7 @@ ..... pst-dart.tex +0.03 2021-09-11 - Use the \ThreeDput macro instead of modifying the trandformation matrix 0.02 2018-02-09 - add \psDart for darts - - rename borad to \psDartBoard + - rename board to \psDartBoard 0.01 2018-01-27 first version diff --git a/Master/texmf-dist/doc/generic/pst-dart/README.md b/Master/texmf-dist/doc/generic/pst-dart/README.md index 6dc2e0f9834..50fb3f4fcd1 100644 --- a/Master/texmf-dist/doc/generic/pst-dart/README.md +++ b/Master/texmf-dist/doc/generic/pst-dart/README.md @@ -9,15 +9,14 @@ local TeX tree. The pro file should go into $TEXMF/dvips/pstricks/ Then do not forget to run texhash to update this tree. For more information see the documentation of your TeX distribution on installing packages into your local TeX system or read the -TeX Frequently Asked Questions: -(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). +TeX Frequently Asked Questions pst-dart needs pstricks, which should already be part of your local TeX installation, otherwise get it from a -CTAN server, http://mirror.ctan.org +CTAN server, https://mirror.ctan.org PSTricks is PostScript Tricks, the documentation cannot be run with pdftex, use the sequence latex->dvips->ps2pdf or pdflatex with package auto-pst-pdf or xelatex. -%% $Id: README.md 713 2018-01-28 19:31:56Z herbert $ +%% $Id: README.md 226 2021-09-11 14:30:22Z herbert $ diff --git a/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.pdf b/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.pdf index 89f8519e2be..0781a2acb74 100644 Binary files a/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.pdf and b/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.tex b/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.tex index ad125eebf20..1307b9d58dc 100644 --- a/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-dart/pst-dart-doc.tex @@ -1,13 +1,17 @@ %% $Id: pst-dart-doc.tex 728 2018-02-09 19:29:41Z herbert $ -\documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false, - headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} -\usepackage[utf8]{inputenc} -\usepackage{dtk-logos} + +\errorcontextlines=100 +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} +\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside,english]{pst-doc} + +\usepackage{hvlogos,iftex} \usepackage{pst-dart} \let\pstDartFV\fileversion -\renewcommand\bgImage{\psDartBoard[unit=2,fontsize=15pt]} +\renewcommand\bgImage{}%\psDartBoard[unit=2,fontsize=15pt]} -\addbibresource{pst-dart-doc.bib} +\addbibresource{\jobname.bib} \lstset{language=PSTricks, @@ -25,12 +29,14 @@ % \begin{document} + + \title{\texttt{pst-dart}} \subtitle{Plotting a Dart ; v.\pstDartFV} \author{Thomas Söll\\Herbert Voß} \docauthor{} \date{\today} -\maketitle +\settitle \tableofcontents @@ -62,6 +68,7 @@ \section{Examples} \subsection{The default size} + \begin{LTXexample} \begin{pspicture}[showgrid](-3,-3)(9,3) \psDartBoard % The default Dartboard (radius=2.1cm) @@ -70,6 +77,7 @@ \end{LTXexample} + \subsection{Scaling} \begin{LTXexample}[pos=r,width=0.58\linewidth] @@ -132,30 +140,35 @@ environment \Lenv{pspicture} as can be seen in the above examples.. \section{Changing the viewpoint} -You can change the viewpoint with the two optional arguments \Lkeyword{preCode}\footnote{There is also a \Lkeyword{postCode}, -which is not of real interest here.} -which allow to change the transformation matrix of PostScript. However, it does \emph{not} work -with \XeLaTeX, you have to choose the Sequenz \texttt{latex}$\rightarrow$\texttt{dvips}$\rightarrow$\texttt{ps2pdf}. +You can change the viewpoint with the optional argument +\Lkeyword{viewpoint} +%\footnote{There is also a \Lkeyword{postCode}, +%which is not of real interest here.} +which expects three space separated values for $x$ $y$ $z$, where at least one value must be unless 0. +%allow to change the transformation matrix of PostScript. However, it does \emph{not} work +%with \XeLaTeX, you have to choose the Sequenz \texttt{latex}$\rightarrow$\texttt{dvips}$\rightarrow$\texttt{ps2pdf}. + \begin{LTXexample}[pos=t] -\begin{pspicture}(-4.5,-4.5)(4.5,4.5) -\psDartBoard[preCode={[1 0.2 0.5 1 0 0 ] concat },fontsize=18pt,unit=1.5] -\psDart[unit=0.5,rot=45](1,-1) +\begin{pspicture}(-2,-3)(12,4) +\psDartBoard[boardview=1 0 0,fontsize=18pt,unit=1.5] +\psDart[unit=0.5,rot=110](1,-1) +%% +\psDartBoard[boardview=1 0 1,fontsize=18pt,unit=1.5](10cm,0) +\psDart[unit=0.5,rot=50](9cm,-1cm) \end{pspicture} \end{LTXexample} - - \clearpage \section{List of all optional arguments for \texttt{pst-dart}} \xkvview{family=pst-dart,columns={key,type,default}} +\nocite{*} \bgroup \RaggedRight -\nocite{*} \printbibliography \egroup diff --git a/Master/texmf-dist/tex/generic/pst-dart/pst-dart.tex b/Master/texmf-dist/tex/generic/pst-dart/pst-dart.tex index 064a309e7ff..8b1907da5f2 100644 --- a/Master/texmf-dist/tex/generic/pst-dart/pst-dart.tex +++ b/Master/texmf-dist/tex/generic/pst-dart/pst-dart.tex @@ -1,4 +1,4 @@ -%% $Id: pst-dart.tex 728 2018-02-09 19:29:41Z herbert $ +%% $Id: pst-dart.tex 229 2021-09-11 14:35:39Z herbert $ %% %% This is file `pst-dart.tex', %% @@ -22,19 +22,21 @@ \ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi \ifx\GradientLoaded\endinput\else \input pst-grad.tex \fi +\ifx\PSTthreeDLoaded\endinput\else \input pst-3d.tex \fi % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax % interface to the `xkeyval' package \pst@addfams{pst-dart} % -\def\fileversion{0.02} -\def\filedate{2018/02/09} +\def\fileversion{0.03} +\def\filedate{2021/09/11} \message{`PST-dart' v\fileversion, \filedate\space (ts,hv)} % \define@key[psset]{pst-dart}{preCode}[]{\def\psk@dart@preCode{#1}} \define@key[psset]{pst-dart}{postCode}[]{\def\psk@dart@postCode{#1}} +\define@key[psset]{pst-dart}{boardview}[]{\def\psk@dart@boardview{#1}} \define@key[psset]{pst-dart}{fontsize}[10pt]{\def\psk@dart@fontsize{\fontsize{#1}{#1}}} -\psset[pst-dart]{fontsize=10pt,preCode=,postCode=} +\psset[pst-dart]{fontsize=10pt,boardview={},preCode=,postCode=} \newcmykcolor{Red}{0 1 1 0} \newcmykcolor{Green}{1 0 1 0} @@ -43,12 +45,21 @@ \def\psDartBoard@i{\@ifnextchar(\psDartBoard@ii{\psDartBoard@ii(0,0)}}% \def\psDartBoard@ii(#1){% \begingroup - \addbefore@par{unit=0.1mm}% + \addbefore@par{boardview={}}%,unit=0.1mm}% \use@par \degrees[20]% - \rput(#1){% - \begin{pspicture}(-210,-210)(210,210)% - \pstVerb{gsave \psk@dart@preCode }% + \ifx\psk@dart@boardview\@empty + \rput(#1){\psset{unit=0.1mm}\psDartBoard@iii}% + \else + \rput(#1){\psset{unit=0.1mm}% + \ThreeDput[normal=\psk@dart@boardview](0,0,0){\psDartBoard@iii}}% + \fi + \endgroup + \ignorespaces +} + +\def\psDartBoard@iii{% + \begin{pspicture}(-210,-210)(210,210)% \pscircle*(0,0){210} % Gerader Part. \psset{linewidth=0.5pt}% @@ -67,12 +78,10 @@ \pscircle[fillstyle=solid,fillcolor=Green,linecolor=gray!30,linewidth=0.5pt,linecolor=white]{15.9} \pscircle[fillstyle=solid,fillcolor=Red,linecolor=gray!30,linewidth=0.5pt,linecolor=white]{6.35} \psforeach{\iA}{6,13,4,18,1,20,5,12,9,14,11,8,16,7,19,3,17,2,15,10}{% - \rput(190;\the\psLoopIndex){\psk@dart@fontsize\selectfont\white\iA}} - \pstVerb{ \psk@dart@postCode grestore }% - \end{pspicture}}% - \endgroup - \ignorespaces + \rput(190;\the\psLoopIndex){\psk@dart@fontsize\selectfont\white\iA}} + \end{pspicture}% } + % \colorlet{gold}{orange!50!yellow} diff --git a/Master/texmf-dist/tex/latex/pst-dart/pst-dart.sty b/Master/texmf-dist/tex/latex/pst-dart/pst-dart.sty index 83758903b9a..96c778dbe24 100644 --- a/Master/texmf-dist/tex/latex/pst-dart/pst-dart.sty +++ b/Master/texmf-dist/tex/latex/pst-dart/pst-dart.sty @@ -1,13 +1,15 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-dart}[2017/08/17 package wrapper for pst-dart.tex (hv)] +\ProvidesPackage{pst-dart}[2021/09/11 package wrapper for pst-dart.tex (hv)] \RequirePackage{multido} \RequirePackage{pst-xkey} % \input{pst-dart.tex} \ProvidesFile{pst-dart.tex} [\filedate\space v\fileversion\space `PST-dart' (hv)] -\IfFileExists{pst-dart.pro}{% - \ProvidesFile{pst-dart.pro}[2014/05/07 v. 0.16, PostScript prologue file (hv)] -\@addtofilelist{pst-dart.pro}}{}% +%IfFileExists{pst-dart.pro}{% +% \ProvidesFile{pst-dart.pro}[2014/05/07 v. 0.16, PostScript prologue file (hv)] +%\@addtofilelist{pst-dart.pro}}{}% + \endinput -%% $Id: pst-dart.sty 713 2018-01-28 19:31:56Z herbert $ + +%% $Id: pst-dart.sty 226 2021-09-11 14:30:22Z herbert $ -- cgit v1.2.3