From fd9683dc698ae7c7639a4a6b716c1e328425d44b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Jan 2019 22:18:58 +0000 Subject: pstricks (22jan19) git-svn-id: svn://tug.org/texlive/trunk@49790 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks/README | 5 +-- .../texmf-dist/doc/generic/pstricks/pst-news19.pdf | Bin 55849 -> 59786 bytes .../texmf-dist/doc/generic/pstricks/pst-news19.tex | 22 +++++++--- .../tex/generic/pstricks/pstricks-tex.def | 4 +- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 45 ++++++++++++++++----- 5 files changed, 57 insertions(+), 19 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README index 626295ad82c..d665fee041e 100644 --- a/Master/texmf-dist/doc/generic/pstricks/README +++ b/Master/texmf-dist/doc/generic/pstricks/README @@ -5,10 +5,9 @@ Public License, as described in lppl.txt in the base LaTeX distribution. Either version 1.3 or, at your option, any later version. ----------------------------------------------------------------------- -PSTricks is the original work of Timothy van Zandt +PSTricks is the original work of Timothy van Zandt -PSTricks 97 is edited by Denis Girou -and Sebastian Rahtz +PSTricks 97 is edited by Denis Girou and Sebastian Rahtz PSTricks 2004 is edited by Herbert Voss and Rolf Niepraschk diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf index 2c05374dc6e..cfd2c58a090 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex index 7b9315b2cef..e4a2c117c07 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news19.tex 900 2019-01-10 11:11:13Z herbert $ +%% $Id: pst-news19.tex 905 2019-01-13 13:15:30Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles @@ -64,15 +64,16 @@ or a vector is shown with its components and one do not really knows the coordinates. \begin{BDef} -\Lcs{psLine}\OptArgs\OptArg{\Largb{$x_0,y_0$}}\Largb{$x_1,y_1$} +\Lcs{psLine}\OptArgs\OptArg{\Largr{$x_0,y_0$}}\Largr{$x_1,y_1$}\\ +\Lcs{psLineSegments}\OptArgs\Largr{$x_0,y_0$}\Largr{$x_1,y_1$}\ldots\Largr{$x_{n-1},y_{n-1}$}\Largr{$x_n,y_n$} \end{BDef} -If $P_0$ is missing, then $(0,0)$ as first point is assumed. - +If $P_0$ is missing for \Lcs{psLine} then $(0,0)$ as first point is assumed. \Lcs{psLineSegments} expects always +pairwise coordinates. \begin{LTXexample}[width=7cm] -\psset{unit=2.5cm} +\psset{unit=2cm} \begin{pspicture}(-1,-1)(1,1) \degrees[12] \pscircle{1} @@ -89,6 +90,17 @@ If $P_0$ is missing, then $(0,0)$ as first point is assumed. \end{pspicture} \end{LTXexample} + +\begin{LTXexample}[width=4cm] +\psset{unit=0.5cm} +\begin{pspicture}(6,6) +\psLineSegments[linecolor=blue]{->}(0,0)(0,1)(0,2)(0,3)(0,4)(1,4)% + (3,4)(4,4)(4,3)(4,1)(4,0)(2,0) +\end{pspicture} +\end{LTXexample} + + + \subsection{Error message} Using PSTricks with \Lprog{pdflatex} will work only when using package diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def index db8528d0317..3799b1675b4 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def @@ -1,4 +1,4 @@ -%% $Id: pstricks-tex.def 704 2018-01-06 09:50:33Z herbert $ +%% $Id: pstricks-tex.def 909 2019-01-14 16:06:51Z herbert $ %% pstricks-tex.def %% Copyright 2017- Herbert Voss % @@ -65,7 +65,7 @@ \ifx\@tempc\@sptoken \let\@tempd\@xifnch \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi \fi - \@tempd% + \@tempd }% \begingroup \def\:{\global\let\@sptoken= } \: diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index b29786b503e..8faf41e6949 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks.tex 895 2019-01-07 17:56:36Z herbert $ +%% $Id: pstricks.tex 917 2019-01-22 16:27:48Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt %% COPYRIGHT 2000-2003 by Denis Girou. @@ -70,8 +70,9 @@ \XKV@tempa } % -\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}%$ -\def\ProvidesPackageRCS@i[#1]#2{} +\def\ProvidesPackageRCS#1{\typeout{Loading #1}}% +%\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}%$ +%\def\ProvidesPackageRCS@i[#1]#2{} \ifx\pgfkeysloaded\endinput\else \input pgfutil-common.tex @@ -80,8 +81,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{2.94} -\def\filedate{2019/01/07} +\def\fileversion{2.95} +\def\filedate{2019/01/22} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -2518,8 +2519,8 @@ \psLine@ii}} \def\psLine@ii(#1){\@ifnextchar({\psLine@iii(#1)}{\psLine@iii(0,0)(#1)}}% \def\psLine@iii(#1)(#2){% - \pst@getcoor{#1}\pst@tempA - \pst@getcoor{#2}\pst@tempB + \pst@getcoor{#1}\pst@tempA% + \pst@getcoor{#2}\pst@tempB% \addto@pscode{ \ifPst@noCurrentPoint\else\pst@cp\fi % current point? [ % start for coordinate array @@ -2530,9 +2531,33 @@ { pop pop pop pop pop } ifelse }% \end@OpenObj + \ignorespaces } - -% +\def\psLineSegments{\leavevmode\pst@killglue\pst@object{psLineSegments}} +\def\psLineSegments@i{\pst@getarrows{\psLineSegments@ii}} +\def\psLineSegments@ii(#1)(#2){% + \begingroup + \use@keep@par + \solid@star + \ifpsdoubleline\pst@setdoublesep\fi + \init@pscode + \let\pst@linetype\pst@arrowtype + \pst@addarrowdef + \pst@getcoor{#1}\pst@tempA% + \pst@getcoor{#2}\pst@tempB% + \addto@pscode{ + \ifPst@noCurrentPoint\else\pst@cp\fi % current point? + [ % start for coordinate array + \pst@tempB + \pst@tempA % order vice versa + 4 copy Pyth2 \psk@arrowlength ge + { \psline@iii \tx@Line } + { pop pop pop pop pop } ifelse + }% + \end@OpenObj + \ignorespaces + \@ifnextchar(\psLineSegments@ii{}% +}% \def\pst@isnum#1{\pst@isnum@i\zap@space#1 \@empty\@nil}% \def\pst@isnum@i#1\@nil{% \if!\ifnum9<1#1!\else_\fi% @@ -3753,6 +3778,7 @@ pop \def\pscircle@do(#1)#2{% \if@star{\use@par\qdisk(#1){#2}}% qdisk does not allow \else% to use opacity option + \addbefore@par{dimen=middle}% \begin@ClosedObj \pst@@getcoor{#1}% \pssetlength\pst@dimc{#2}% @@ -3774,6 +3800,7 @@ pop % \def\pscircleOA{\def\pst@par{}\pst@object{pscircleOA}}% hv 2008-04-14 \def\pscircleOA@i(#1)(#2){% + \addbefore@par{dimen=middle}% \begin@ClosedObj \pst@getcoor{#1}\pst@tempA \pst@@getcoor{#2}% -- cgit v1.2.3