diff options
author | Karl Berry <karl@freefriends.org> | 2021-09-10 21:02:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-09-10 21:02:44 +0000 |
commit | 5d6fff8fbf92d4ec1185bef63a353cefb80762e9 (patch) | |
tree | 38a483ee0abbfa863fb8bd051ea0b9d40bccde3a /Master | |
parent | ededfa09b5b2ca189371118688bcdcffb8f200cb (diff) |
pstricks (10sep21)
git-svn-id: svn://tug.org/texlive/trunk@60466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
32 files changed, 295 insertions, 183 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib index daaa78d4452..d49525facf5 100644 --- a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib +++ b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib @@ -1,4 +1,21 @@ @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@STRING{beiprogramm = {{\TeX}-Beiprogramm}} +@STRING{bretter = {Bretter, die die Welt bedeuten}} +@STRING{dtk = {DTK}} +@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{PostScript, Author = {Kollock, Nikolai G.}, diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex index f9e40428f83..6f3946714c6 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news.tex 444 2017-04-19 10:55:35Z herbert $ +%% $Id: pst-news.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news08.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news08.pdf Binary files differindex 428653ebf27..00811580d44 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news08.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news08.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex index 4a656a85663..a548f6e1bb9 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news09.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news09.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news09.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex index d4c018d92e4..e679c0a617c 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news10.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news10.tex 697 2017-12-30 19:04:03Z herbert $ +%% $Id: pst-news10.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV12,bibliography=totoc,parskip=false,headings=small,, headinclude=false,footinclude=false,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex index a4254f226f4..61efbef06ce 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news11.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news11.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news11.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex index 759869d864b..2b3e1859319 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news12.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news12.tex 847 2018-12-04 08:04:28Z herbert $ +%% $Id: pst-news12.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex index 2995cf042d8..04b7de5995c 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news13.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news13.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news13.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex index 75b209b580a..f0a108fba1e 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news14.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news14.tex 165 2015-07-26 07:27:55Z herbert $ +%% $Id: pst-news14.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex index c2369d7018b..231a8bd38cc 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news15.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news15.tex 444 2017-04-19 10:55:35Z herbert $ +%% $Id: pst-news15.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex index 9a544ca5bd4..b0d91ec84ae 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news16.tex 446 2017-04-19 11:40:55Z herbert $ +%% $Id: pst-news16.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex index 53cf23c2cee..1bd25716a60 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $ +%% $Id: pst-news17.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex index dde1638e586..ac3ec7c4a4c 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news17.tex 699 2017-12-31 10:27:45Z herbert $ +%% $Id: pst-news18.tex 4 2020-06-09 08:32:19Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} \listfiles diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf Binary files differindex 4c32cf3c1c1..8fceedb1b93 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news19.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news19.tex index 9db696bc293..c670a6697d5 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 934 2019-02-23 14:07:34Z herbert $ +%% $Id: pst-news19.tex 4 2020-06-09 08:32:19Z herbert $ \PassOptionsToPackage{useCalc}{pstricks} \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} @@ -54,9 +54,11 @@ this new file. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 2.94 -- 2019/01/07)} +\section{\texttt{pstricks.tex} (v. 2.98 -- 2019/05/16)} %-------------------------------------------------------------------------------------- +\subsection{Plotting multilines} + There is a new macro called \Lcs{psLine} (uppercase L!) which can have only one or two pairs of coordinates. Remember that \Lcs{psline} can have more. With \Lcs{psLine} and an defined arrow you'll get nothing for something @@ -118,6 +120,36 @@ coordinates. It needs \end{LTXexample} \fi +%$ + +\subsection{Relative coordinates -- experimental} + +All objects which can have at least two pairs of coordinates +can use the »+«-operator to mark relative coordinates: + +\begin{BDef} +\Lcs{psline}\OptArgs\OptArg{\Largr{$x_0,y_0$}}\Largr{$x_1,y_1$}+\Largr{$x_2,y_2$}\ldots\\ +\end{BDef} + +\begin{LTXexample}[width=5.5cm] +\begin{pspicture}[showgrid](5,5) +\psline[linecolor=blue]{->}% + (1,1)+(3,4)+(-2,-3) +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[width=5.5cm] +\begin{pspicture}[showgrid](-1,-2)(4,3) +\psaxes[labels=none]{->}(0,0)(-1,-2)(4,3) +\psbezier% + (!0.8 -95 PtoC 1 sub)+(8.5;85)+(5;-100)(2,1)% + +(1;-70)+(0.5;-110)(3,2)% + +(1;-80)+(0.5;95)(3.4,-0.8) +\end{pspicture} +\end{LTXexample} + + \subsection{Error message} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex index 00acba1ff2c..f5a8094d142 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news20.tex @@ -1,4 +1,4 @@ -%% $Id: pst-news20.tex 23 2020-09-18 06:29:04Z herbert $ +%% $Id: pst-news20.tex 25 2020-09-18 06:59:21Z herbert $ \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{scrartcl} diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf Binary files differindex fde6b2fc62d..a1b597feef8 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news21.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex index 447b9ba207d..7eafc6f3aa3 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news21.tex @@ -1,4 +1,6 @@ -%% $Id: pst-news21.tex 191 2021-09-05 20:07:31Z herbert $ +%% $Id: pst-news21.tex 212 2021-09-10 09:21:06Z herbert $ +\RequirePackage{pdfmanagement-testphase} +\DeclareDocumentMetadata{} \documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small, headinclude=false,footinclude=false,twoside]{pst-doc} @@ -25,6 +27,13 @@ \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 want to try it, then look +at \url{https://github.com/zauguin/luapstricks}. + + + + %-------------------------------------------------------------------------------------- \section{\texttt{pstricks.sty}} %-------------------------------------------------------------------------------------- @@ -34,9 +43,30 @@ Otherwise the one from URW or the system is used, which is the default. %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 3.03 -- 2021/08/23)} +\section{\texttt{pstricks.tex} (v. 3.08 -- 2021/09/10)} %-------------------------------------------------------------------------------------- +\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} @@ -132,9 +162,6 @@ the optional argument \texttt{gsfonts}: 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) @@ -166,6 +193,9 @@ There was a bug if this fillstyle was used together with a line sequence. \end{lstlisting} +\iffalse + + \pspicture[showgrid=false](-0.5\linewidth,-4.5)(0.5\linewidth,5) \rput(0,0){\parbox{4.5cm}{% @@ -193,7 +223,10 @@ There was a bug if this fillstyle was used together with a line sequence. \endpspicture\end{lstlisting} -\section{\LuaLaTeX} +\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 diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro index 91824e557c5..8587712fcee 100644 --- a/Master/texmf-dist/dvips/pstricks/pstricks.pro +++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 191 2021-09-05 20:07:31Z herbert $ +% $Id: pstricks.pro 217 2021-09-10 13:50:31Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.38, 2021/09/05 +%% Version 1.39, 2021/09/10 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -121,22 +121,6 @@ tx@Dict begin /startGlobal { true setglobal globaldict begin } bind def /endGlobal { end false setglobal } bind def % -/setpdfcolor where { % luapstricks specific code - /setpdfcolor get /pssetPDFcolor exch def - /setpdfcolor { - pssetPDFcolor - mark - currentcolor - currentcolorspace 0 get - dup /DeviceRGB eq { pop setrgbcolor } { - dup /DeviceCMYK eq { pop setcmykcolor } { - /DeviceGray eq { setgray } if - } ifelse - } ifelse - cleartomark - } def -} if -% /pssetRGBcolor /setrgbcolor load def /pssetCMYKcolor /setcmykcolor load def /pssetGraycolor /setgray load def @@ -721,9 +705,11 @@ tx@Dict begin /EAC { x2 y2 x y ArrowB curveto pop pop } def % /OpenCurve { + 5 dict begin NArray n 3 lt { n { pop pop } repeat } { BOC /n n 3 sub def n { NC } repeat EOC } ifelse + end } def % /CurvePath { diff --git a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg index db654b14d73..9ade3312156 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg @@ -1,4 +1,4 @@ -% $Id: distiller.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: distiller.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: distiller.con (for distiller driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg index d9648c1d0a0..f9c5da698e2 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg @@ -1,4 +1,4 @@ -% $Id: dvips.cfg 797 2018-08-23 18:33:16Z herbert $ +% $Id: dvips.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg index 965e635fd53..bb59975bfa0 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg @@ -1,4 +1,4 @@ -% $Id: dvipsone.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: dvipsone.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN pstricks.con (for DVIPSONE driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg index b3549c8c562..f0fe5486cde 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg @@ -1,4 +1,4 @@ -% $Id: gastex.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: gastex.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for xdvipdfmx driver) %% %% Configuration file for PSTricks diff --git a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg index 48667d39502..ef088b5791f 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/textures.cfg @@ -1,4 +1,4 @@ -% $Id: textures.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: textures.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN pstricks.con (for Textures 1.7 and 1.8 driver) %% %% Configuration file for PSTricks 97: must be renamed `pstricks.con' diff --git a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg index e4b71844047..7cb84c0f9e1 100644 --- a/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg +++ b/Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg @@ -1,4 +1,4 @@ -% $Id: vtex.cfg 446 2017-04-19 11:40:55Z herbert $ +% $Id: vtex.cfg 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for VTeX) %% %% Configuration file for PSTricks 97 diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex index 34cfb16f9e7..e00736bdeb6 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex @@ -1,4 +1,4 @@ -%% $Id: pst-fp.tex 4 2020-06-09 08:32:19Z herbert $ +%% $Id: pst-fp.tex 68 2021-04-08 06:41:14Z herbert $ %% %% %% This is file `pst-fp.tex', @@ -18,16 +18,16 @@ %% `pst-fp' is a PSTricks related package for a division, %% multiplication and addition %% +% +\def\fileversion{0.06} +\def\filedate{2020/11/20} +\message{`pst-fp' v\fileversion, \filedate\space (hv)} + \csname PSTFPloaded\endcsname \let\PSTFPloaded\endinput -% % Requires some packages \ifx\PSTricksLoaded\endinput\else\input pstricks \fi % -\def\fileversion{0.05} -\def\filedate{2010/01/17} -\message{`pst-fp' v\fileversion, \filedate\space (hv)} -% \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax %fixed point arithmetic with values between (including) diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex index 0d89aa6b985..5684f3d7921 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $ +%% $Id: pstricks-arrows.tex 164 2021-08-25 19:26:42Z herbert $ %% %% This is file `pstricks-arrows.tex', %% @@ -279,18 +279,35 @@ \psset[pstricks]{filledveearrowlength=3mm} % default projected length \define@key[psset]{pstricks}{filledveearrowangle}[15]{\pst@getangle{#1}\psk@filledveearrowangle} \psset[pstricks]{filledveearrowangle=15} % default angle -\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.8pt]{\pst@getlength{#1}\psk@filledveearrowlinewidth} -\psset[pstricks]{filledveearrowlinewidth=\pslinewidth} % default vee arrow line width +\define@key[psset]{pstricks}{filledveearrowlinewidth}[0.35mm]{\pst@getlength{#1}\psk@filledveearrowlinewidth} +\psset[pstricks]{filledveearrowlinewidth=0.35mm} % default vee arrow line width \define@key[psset]{pstricks}{arrowlinestyle}[solid]{% \@ifundefined{psls@#1}% {\@pstrickserr{Line style `#1' not defined}\@eha}% {\def\psarrowlinestyle{#1}}} \psset[pstricks]{arrowlinestyle=solid} % default - -\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar} +\pst@def{VeeArrow}<% + 1 setlinecap % round caps + 1 setlinejoin % round join + setlinewidth % vee arrow line width + /y ED % projected length + 2 div /a ED % angle (divide by 2) + /t ED % false = inside, true = outside + a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y + t { 1 -1 scale } if % if outside : symmetry + x neg y moveto % point #1 + 0 0 L % point #2 + x y L % point #3 + { closepath gsave fill grestore } if % if filled : close and fill + \@nameuse{psls@\psarrowlinestyle} + \ps@check@tipcolor + stroke % draw line + 0 t { y 2 mul } { 0 } ifelse moveto> % if outside : twice longer line % VeeArrow : filled? outside? (total) angle (projected) length (arrow) line width +\@namedef{psas@|}{\ps@check@tipcolor \psk@tbarsize \tx@Tbar} + \@namedef{psas@v}{% \ps@check@tipcolor false false \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow} @@ -298,37 +315,12 @@ \ps@check@tipcolor false true \psk@veearrowangle \psk@veearrowlength \psk@veearrowlinewidth \tx@VeeArrow} \@namedef{psas@f}{% - \ps@check@tipcolor + \ps@check@tipcolor true false \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow} \@namedef{psas@F}{% \ps@check@tipcolor true true \psk@filledveearrowangle \psk@filledveearrowlength \psk@filledveearrowlinewidth \tx@VeeArrow} -\pst@def{VeeArrow}<% - 5 dict begin - \pst@arrowscale\space div SLW % vee arrow line width - /y ED % projected length - 2 div /a ED % angle (divide by 2) - /t ED % false = inside, true = outside - a sin a cos div y mul /x ED % perpendicular length : x=tan(a).y - /x2 x dup add def - t { 1 -1 scale } if % if outside : symmetry -% newpath x2 neg y moveto 0 y neg rlineto x2 dup add 0 rlineto 0 y rlineto closepath clip % to get rid of linecap problem - newpath - x neg y moveto % lower left - 0 0 lineto % arrow tip - x y lineto % upper left - 0 setlinecap % round caps - 2 setlinejoin % round join - { closepath 0 setlinewidth gsave fill grestore } if % if filled : close and fill - \@nameuse{psls@\psarrowlinestyle} - \ps@check@tipcolor - stroke % draw line - 0 t { y 2 mul } { 0 } ifelse moveto - end -> % if outside : twice longer line - - % And An another arrowhead % architectural tick / oblique arrow diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex new file mode 100644 index 00000000000..708a4260a5f --- /dev/null +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex @@ -0,0 +1,137 @@ +%% $Id: pstricks-arrows.tex 168 2021-08-28 08:43:24Z herbert $ +%% +%% This is file `pstricks-color.tex', +%% +%% IMPORTANT NOTICE: +%% +%% Herbert Voss <hvoss@tug.org> +%% +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. +%% +%% DESCRIPTION: +%% `pstricks-color' base code for color settings +%% +%% fileversion and filedate see main file pstricks.tex +%% +\pstVerb{ + /pssetRGBcolor /setrgbcolor load def + /pssetCMYKcolor /setcmykcolor load def + /pssetGraycolor /setgray load def +} +\def\@newcolor#1#2{% + \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% + %\expandafter\edef\csname color@#1\endcsname{#2}% + \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 + \ignorespaces} +% +\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% +\def\pst@endcolor{\pstVerb{\pst@currentcolor}} +\def\pst@currentcolor{0 setgray} +\def\altcolormode{% +\def\pst@color##1{% + \pstVerb{gsave ##1}\aftergroup\pst@endcolor}% +\def\pst@endcolor{\pstVerb{\pst@grestore}}} + +\def\psgetRGBColorValues#1{\expandafter\psgetRGBColorvalues@i#1;} +\def\psgetRGBColorvalues@i#1#2#3#4#5;{\expandafter\psgetRGBColorvalues@ii#5,,,;} +\def\psgetRGBColorvalues@ii#1,#2,#3,#4;{% + \ifx\relax#2\relax + #1 % gray color model + \else + #1 #2 #3 + \fi} + +\def\psgetCMYKColorValues#1{\expandafter\psgetCMYKColorvalues@i#1;} +\def\psgetCMYKColorvalues@i#1#2#3#4#5;{\expandafter\psgetCMYKColorvalues@ii#5,,,,;} +\def\psgetCMYKColorvalues@ii#1,#2,#3,#4,#5;{% + \ifx\relax#2\relax + #1 % gray color model + \else + #1 #2 #3 #4 + \fi} + +\iffalse +\def\ps@RGB@model{rgb} +\def\psgetColorValues#1{\makeatletter\expandafter\psgetColorvalues@i#1;\makeatother} +\gdef\psgetColorvalues@i#1#2#3#4#5;{% + \scantokens{\def\pst@tempA{#4}} + \if\pst@tempA\ps@RGB@model + \expandafter\psgetRGBColorvalues@ii#5; + \else + \expandafter\psgetCMYKColorvalues@ii#5; + \fi +} +\fi + +\def\pssetMonochrome{% + \pstVerb{ + /setrgbcolor { add add 0 gt {0}{1} ifelse setgray } def + /setcmykcolor{ 4 dict begin + /k ED /y ED /m ED /c ED + 1 1 k sub c mul k add sub 0.29 mul + 1 1 k sub m mul k add sub 0.587 mul add + 1 1 k sub y mul k add sub 0.114 mul add + end 0 gt {0}{1} ifelse setgray } def }} +\def\pssetGrayscale{% + \pstVerb{ + /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def + /setcmykcolor{ 4 dict begin + /k ED /y ED /m ED /c ED + 1 1 k sub c mul k add sub 0.29 mul + 1 1 k sub m mul k add sub 0.587 mul add + 1 1 k sub y mul k add sub 0.114 mul add + end setgray } def }} +\def\psresetColor{\pstVerb{ + /setrgbcolor tx@Dict begin /pssetRGBcolor load end def + /setcmykcolor tx@Dict begin /pssetCMYKcolor load end def }} + +%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17 +\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} +% +\def\newgray#1#2{% + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}}% +\def\newrgbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} +\def\newhsbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}} +\def\newcmykcolor#1#2{% + \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}} +\newgray{black}{0} +\newgray{darkgray}{.25} +\newgray{gray}{.5} +\newgray{lightgray}{.75} +\newgray{white}{1} +\newrgbcolor{red}{1 0 0} +\newrgbcolor{green}{0 1 0} +\newrgbcolor{blue}{0 0 1} +\newrgbcolor{yellow}{1 1 0} +\newrgbcolor{cyan}{0 1 1} +\newrgbcolor{magenta}{1 0 1} + +\@ifundefined{xglobal}% do we have xcolor loaded? + {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}% + \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}% + \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}% + \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}% + }{% + \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}% + \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}% + \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}% + \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}% + } +% +\def\pst@getcolor#1#2{% +% \@ifundefined{color@#1}% hv 1.14 2005-12-17 + \@ifundefined{\string\color@#1}% + {\@pstrickserr{Color `#1' not defined}\@eha}% + {\edef#2{#1}}% +} +% +%% END: pstricks-color.tex +\endinput diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.con b/Master/texmf-dist/tex/generic/pstricks/pstricks.con index 21134fb7817..0c119d13a36 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.con +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.con @@ -1,4 +1,4 @@ -%% $Id: pstricks.con 170 2021-09-01 09:54:41Z herbert $ +%% $Id: pstricks.con 4 2020-06-09 08:32:19Z herbert $ %% BEGIN: pstricks.con (for dvips driver) %% %% Configuration file for PSTricks @@ -39,11 +39,8 @@ %% If you want to include your own customizations to pstricks.tex, then %% uncomment the \pstcustomize command, and include your modifications %% after \pstcustomize. These will be read in after pstricks.tex. -\pstcustomize +%\pstcustomize -\ifPSTlualatex% luatex has another coordinate system - \def\pstrotate{CP CP translate 3 -1 roll rotate \tx@NET} -\fi \endinput %% diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index cd28900b39e..80005b22d00 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -81,8 +81,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{3.07} -\def\filedate{2021/09/05} +\def\fileversion{3.08} +\def\filedate{2021/09/10} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -461,7 +461,7 @@ \def\pstverbscale{}% \def\pstnodescale{}% \def\pstheader{\luaPSTheader}% - \def\c@lor@to@ps#1\@@{(#1) setpdfcolor} + \def\c@lor@to@ps#1\@@{\luaPSTcolor{#1}} % \AltClipMode % now done after the definition of \AltClipMode, see below % Not sure if we need ``neg'' here or not % \def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET} @@ -607,46 +607,10 @@ \gdef\psrbrace[} ] \endgroup % -\pstVerb{ - /pssetRGBcolor /setrgbcolor load def - /pssetCMYKcolor /setcmykcolor load def - /pssetGraycolor /setgray load def -} -\def\@newcolor#1#2{% - \expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% - %\expandafter\edef\csname color@#1\endcsname{#2}% - \expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 - \ignorespaces} % -\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}% -\def\pst@endcolor{\pstVerb{\pst@currentcolor}} -\def\pst@currentcolor{0 setgray} -\def\altcolormode{% -\def\pst@color##1{% - \pstVerb{gsave ##1}\aftergroup\pst@endcolor}% -\def\pst@endcolor{\pstVerb{\pst@grestore}}} -\def\pssetMonochrome{% - \pstVerb{ - /setrgbcolor { add add 0 gt {0}{1} ifelse setgray } def - /setcmykcolor{ 4 dict begin - /k ED /y ED /m ED /c ED - 1 1 k sub c mul k add sub 0.29 mul - 1 1 k sub m mul k add sub 0.587 mul add - 1 1 k sub y mul k add sub 0.114 mul add - end 0 gt {0}{1} ifelse setgray } def }} -\def\pssetGrayscale{% - \pstVerb{ - /setrgbcolor { 0.07 mul exch 0.71 mul add exch 0.21 mul add setgray } def - /setcmykcolor{ 4 dict begin - /k ED /y ED /m ED /c ED - 1 1 k sub c mul k add sub 0.29 mul - 1 1 k sub m mul k add sub 0.587 mul add - 1 1 k sub y mul k add sub 0.114 mul add - end setgray } def }} -\def\psresetColor{\pstVerb{ - /setrgbcolor tx@Dict begin /pssetRGBcolor load end def - /setcmykcolor tx@Dict begin /pssetCMYKcolor load end def }} - +\input pstricks-color +% +% \def\pst@grestore{ currentpoint matrix currentmatrix @@ -656,45 +620,6 @@ setmatrix moveto } -%\def\pst@usecolor#1{\csname color@#1\endcsname\space}% hv 1.14 2005--12-17 -\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space} -% -\def\newgray#1#2{% - \pst@checknum{#2}\pst@tempg - \@newcolor{#1}{\pst@tempg setgray}}% -\def\newrgbcolor#1#2{% - \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}} -\def\newhsbcolor#1#2{% - \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}} -\def\newcmykcolor#1#2{% - \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil - \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}} -\newgray{black}{0} -\newgray{darkgray}{.25} -\newgray{gray}{.5} -\newgray{lightgray}{.75} -\newgray{white}{1} -\newrgbcolor{red}{1 0 0} -\newrgbcolor{green}{0 1 0} -\newrgbcolor{blue}{0 0 1} -\newrgbcolor{yellow}{1 1 0} -\newrgbcolor{cyan}{0 1 1} -\newrgbcolor{magenta}{1 0 1} - -\@ifundefined{xglobal}% do we have xcolor loaded? - {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}% - \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}% - \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}% - \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}% - }{% - \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}% - \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}% - \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}% - \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}% - } -% \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} \define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture \psset[pstricks]{bgcolor={},draft=false}% \pst@bgcolor is \@empty @@ -726,12 +651,7 @@ %------------ hv 1.16 end ------------------- % \def\@none{none} -\def\pst@getcolor#1#2{% -% \@ifundefined{color@#1}% hv 1.14 2005-12-17 - \@ifundefined{\string\color@#1}% - {\@pstrickserr{Color `#1' not defined}\@eha}% - {\edef#2{#1}}% -} +% \newdimen\psunit \psunit 1cm \newdimen\psxunit \psxunit 1cm \newdimen\psyunit \psyunit 1cm @@ -918,10 +838,6 @@ \fi} % \def\pst@@CheckCoorType#1#2;#3;#4\@nil{% -%\typeout{====1:#1}% -%\typeout{====2:#2}% -%\typeout{====3:#3}% -%\typeout{====4:#4}% \ifx#1>\relax% node with special rotation for \uput \global\pst@C@@rType=7 \else @@ -1396,8 +1312,7 @@ { \pst@usecolor\ps@kitecolor } { \pst@usecolor\pshatchcolor } \psk@psscale - \tx@PenroseFillA -} + \tx@PenroseFillA } \def\psfs@penroseA{\pst@fill\pst@penroseFillA} \@namedef{psfs@penroseA*}{\psfs@solid \psfs@penroseA} % @@ -1445,6 +1360,7 @@ % \def\pst@flattenpath{ /Coors [] def % the array of all points + 50 dict begin /lambda \psk@startWL\space def % /add2Values { Coors aload length 2 add array astore /Coors exch def } def @@ -1509,6 +1425,7 @@ % stroke % draw the line segment % moveto % } repeat + end } % diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls index 9e4b244dab2..bcbd86fc5df 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls +++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls @@ -455,24 +455,25 @@ xleftmargin=0pt,xrightmargin=0pt, \def\settitle{% \thispagestyle{empty}% \begin{titlepage} + \newgeometry{lmargin=1cm,rmargin=1cm,bmargin=1cm,includeheadfoot} \ifpdf \AddToShipoutPicture*{\includegraphics{pst-doc.pdf}} \vspace*{0.3\textheight} \parbox{17cm}{\sffamily\RaggedRight\bfseries\huge\@title}\\[5pt] \parbox{15cm}{\sffamily\Large\@subtitle} - \vspace{4cm} + \vspace{2cm} \parbox{10cm}{\sffamily\@date} \vfill - \makebox[\textwidth]{\bgImage} + \makebox[\textwidth]{\makebox(0,0){\bgImage}} - \vfill \parbox[b]{19cm}{\sffamily\RaggedRight \ifx\@docauthor\empty~\else Documentation by\fi\hfill\makebox[7cm][l]{Package author(s):}\\ \ifx\@docauthor\empty~\else{\bfseries\tabular[t]{@{}l@{}}\@docauthor\endtabular}\fi\hfill\makebox[7cm][l]{% \bfseries\tabular[t]{@{}l@{}}\@author\endtabular}} + \clearpage\restoregeometry \else \psset{unit=1cm} \begin{pspicture}(1.6in,0)(23cm,21.7cm) diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty index 9923109fbba..8fe00f7bc74 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks-pdf.sty @@ -1,4 +1,4 @@ -% $Id: pstricks-pdf.sty 23 2020-09-18 06:29:04Z herbert $ +% $Id: pstricks-pdf.sty 25 2020-09-18 06:59:21Z herbert $ %% %% This is file `pstricks-pdf.sty'. %% |