summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-29 21:08:03 +0000
committerKarl Berry <karl@freefriends.org>2022-11-29 21:08:03 +0000
commit4e523780356eba9daec5c742fecd34f5e8402078 (patch)
treee0d0a0178bf4434d069313a2c3651c8b2efe4f46
parentf343a16f43878ae93180cc850879646aabaed1a5 (diff)
pstricks (29nov22)
git-svn-id: svn://tug.org/texlive/trunk@65139 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/README2
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news21.pdfbin129526 -> 2733392 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news21.tex102
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news22.pdfbin93124 -> 1015692 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news22.tex293
-rw-r--r--Master/texmf-dist/dvips/pstricks/pst-dots.pro4
-rw-r--r--Master/texmf-dist/dvips/pstricks/pstricks.pro14
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def5
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex10
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pstricks.sty2
11 files changed, 397 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index c824ddb9b1c..1fd4da8c3dc 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2021
+PSTricks 2022
This package may be distributed under the terms of the LaTeX Project
Public License, as described in lppl.txt in the base LaTeX distribution.
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf
index 4f6554e86fa..5559ed0837d 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex
index de90a7cc5ce..510a7435b3f 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex
@@ -1,14 +1,14 @@
-%% $Id: pst-news21.tex 263 2021-09-24 17:58:30Z herbert $
+%% $Id: pst-news21.tex 382 2021-12-29 19:19:18Z herbert $
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{}
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
- headinclude=false,footinclude=false,twoside,usegeometry]{pst-doc}
+ headinclude=false,footinclude=false,twoside,usegeometry,dvipsnames]{pst-doc}
\usepackage{libertinus}
\usepackage{hvlogos}
\listfiles
%\usepackage[svgnames,dvipsnames,x11names,pspdf=-dALLOWPSTRANSPARENCY]{pstricks-pdf}
-\usepackage{showexpl,pst-arrow}
+\usepackage{showexpl,pst-arrow,pst-plot,pst-geometrictools}
\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={},extendedchars},
escapechar=?}
@@ -36,6 +36,10 @@ lualatex it uses the OpenType version.
The dot part is now in an own file \texttt{pstricks-dots.tex}.
+
+
+
+
%--------------------------------------------------------------------------------------
\section{\texttt{pstricks.sty}}
%--------------------------------------------------------------------------------------
@@ -45,9 +49,99 @@ Otherwise the one from URW or the system is used, which is the default.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 3.08 -- 2021/09/10)}
+\section{\texttt{pstricks.tex} (v. 3.12 -- 2021/12/29)}
%--------------------------------------------------------------------------------------
+
+\subsection{Coordinates}
+By default the coordinates \verb|(10,10)| are used if the environment \Lenv{pspicture}
+is called without any given coordinates. This behaviour can be changed if you are running
+the document with \Lprog{lualatex}. Then you can use the optional argument \Lkeyword{calcframe}
+to allow the internal calculation of the box width and height. it needs two \Lprog{lualatex}
+runs to get the coordinates. The values are written into a file \verb|\jobname-<No>.psaux| and read
+in the next run.
+
+With the optional argument \Lkeyword{margin} it is possible to add white space to the calculated coordinates.
+The keyword must be set with the command \Lcs{psset} \emph{before} the environment \Lenv{pspicture}, otherwise it is too late.
+
+\begin{itemize}
+\item \verb|margin=5mm| will add 5mm on all sides of the box.
+\item \verb|margin={5mm,1cm}| will add 5mm on the left side and 1cm on the lower side of the box.
+\item \verb|margin={2mm,3,4,5pt}| will add 2mm on the left, 3\Lcs{psunit} at the bottom, 4\Lcs{psunit} on
+the right and 5pt on the top of the box. With the optional argument \Lkeyword{showframe} the calculated
+box coordinates can be visible. Additional white space is marked by a box with dashed lines.
+\end{itemize}
+
+Without a given unit all values are used with the current defined PSTricks unit. But remember
+that this will only work with \Lprog{lualatex}.
+
+The following example shows the same curve, but with different coordinates.
+
+\begin{LTXexample}[pos=t,width=\linewidth]
+\def\dataV{6.8 -1 5.9 -2 5.4 -3 5.7 -4 6.2 -5} % original
+\def\dataW{6.8 4 5.9 3 5.4 2 5.7 1 6.2 0} % x>= 0
+\def\dataU{1.4 4 0.5 3 0 2 0.3 1 0.8 0} % x>=0 und y>=0
+\psset{calcframe,showframe}% must be set before pspicture
+X\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataU} \rput(1,-0.5){default dataU}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataW} \rput(6,-0.5){default dataW}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataV} \rput(6,-5.5){default dataV}
+\end{pspicture}X
+
+\vspace{1cm}
+X\begin{pspicture}[showgrid,margin=0.5]
+ \listplot[plotstyle=curve, showpoints]{\dataU} \rput(1,5){margin=0.5}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid,margin={0.5,1}]
+ \listplot[plotstyle=curve, showpoints]{\dataW} \rput(6,4.5){margin={0.5 1}}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid,margin={5mm,1,15mm,2}]
+ \listplot[plotstyle=curve, showpoints]{\dataV} \rput(6,-0.5){margin={5mm,1,15mm,2}}
+\end{pspicture}X
+\end{LTXexample}
+
+Only PSTricks objects are taken into account for calculating the bounding box. All stuff
+which is placed on \TeX-level like any text with for example \Lcs{rput} cannot not be
+used for calculating the correct coordinates. With setting additional whitespace with
+the optional argument \Lkeyword{margin} the boxsize can be modified.
+
+\newpsstyle{Parallelen}{country=G,ProLineCol=cyan,ProFillCol=gray!50,
+ OwnerTxt=Pythagoras,MadeTxt={Geodreieck},RulerFillCol=cyan!40}
+\psscalebox{0.5}{%
+ \psset{calcframe,margin=5mm}%
+ \begin{pspicture}[showgrid]% no coordinates are given
+ \pnode(5,5){A}\uput[90](A){A}
+ \pnode(-8,1){B}\uput[90](B){B}
+ \pnode(3,3){C}\uput[250](C){C}
+ \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)
+ \psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
+ \pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
+ \midAB(GeodrB)(GeodrA){M}%
+ \psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+\end{pspicture}}
+
+
+\begin{lstlisting}
+\psscalebox{0.5}{%
+ \psset{calcframe}%
+ \begin{pspicture}[showgrid]% no coordinates are given
+ \pnode(5,5){A}\uput[90](A){A}
+ \pnode(-8,1){B}\uput[90](B){B}
+ \pnode(3,3){C}\uput[250](C){C}
+ \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)
+ \psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
+ \pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
+ \midAB(GeodrB)(GeodrA){M}%
+ \psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+\end{pspicture}}
+\end{lstlisting}
+
+
+
\subsection{Colors}
There are two new macros to get the color values:
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news22.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news22.pdf
index fd93b6e9393..cb69ee6de6b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news22.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news22.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news22.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news22.tex
index 9d8c6743688..c345ccfbb58 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news22.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news22.tex
@@ -1,4 +1,5 @@
%% $Id: pst-news21.tex 382 2021-12-29 19:19:18Z herbert $
+\listfiles
\RequirePackage{pdfmanagement-testphase}
\DeclareDocumentMetadata{}
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
@@ -28,8 +29,16 @@
\part{\texttt{pstricks} -- package}
This version of the News was run with \verb|lualatex| \emph{without} using Ghostscript.
-The PDF file was created in a direkt way by Lua. If you run \texttt{lualatex} then the
-packahe \texttt{luapstricks} is automatically loaded.
+The PDF file was created in a direkt way by Lua. If you want to try it, then look
+at \url{https://github.com/zauguin/luapstricks}.
+
+By default the dots are now taken from a Type1 version of the font file. For
+lualatex it uses the OpenType version.
+
+The dot part is now in an own file \texttt{pstricks-dots.tex}.
+
+
+
%--------------------------------------------------------------------------------------
@@ -41,30 +50,288 @@ Otherwise the one from URW or the system is used, which is the default.
%--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 3.17 -- 2022/10/22)}
+\section{\texttt{pstricks.tex} (v. 3.13 -- 2022/01/09)}
%--------------------------------------------------------------------------------------
+\subsection{Presetting of \nxLkeyval{dimen} for circles}
+Some years ago the behaviour changed and \Lkeyset{dimen=middle} was preset for circles and ovals.
+It is now reverted to the old behaviour where all PSTricks objects have the presetting \Lkeyset{dimen=outer}.
+
+
+\subsection{Coordinates}
+By default the coordinates \verb|(10,10)| are used if the environment \Lenv{pspicture}
+is called without any given coordinates. This behaviour can be changed if you are running
+the document with \Lprog{lualatex}. Then you can use the optional argument \Lkeyword{calcframe}
+to allow the internal calculation of the box width and height. it needs two \Lprog{lualatex}
+runs to get the coordinates. The values are written into a file \verb|\jobname-<No>.psaux| and read
+in the next run.
+
+With the optional argument \Lkeyword{margin} it is possible to add white space to the calculated coordinates.
+The keyword must be set with the command \Lcs{psset} \emph{before} the environment \Lenv{pspicture}, otherwise it is too late.
+
+\begin{itemize}
+\item \verb|margin=5mm| will add 5mm on all sides of the box.
+\item \verb|margin={5mm,1cm}| will add 5mm on the left side and 1cm on the lower side of the box.
+\item \verb|margin={2mm,3,4,5pt}| will add 2mm on the left, 3\Lcs{psunit} at the bottom, 4\Lcs{psunit} on
+the right and 5pt on the top of the box. With the optional argument \Lkeyword{showframe} the calculated
+box coordinates can be visible. Additional white space is marked by a box with dashed lines.
+\end{itemize}
+
+Without a given unit all values are used with the current defined PSTricks unit. But remember
+that this will only work with \Lprog{lualatex}.
+
+The following example shows the same curve, but with different coordinates.
+
+\begin{LTXexample}[pos=t,width=\linewidth]
+\def\dataV{6.8 -1 5.9 -2 5.4 -3 5.7 -4 6.2 -5} % original
+\def\dataW{6.8 4 5.9 3 5.4 2 5.7 1 6.2 0} % x>= 0
+\def\dataU{1.4 4 0.5 3 0 2 0.3 1 0.8 0} % x>=0 und y>=0
+\psset{calcframe,showframe}% must be set before pspicture
+X\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataU} \rput(1,-0.5){default dataU}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataW} \rput(6,-0.5){default dataW}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid]
+ \listplot[plotstyle=curve, showpoints]{\dataV} \rput(6,-5.5){default dataV}
+\end{pspicture}X
+
+\vspace{1cm}
+X\begin{pspicture}[showgrid,margin=0.5]
+ \listplot[plotstyle=curve, showpoints]{\dataU} \rput(1,5){margin=0.5}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid,margin={0.5,1}]
+ \listplot[plotstyle=curve, showpoints]{\dataW} \rput(6,4.5){margin={0.5 1}}
+\end{pspicture}X \hfill X%
+\begin{pspicture}[showgrid,margin={5mm,1,15mm,2}]
+ \listplot[plotstyle=curve, showpoints]{\dataV} \rput(6,-0.5){margin={5mm,1,15mm,2}}
+\end{pspicture}X
+\end{LTXexample}
+
+Only PSTricks objects are taken into account for calculating the bounding box. All stuff
+which is placed on \TeX-level like any text with for example \Lcs{rput} cannot not be
+used for calculating the correct coordinates. With setting additional whitespace with
+the optional argument \Lkeyword{margin} the boxsize can be modified.
+
+\newpsstyle{Parallelen}{country=G,ProLineCol=cyan,ProFillCol=gray!50,
+ OwnerTxt=Pythagoras,MadeTxt={Geodreieck},RulerFillCol=cyan!40}
+\psscalebox{0.5}{%
+ \psset{calcframe,margin=5mm}%
+ \begin{pspicture}[showgrid]% no coordinates are given
+ \pnode(5,5){A}\uput[90](A){A}
+ \pnode(-8,1){B}\uput[90](B){B}
+ \pnode(3,3){C}\uput[250](C){C}
+ \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)
+ \psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
+ \pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
+ \midAB(GeodrB)(GeodrA){M}%
+ \psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+\end{pspicture}}
-\subsection{pgf library}
-This version fixes a problem with the upcoming pgf from which PSTricks uses the \Lcs{foreach}
-command as \Lcs{pgfforeach}.
+\begin{lstlisting}
+\psscalebox{0.5}{%
+ \psset{calcframe}%
+ \begin{pspicture}[showgrid]% no coordinates are given
+ \pnode(5,5){A}\uput[90](A){A}
+ \pnode(-8,1){B}\uput[90](B){B}
+ \pnode(3,3){C}\uput[250](C){C}
+ \pcline[linecolor=BrickRed,nodesepA=-2,nodesepB=-2](A)(B)
+ \psParallels[style=Parallelen,RulerScale=0.75,ProScale=0.75](A)(B)(C)
+ \pcline[linecolor=BrickRed](GeodrB)(GeodrA)%
+ \midAB(GeodrB)(GeodrA){M}%
+ \psPencil[PenLength=5,pencilColA=red,PenScale=0.5]{60}(M)
+\end{pspicture}}
+\end{lstlisting}
+
+
+
+\subsection{Colors}
+
+There are two new macros to get the color values:
+
+\begin{verbatim}
+\psgetRGBColorValues{<color macro>}
+\psgetCMYKColorValues{<color macro>}
+\end{verbatim}
+
+An Example:
+
+\begin{LTXexample}[width=5cm]
+\psset{linecolor=red!40}
+\psgetRGBColorValues{\pslinecolor}
+
+\colorlet{Blue}[cmyk]{blue}
+\psset{linecolor=Blue!40}
+\psgetCMYKColorValues{\pslinecolor}
+\end{LTXexample}
+
\subsection{Arrows}
-There are new arrow types and a new optional argument \Lkeyword{tipcolor}.
-Checking \Lkeyword{tipcolor} can be suppressed by setting
+There are new arrow types and a new optional argument \texttt{tipcolor}:
+
+
+\begin{LTXexample}[width=5cm]
+\begin{pspicture}[showgrid](4.2,3.25)
+\psline{-T>}(0,1)(4,1)
+\psline[arrowscale=2]{<T-T>}(0,2)(4,2)
+\psline[tipcolor=red,arrowscale=2]{<T-}(0,3)(4,3)
+\end{pspicture}
+\end{LTXexample}
+
+
+
+\LPack{pstricks} defines the following "`arrows"':
+
+ \def\myline#1{\psline[linecolor=red,linewidth=0.5pt,arrowscale=1.5]{#1}(0,1ex)(1.3,1ex)}%
+ \def\mylineA#1{\psline[linecolor=red,linewidth=0.5pt,arrowscale=4.5]{#1}(0,1ex)(2,1ex)}%
+ \psset{arrowscale=1.5}
+ \begin{longtable}{@{} c @{\qquad} p{3cm} l @{}}%
+ Value & Example & Name \\[2pt]\hline
+ \Lnotation{-} & \myline{-} & None\\
+ \Lnotation{<->} & \myline{<->} & Arrowheads.\\
+ \Lnotation{>-<} & \myline{>-<} & Reverse arrowheads.\\
+ \Lnotation{<{<}-{>}>} & \myline{<<->>} & Double arrowheads.\\
+ \Lnotation{{>}>-{<}<} & \myline{>>-<<} & Double reverse arrowheads.\\
+ \Lnotation{{|}-{|}} & \myline{|-|} & T-bars, flush to endpoints.\\
+ \Lnotation{{|}*-{|}*} & \myline{|*-|*} & T-bars, centered on endpoints.\\
+ \Lnotation{[-]} & \myline{[-]} & Square brackets.\\
+ \Lnotation{]-[} & \myline{]-[} & Reversed square brackets.\\
+ \Lnotation{(-)} & \myline{(-)} & Rounded brackets.\\
+ \Lnotation{)-(} & \myline{)-(} & Reversed rounded brackets.\\
+ \Lnotation{o-o} & \myline{o-o} & Circles, centered on endpoints.\\
+ \Lnotation{*-*} & \myline{*-*} & Disks, centered on endpoints.\\
+ \Lnotation{oo-oo} & \myline{oo-oo} & Circles, flush to endpoints.\\
+ \Lnotation{**-**} & \myline{**-**} & Disks, flush to endpoints.\\
+ \Lnotation{{|}<->{|}} & \myline{|<->|} & T-bars and arrows.\\
+ \Lnotation{{|}>-<{|}} & \myline{|>-<|} & T-bars and reverse arrows.\\
+ \Lnotation{h-h{}} & \myline{h-h} & left/right hook arrows.\\
+ \Lnotation{H-H{}} & \myline{H-H} & left/right hook arrows.\\
+ \Lnotation{v-v} & \myline{v-v} & left/right inside vee arrows.\\
+ \Lnotation{V-V} & \myline{V-V} & left/right outside vee arrows.\\
+ \Lnotation{f-f} & \myline{f-f} & left/right inside filled arrows.\\
+ \Lnotation{F-F} & \myline{F-F} & left/right outside filled arrows.\\
+ \Lnotation{t-t} & \myline{t-t} & left/right inside slash arrows.\\[5pt]
+ \Lnotation{T-T} & \myline{T-T} & left/right outside slash arrows.\\
+%
+ \Lnotation{<D-D>} & \mylineA{<D-D>} & curved arrows.\\
+ \Lnotation{<D<D-D>D>} & \mylineA{<D<D-D>D>} & curved doubled arrows.\\
+ \Lnotation{D>-<D} & \mylineA{D>-<D} & curved arrows, tip inside.\\
+ \Lnotation{<T-T>} & \myline{<T-T>} & curved lines.\\
+% \Lnotation{>T-T<} & \mylineA{>T-T<} & \TikZ\ like arrows.\\
+ \hline
+ \end{longtable}
+
+
+
+
+%\@namedef{psas@T>}{ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowT }% hv 20210531
+%\@namedef{psas@<T}{ % hv 20071211
+% true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowT
+%}
+
+
+With version 3.04 all arrow specific base code is moved to the file \LPack{pstricks-arrows}, which
+is not of interest for the default user..
+
+\subsection{Symbolfont}
+
+
+Use by default the URW or system symbol font for \Lcs{psdot}. This can be changes by using
+the optional argument \texttt{gsfonts}:
+
+\begin{verbatim}
+\usepackage[gsfonts]{pstricks}
+\end{verbatim}
+
+\TeX-users have to define the switch and
\begin{verbatim}
-\makeatletter
-\ps@check@tipcplor{}
-\makeatother
+\newif\ifpstGSfonts
+\pstGSfontsfalse % or true for using GS font
+
+\input pstricks
+...
\end{verbatim}
-This is only needed in some rare cases, e.g. \Lcs{pscustom} with \Lcs{code} and
-color setting on PS level.
+\subsection{Fillstyle \texttt{penrose}}
+
+There was a bug if this fillstyle was used together with a line sequence.
+
+
+\psset{unit=1cm}
+\centering\vspace{5cm}
+\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
+\rput(0,0){\parbox{4.5cm}{%
+ \psclip{\psccurve[linestyle=none,fillstyle=penrose,psscale=.2](-3,-2)%
+ (0.3,-1.5)(2.3,-2)(4.3,-1.5)(6.3,-2)(8,-1.5)(8,2)(-3,2)}
+ ``One of the best new plays I have seen all year: cool, poetic,
+ ironic \ldots'' proclaimed \emph{The Guardian} upon the London
+ premiere of this extraordinary play about a Czech director and
+ his actress wife, confronting exile in America.
+ \endpsclip}}
+ \psline[linearc=0.5cm,showpoints=true,dotstyle=|]{<<->>}(-1,-2)(0,-4)(1,-2)
+\endpspicture
+
+
+
+\begin{lstlisting}
+\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
+\rput(0,0){\parbox{4.5cm}{%
+ \psclip{\psccurve[linestyle=none,fillstyle=penrose,psscale=.2](-3,-2)
+ (0.3,-1.5)(2.3,-2)(4.3,-1.5)(6.3,-2)(8,-1.5)(8,2)(-3,2)}
+ ``One of the best new plays I have seen all year: cool, poetic,
+ ironic \ldots'' proclaimed \emph{The Guardian} upon the London
+ premiere of this extraordinary play about a Czech director and
+ his actress wife, confronting exile in America.
+ \endpsclip}}%
+ \psline[linearc=0.5cm,showpoints=true,dotstyle=|]{<<->>}(-1,-2)(0,-4)(1,-2)
+\endpspicture
+\end{lstlisting}
+
+
+\iffalse
+
+
+
+\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
+\rput(0,0){\parbox{4.5cm}{%
+ \psclip{\psccurve[linestyle=none,fillstyle=penroseA,psscale=.2](-3,-2)
+ (0.3,-1.5)(2.3,-2)(4.3,-1.5)(6.3,-2)(8,-1.5)(8,2)(-3,2)}\color{white}
+ ``One of the best new plays I have seen all year: cool, poetic,
+ ironic \ldots'' proclaimed \emph{The Guardian} upon the London
+ premiere of this extraordinary play about a Czech director and
+ his actress wife, confronting exile in America.
+ \endpsclip}}%
+ \psline[linearc=0.5cm,showpoints=true,dotstyle=|]{<<->>}(-1,-2)(0,-4)(1,-2)
+\endpspicture
+
+\begin{lstlisting}
+\pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5)
+\rput(0,0){\parbox{4.5cm}{%
+ \psclip{\psccurve[linestyle=none,fillstyle=penrose,psscale=.2](-3,-2)
+ (0.3,-1.5)(2.3,-2)(4.3,-1.5)(6.3,-2)(8,-1.5)(8,2)(-3,2)}\color{white}
+ ``One of the best new plays I have seen all year: cool, poetic,
+ ironic \ldots'' proclaimed \emph{The Guardian} upon the London
+ premiere of this extraordinary play about a Czech director and
+ his actress wife, confronting exile in America.
+ \endpsclip}}%
+ \psline[linearc=0.5cm,showpoints=true,dotstyle=|]{<<->>}(-1,-2)(0,-4)(1,-2)
+\endpspicture\end{lstlisting}
+
+
+\fi
+
+
+\section{\LuaLaTeX}\label{lua}
+Currently one has to use package \LPack{auto-pst-pdf-lua} if a document with
+\PSTricks-code should be run \emph{directly} with \LuaLaTeX, without using
+GhostScript. This version has experimental basic support for the lua package
+\LPack{luapstricks.lua}, available from \url{https://github.com/zauguin/luapstricks}.
\nocite{*}
\printbibliography
diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
index ebed06ede5a..9098492b253 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
@@ -1,7 +1,7 @@
-% $Id: pst-dots.pro 601 2022-09-08 19:21:27Z herbert $
+% $Id: pst-dots.pro 291 2021-10-01 09:22:45Z herbert $
%
%% PostScript prologue for pstricks.tex.
-%% Version 2.02, 2021/10/01
+%% Version 0.02, 2021/10/01
%%
%% For distribution, see pstricks.tex.
%%
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index c25657b9b90..175b1908d6b 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 615 2022-09-22 08:39:26Z herbert $
+% $Id: pstricks.pro 317 2021-11-16 20:47:25Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 1.41, 2021/11/16
@@ -379,7 +379,7 @@ tx@Dict begin
%
%
/TruchetFill { % on stack: scaling factor
- 20 dict begin
+ 10 dict begin
dup dup scale
1 exch div round /penroseFactor ED
a 0 dtransform round exch round exch
@@ -445,11 +445,7 @@ tx@Dict begin
{ 0 h T 1 -1 scale } if
w neg h moveto
0 0 L w h L w neg a neg rlineto
- gsave
-% gsave w neg h lineto CLW 0.5 add setlinewidth % test für border beim Pfeil
-% 1 setgray 0 setlinejoin closepath stroke
-% grestore
- fill grestore
+ gsave fill grestore
} def
%
/ArrowD { % the sides are drawn as curves (hv 20071211)
@@ -955,8 +951,8 @@ tx@Dict begin
} ifelse
} def
%
-/Frame { % on stack \psk@dimen
- CLW mul /a ED % save radius
+/Frame {
+ CLW mul /a ED
3 -1 roll
2 copy gt { exch } if
a sub /y2 ED
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
index 7a7b5622d57..e2d9085937e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex
@@ -1,4 +1,4 @@
-%% $Id: pstricks-color.tex 260 2021-09-23 19:22:36Z herbert $
+%% $Id: pstricks-color.tex 455 2022-03-01 10:42:02Z herbert $
%%
%% This is file `pstricks-color.tex',
%%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def
index 68049094a24..61495720b20 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-xetex.def
@@ -1,7 +1,5 @@
-%% $Id: pstricks-xetex.def 4 2020-06-09 08:32:19Z herbert $
+%% $Id: pstricks-xetex.def 276 2021-09-27 11:28:22Z herbert $
%%
-%% Copyright 2019- Herbert Voss
-%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
% of this license or (at your option) any later version.
@@ -13,6 +11,7 @@
% The xdvipdfmx driver does not support all node macros. In the following
% there are alternatives defined:
%
+%% fileversion and filedate see main file pstricks.tex
%% \ncput -> \NCput
%
\def\NCput{\pst@object{NCput}}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 9d741d115ac..264fb01e1a2 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -27,6 +27,9 @@
%
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
+
+\newif\if@pstLaTeX
+\@pstLaTeXtrue
%
%\if@check@engine
\ifx\c@lor@to@ps\@undefined
@@ -34,6 +37,7 @@
\fi
%\fi
\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined
+ \@pstLaTeXfalse
\input pstricks-tex.def
\fi
@@ -75,7 +79,7 @@
%\def\ProvidesPackageRCS@i[#1]#2{}
\ifx\pgfkeysloaded\relax\else
- \ifdefined\@latexerr % format is latex
+ \if@pstLaTeX
\RequirePackage{pgffor} % pgffor depends on pgfkeys
\else % format is plaintex
\input pgffor.tex
@@ -84,8 +88,8 @@
\let\pgfforeach\foreach
%
-\def\fileversion{3.17}
-\def\filedate{2022/10/23}
+\def\fileversion{3.18}
+\def\filedate{2022/11/28}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
index 6e256a7e059..93a02ea1621 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
+++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 644 2022-10-23 18:29:03Z herbert $
+% $Id: pstricks.sty 645 2022-10-25 04:57:20Z herbert $
%%
%% This is file `pstricks.sty'.
%%