From 17727285df6985c6c939e688b03e37d1fdc92fed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 1 Feb 2022 22:07:31 +0000 Subject: pst-node (1feb22) git-svn-id: svn://tug.org/texlive/trunk@61838 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-node/Changes | 1 + Master/texmf-dist/doc/generic/pst-node/README | 6 +- .../doc/generic/pst-node/pst-node-doc.bib | 16 ++++ .../doc/generic/pst-node/pst-node-doc.pdf | Bin 668152 -> 513402 bytes .../doc/generic/pst-node/pst-node-doc.tex | 81 ++++++++++++--------- Master/texmf-dist/dvips/pst-node/pst-node.pro | 2 +- Master/texmf-dist/dvips/pst-node/pst-node97.pro | 2 +- .../texmf-dist/tex/generic/pst-node/pst-node.tex | 18 +++-- .../texmf-dist/tex/generic/pst-node/pst-node97.tex | 2 +- Master/texmf-dist/tex/latex/pst-node/pst-node.sty | 2 +- 10 files changed, 85 insertions(+), 45 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pst-node/Changes b/Master/texmf-dist/doc/generic/pst-node/Changes index 34929f4622d..cac34e69124 100644 --- a/Master/texmf-dist/doc/generic/pst-node/Changes +++ b/Master/texmf-dist/doc/generic/pst-node/Changes @@ -1,4 +1,5 @@ ----- pst-node.tex +1.43 2021-09-15 - fix for lualatex and empty value in \psk@nrot 1.42a 2020-04-01 - fix typo in the documentation 1.42 2019-03-03 - bugfix for \rnode inside \psframebox* 1.41 2017-12-30 - added \psnpolygon diff --git a/Master/texmf-dist/doc/generic/pst-node/README b/Master/texmf-dist/doc/generic/pst-node/README index 2737377e021..3f4fd08e595 100644 --- a/Master/texmf-dist/doc/generic/pst-node/README +++ b/Master/texmf-dist/doc/generic/pst-node/README @@ -4,6 +4,10 @@ version of keyval. Save the files pst-node.sty|.tex|.pro in a directory, which is part of your local TeX node. Then do not forget to run texhash to update this node if these packages are new to your TeX distribution. +For more information see the documentation of your LaTeX distribution +on installing packages into your LaTeX distribution or the +TeX Frequently Asked Questions: +(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). pst-node needs pstricks, which should be part of your local TeX installation, otherwise get it from a CTAN server, f.ex. @@ -17,4 +21,4 @@ the command \includepdf[pages=..]{pst-docfull}. %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt. -hvoss@tug.org \ No newline at end of file +hvoss@tug.org diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib index 502723507c6..53820f26f6d 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.bib @@ -1,6 +1,22 @@ %% -*-bibtex-*- @STRING{tugboat = {TUGboat} } @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm}} +@STRING{bretter = {Bretter, die die Welt bedeuten}} +@STRING{editorial = {Editorial}} +@STRING{fremdebuehne = {Von fremden Bühnen}} +@STRING{fundus = {Aus dem Fundus}} +@STRING{grusswort = {Grußwort}} +@STRING{hinterbuehne = {Hinter der Bühne}} +@STRING{komascript = {\KOMAScript}} +@STRING{leserbriefe = {Leserbriefe}} +@STRING{magazin = {Magazin}} +@STRING{rezensionen = {Bücher und Rezensionen}} +@STRING{schonimmer = {Was Sie schon immer über {\TeX} wissen wollten, \dots}} +@STRING{spielplan = {Spielplan}} +@STRING{theaterkasse = {Von der Theaterkasse}} +@STRING{theatertage = {{\TeX}-Theatertage}} +@STRING{tippstricks = {Tipps und Tricks}} @Book{companion, author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Voß}, diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf index 21df1902e92..8be7b3ec525 100644 Binary files a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf and b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex index da8501112ca..5ff16cb6cf5 100644 --- a/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex +++ b/Master/texmf-dist/doc/generic/pst-node/pst-node-doc.tex @@ -1,4 +1,6 @@ -%% $Id: pst-node-doc.tex 1164 2020-04-01 09:12:28Z herbert $ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} +%% $Id: pst-node-doc.tex 438 2022-01-31 17:45:26Z herbert $ \documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,oneside]{pst-doc} \listfiles @@ -6,7 +8,7 @@ \input{pst-node} \let\pstFV\fileversion -\usepackage[utf8]{inputenc} +%\usepackage[utf8]{inputenc} \usepackage{pst-plot} \let\belowcaptionskip\abovecaptionskip % @@ -14,8 +16,8 @@ \newcommand\psBox[3][white]{\rput(#2){\rnode{#2}{% \psframebox[fillcolor=#1]{\xstrut\makebox[3.2cm]{\tabular{c}#3\endtabular}}}}} \def\bgImage{% -\psscalebox{0.85}{% -\begin{pspicture}(-1,-1)(21,7) +\psscalebox{0.75}{% +\begin{pspicture}(-1,-1)(20,7) \psset{framearc=0.2,shadow,fillstyle=solid,shadowcolor=black!55} \psBox[blue!30]{7,6}{politische\\Kommunikation} \psBox[red!30]{3,4}{interpersonale\\Kommunikation} @@ -57,7 +59,7 @@ \author{Timothy Van Zandt\\Michael Sharpe\\Herbert Vo\ss} \date{\today} -\maketitle +\settitle \begin{abstract} This version of \LPack{pst-node} uses the extended keyval handling @@ -2438,15 +2440,18 @@ For example, which represents a unit vector in the tangent direction to the curve at \texttt{P}. The expression in \texttt{t} in this case is algebraic, which is detected automatically by the macro. + \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid](-.5,-.5)(2.5,2) -\def\exn{cos(t) | sin(t)} -\psparametricplot[algebraic]{0}{2}{\exn} -\curvepnode{1}{\exn}{P} -\psdot(P)\uput[45](P){P} +\def\exnA{cos(t) | sin(t)} +\psparametricplot[algebraic]{0}{2}{\exnA} +\curvepnode{1}{\exnA}{D} +\psdot(D)\uput[45](D){D} \end{pspicture} \end{LTXexample} + \vspace{2pc} + \begin{BDef} \Lcs{psparnode}\Largb{t}\Largb{expression in t}\Largb{} @@ -2475,15 +2480,16 @@ For example, \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid](-.5,-.5)(2.5,3) -\def\exn{t+t^2 | 2*Ex(-t)} +\def\exnB{t+t^2 | 2*Ex(-t)} \psset{plotpoints=100} -\psparametricplot[algebraic]{0}{1}{\exn} -\curvepnodes{0}{1}{\exn}{P} -\psdot(P50)\uput[75](P50){P50} -\psdot(P99)\uput[75](P99){P99} +\psparametricplot[algebraic]{0}{1}{ \exnB } +\curvepnodes{0}{1}{ \exnB }{Q} +\psdot(Q50)\uput[75](Q50){Q50} +\psdot(Q99)\uput[75](Q99){Q99} \end{pspicture} \end{LTXexample} + \begin{BDef} \Lcs{fnpnode}\Largb{xval}\Largb{expression in x}\Largb{nodename} @@ -2505,10 +2511,10 @@ For example, \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid](-.5,-.5)(2.5,3) -\def\exn{x x 1 add mul 2 div} -\psplot{0}{2}{\exn} -\fnpnode{0.5}{\exn}{Q} -\psdot(Q)\uput[-45](Q){Q} +\def\exnC{x x 1 add mul 2 div} +\psplot{0}{2}{\exnC} +\fnpnode{0.5}{\exnC}{R} +\psdot(R)\uput[-45](R){R} \end{pspicture} \end{LTXexample} \vspace{2pc} @@ -2521,11 +2527,13 @@ For example, Is similar to \Lcs{curvenodes}, but for the graph of a function. The keyword \Lkeyword{algebraic} must be specified if your expression is indeed algebraic. + + \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid](-.5,-.5)(2.5,3) -\def\exn{x x 1 add mul 2 div} -\psplot{0}{2}{\exn} -\fnpnodes[plotpoints=10]{0}{2}{\exn}{A} +\def\exnD{x x 1 add mul 2 div} +\psplot{0}{2}{\exnD} +\fnpnodes[plotpoints=10]{0}{2}{\exnD}{A} \psdot(A4)\uput[-45](A4){A4} \end{pspicture} \end{LTXexample} @@ -2551,6 +2559,8 @@ get a PostScript error if the node you specify is undefined. is effectively \Lcs{getnodelist}\Largb{P}\Largb{}\verb|(1,2)(2;3)...|, just a quick way to turn a list of coordinates into a node sequence P0 P1 ... + + \begin{BDef} \Lcs{psnline}\OptArgs\Largb{arrows}\Largr{coors}\Largb{name} \end{BDef} @@ -2563,9 +2573,9 @@ turn a list of coordinates into a node sequence P0 P1 ... \begin{LTXexample}[width=.35\textwidth] \begin{pspicture}[showgrid,algebraic](-.5,-.5)(2.5,2) -\pnodes{P}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) -%defines P0..P3--now join them -\psnline[arrowscale=2]{-D>}(0,3){P} +\pnodes{B}(.1,.1)(1;10)(*2 {x^2/4})(0,1.4) +%definesuP0..P3--now join them +\psnline[arrowscale=2]{-D>}(0,3){B} \end{pspicture} \end{LTXexample} \vspace{2pc} @@ -2579,16 +2589,21 @@ for example, expects that there are nodes named P3..P8, and gives the same resu \pspolygon[linewidth=1pt]{->}(P3)(P4)(P5)(P6)(P7)(P8) \end{verbatim} + Conversion between any angle unit and degree unit +%\makeatletter +%\def\pst@par{} +%\makeatother + \begin{LTXexample}[pos=t,vsep=1cm] \begin{pspicture}[showgrid=b](-2,-2)(2,2) \def\N{9 }% \degrees[\N] -\curvepnodes[plotpoints=\numexpr\N+1]{0}{\N AnytoDeg}{t dup cos exch sin}{P} -\psnpolygon(0,\numexpr\Pnodecount-1){P} -\foreach \i in {0,1,...,\numexpr\Pnodecount-1}{% - \uput{6pt}[\i]{!\i\space 90 DegtoAny sub}(P\i){\psline{->}(0,12pt)}} +\curvepnodes[plotpoints=\numexpr\N+1]{0}{\N AnytoDeg}{t dup cos exch sin}{C} +\psnpolygon(0,\numexpr\Cnodecount-1){C} +\foreach \i in {0,1,...,\numexpr\Cnodecount-1}{% + \uput{6pt}[\i]{!\i\space 90 DegtoAny sub}(C\i){\psline{->}(0,12pt)}} \end{pspicture} \end{LTXexample} @@ -2600,17 +2615,15 @@ Conversion between any angle unit and radian unit \begin{pspicture}[showgrid=b](-2,-2)(2,2) \def\N{9 }% \degrees[\N] -\curvepnodes[plotpoints=\numexpr\N+1]{0}{\N AnytoRad}{cos(t)|sin(t)}{P} -\psnpolygon(0,\numexpr\Pnodecount-1){P} -\foreach \i in {0,1,...,\numexpr\Pnodecount-1}{% - \uput{6pt}[\i]{!\i\space Pi 2 div RadtoAny sub}(P\i){\psline{->}(0,12pt)}} +\curvepnodes[plotpoints=\numexpr\N+1]{0}{\N AnytoRad}{cos(t)|sin(t)}{D} +\psnpolygon(0,\numexpr\Dnodecount-1){D} +\foreach \i in {0,1,...,\numexpr\Dnodecount-1}{% + \uput{6pt}[\i]{!\i\space Pi 2 div RadtoAny sub}(D\i){\psline{->}(0,12pt)}} \end{pspicture} \end{LTXexample} - - \begin{BDef} \Lcs{psncurve}\OptArgs\Largb{arrows}\Largr{coors}\Largb{name} \end{BDef} diff --git a/Master/texmf-dist/dvips/pst-node/pst-node.pro b/Master/texmf-dist/dvips/pst-node/pst-node.pro index ebd6844ca10..b75ef89863f 100644 --- a/Master/texmf-dist/dvips/pst-node/pst-node.pro +++ b/Master/texmf-dist/dvips/pst-node/pst-node.pro @@ -1,4 +1,4 @@ -% $Id: pst-node.pro 395 2017-03-21 09:24:38Z herbert $ +% $Id: pst-node.pro 438 2022-01-31 17:45:26Z herbert $ %% %% PostScript prologue for pst-node.tex. %% Version 1.15, 2014/01/27. diff --git a/Master/texmf-dist/dvips/pst-node/pst-node97.pro b/Master/texmf-dist/dvips/pst-node/pst-node97.pro index 5f7170abe97..611289108b0 100644 --- a/Master/texmf-dist/dvips/pst-node/pst-node97.pro +++ b/Master/texmf-dist/dvips/pst-node/pst-node97.pro @@ -1,5 +1,5 @@ %! -% $Id: pst-node97.pro 68 2014-08-07 10:16:26Z herbert $ +% $Id: pst-node97.pro 438 2022-01-31 17:45:26Z herbert $ % PostScript prologue for pst-node.tex. % Created 1993/3/12. Source file was pst-node.doc % Version 0.93a, 93/03/12. diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex index d7fb86b4be1..ed3ef60a4b5 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node.tex @@ -1,4 +1,4 @@ -% $Id: pst-node.tex 1164 2020-04-01 09:12:28Z herbert $ +% $Id: pst-node.tex 438 2022-01-31 17:45:26Z herbert $ %% %% BEGIN pst-node.tex %% @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{1.42a} -\def\filedate{2020/04/01} +\def\fileversion{1.43} +\def\filedate{2022/01/31} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -838,11 +838,17 @@ tx@Dict begin \psline@iii pop end \def\ncput{\pst@object{ncput}} \def\ncput@i{\pst@killglue\pst@makebox{\ncput@ii}} \def\ncput@ii{% - \begingroup% - \use@par% + \begingroup + \use@par \if@star\pst@starbox\fi% \pst@makesmall\pst@hbox% - \pst@rotate\psk@nrot\pst@hbox% + \expandafter\ifx\expandafter\relax\psk@nrot\relax\else% prevent empty value for \psk@rot + \ifPSTlualatex + \pst@rotate{\psk@nrot\space neg }\pst@hbox + \else + \pst@rotate{\psk@nrot}\pst@hbox + \fi + \fi \ncput@iii% \endgroup% \pst@shortput} diff --git a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex index 552e8ca2b1d..2caf537fd55 100644 --- a/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex +++ b/Master/texmf-dist/tex/generic/pst-node/pst-node97.tex @@ -1,4 +1,4 @@ -% $Id: pst-node97.tex 834 2018-11-06 18:32:42Z herbert $ +% $Id: pst-node97.tex 438 2022-01-31 17:45:26Z herbert $ %% BEGIN: pst-node.tex %% Generated on <1993/3/12> from `pst-node.doc'. %% For use with the PostScript header file `pst-node.pro'. diff --git a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty index 25759494f0d..43edb5aa2b0 100644 --- a/Master/texmf-dist/tex/latex/pst-node/pst-node.sty +++ b/Master/texmf-dist/tex/latex/pst-node/pst-node.sty @@ -1,4 +1,4 @@ -% $Id: pst-node.sty 688 2017-12-14 13:08:41Z herbert $ +% $Id: pst-node.sty 438 2022-01-31 17:45:26Z herbert $ %% %% This is file `pst-node.sty'. %% -- cgit v1.2.3