diff options
Diffstat (limited to 'graphics/pstricks/base')
26 files changed, 543 insertions, 42 deletions
diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes index b6989bc9a0..f1e6919c62 100644 --- a/graphics/pstricks/base/Changes +++ b/graphics/pstricks/base/Changes @@ -1,4 +1,4 @@ -% $Id: Changes 164 2021-08-25 19:26:42Z herbert $ +% $Id: Changes 166 2021-08-26 19:52:16Z herbert $ Changelog for @@ -25,7 +25,9 @@ pstricks.tex -------- versions like 2.47a have only changes in other files, but not in this main package. -3.05 2021-08-25 - bug fix for Penros fill style +3.06 2021-08-27 - added support for experimental use of lualatex with luapstricks.lua + - enabled .setblendmode again in pstrick.pro +3.05 2021-08-25 - bug fix for Penrose fill style - put tbasic arrows code into new pstricks-arrow.tex 3.04 2021-08-24 - moved complete arrow stuff into pst-arrow. Its hardcore macros are loaded by default by pstricks.tex @@ -353,6 +355,7 @@ pstricks-doc ----------- ---- pstricks.pro +1.37 2021-08-27 - revert fix for .setblendmode 1.36 2021-08-25 - fix for function Penrose and PenroseA 1.35 2021-08-21 - fix for new version > 9.53 1.34 2021-03-30 - fix bug for intro to Ghostscript >9.52 diff --git a/graphics/pstricks/base/config/xdvipdfmx.cfg b/graphics/pstricks/base/config/xdvipdfmx.cfg index 668ba41905..663e342f79 100644 --- a/graphics/pstricks/base/config/xdvipdfmx.cfg +++ b/graphics/pstricks/base/config/xdvipdfmx.cfg @@ -1,4 +1,4 @@ -% $Id: xdvipdfmx.cfg 152 2021-08-19 11:24:26Z herbert $ +% $Id: xdvipdfmx.cfg 158 2021-08-24 06:57:13Z herbert $ % %% BEGIN: pstricks.con (for dvipdfmx driver) %% diff --git a/graphics/pstricks/base/config/xdvipdfmx.cfg.orig b/graphics/pstricks/base/config/xdvipdfmx.cfg.orig new file mode 100644 index 0000000000..75a596ca35 --- /dev/null +++ b/graphics/pstricks/base/config/xdvipdfmx.cfg.orig @@ -0,0 +1,244 @@ +% $Id: xdvipdfmx.cfg 4 2020-06-09 08:32:19Z herbert $ +% +%% BEGIN: pstricks.con (for xdvipdfmx driver) +%% +%% Configuration file for PSTricks +%% +%% Version 0.05 (2015/09/11) +%% +%% For use with xdvipdfmx +%% Created by SMiyata based on standard pstricks.con from TeXLive distribution. +%% This file may be distributed, used and modified freely. +%% Modified by Denis Girou, Herbert Voss +%% +\def\pstdriver{xdvipdfmx}% +\def\pstverb#1{\special{pst: #1}}% Check catcode of " +\def\pstunit{1bp}% +\def\pstVerb#1{\immediate\special{PST: #1}}% +\def\pstverbscale{72.27 72 div dup scale }% +\def\pstnodescale{72 72.27 div dup scale }% +% DG/SR modification begin - Apr. 28, 1997 (D. Carlisle + S. Rahtz) +% \def\pstheader#1{\special{header=#1}} +% We used to check for |\AtBeginDvi|, but that was broken in early release +% so we now check for the existence of |\textsuperscript| (added 1995/05/16) +\ifx\textsuperscript\@undefined + \def\pstheader#1{\special{header=#1}}% +\else + \ifx\Gin@PS@file@header\@undefined + \def\pstheader#1{\AtBeginDvi{\special{header=#1}}}% + \else + \let\pstheader\Gin@PS@file@header% + \fi +\fi +% DG/SR modification end +% +%% +%% +%% In the following, CP is short for currentpoint. +%% The neg is necessary because dvips scales the coordinates by 1 -1. +%% \tx@NET means neg exch neg exch translate. +\def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}% +%% +%% ****************** END xdvipdfmx ***************************** + + +%%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%% +%% 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. +\def\c@lor@to@ps#1 #2\@@{\csname c@lor@ps@#1\endcsname#2 \@@}% +\def\c@lor@ps@#1 #2\@@{TeXDict begin #1 end}% +\def\c@lor@ps@rgb#1\@@{#1 setrgbcolor}% +\def\c@lor@ps@hsb#1\@@{#1 sethsbcolor}% +\def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}% +\def\c@lor@ps@gray#1\@@{#1 setgray}% +\pstcustomize +\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}% +\def\@@scalebox{% + \leavevmode + \hbox{% +\ifdim\pst@tempd\p@<\z@ +\pst@dimg=\pst@tempd\ht\pst@hbox +\pst@dimh=\pst@tempd\dp\pst@hbox +\dp\pst@hbox=-\pst@dimg +\ht\pst@hbox=-\pst@dimh +\else +\ht\pst@hbox=\pst@tempd\ht\pst@hbox +\dp\pst@hbox=\pst@tempd\dp\pst@hbox +\fi +\pst@dima=\pst@tempc\wd\pst@hbox +\ifdim\pst@dima<\z@\kern-\pst@dima\fi +\special{x: bscale \pst@tempc \pst@tempd}% +\hbox to \z@{\box\pst@hbox\hss}% +\special{x: escale}% +\ifdim\pst@dima>\z@\kern\pst@dima\fi}}% +% +\let\ps@@scalebox\@@scalebox +\def\ps@rotateleft#1{% +\leavevmode\hbox{\hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1% +\pst@Verb{90 \tx@RotBegin}% +\vbox to \z@{\vss\hbox to \z@{\box#1\hss}\vskip\z@}% +\pst@Verb{\tx@RotEnd}}}}% +% +\def\ps@rotateright#1{% + \leavevmode\hbox{% + \hskip\ht#1\hskip\dp#1\vbox{\vskip\wd#1% + \pst@Verb{-90 \tx@RotBegin}% + \vbox to \z@{\hbox to \z@{\hss\box#1}\vss}% + \pst@Verb{\tx@RotEnd}}}}% +% +\def\ps@rotatedown#1{% +\hbox{\hskip\wd#1\vbox{\vskip\ht#1\vskip\dp#1% +\pst@Verb{180 \tx@RotBegin}% +\vbox to \z@{\hbox to \z@{\box#1\hss}\vss}% +\pst@Verb{\tx@RotEnd}}}}% +% +\def\begin@psclip{\special{x: gsave}}% +\def\end@psclip{\special{x: grestore}}% +\def\@newcolor#1#2#3{% +\expandafter\edef\csname #1\endcsname{\noexpand\pst@color{#2}}% +\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17 +\expandafter\edef\csname\string\color@xetex@#1\endcsname{#3}% +\ignorespaces}% +% +\def\newgray#1#2{% + \pst@checknum{#2}\pst@tempg + \@newcolor{#1}{\pst@tempg setgray}{gray \pst@tempg}% +} +\def\newrgbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}{rgb \pst@tempg \pst@temph \pst@tempi}% +}% +\def\newhsbcolor#1#2{% + \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}{hsb \pst@tempg \pst@temph \pst@tempi}% +}% +\def\newcmykcolor#1#2{% + \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil + \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}% + {cmyk \pst@tempg \pst@temph \pst@tempi \pst@tempj}% +}% +\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{LaTeXe}% + {\def\current@@@@color{\csname\string\color@xetex@\psfillcolor\endcsname}}{% + \AtBeginDocument{\@ifpackageloaded{xcolor}{\def\current@@@@color{\psfillcolor}}% + {\def\current@@@@color{\csname\string\color@\psfillcolor\endcsname}}}}% +% +\iffalse +\def\pst@starbox{% +\setbox\pst@hbox\hbox{{% + \def\current@color{\current@@@@color}% +\dimen@\wd\pst@hbox\advance\dimen@2\psframesep\wd\pst@hbox\dimen@% +\dimen@\ht\pst@hbox\advance\dimen@\psframesep\ht\pst@hbox\dimen@% +\dimen@\dp\pst@hbox\advance\dimen@\psframesep\dp\pst@hbox\dimen@% +\@ifundefined{LaTeXe}{\special{color push \current@color}% + \rlap{\vrule width\wd\pst@hbox height\ht\pst@hbox depth\dp\pst@hbox}% + \special{color pop}}% + {\color@block{\wd\pst@hbox}{\ht\pst@hbox}{\dp\pst@hbox}}}% +\rlap{\hskip\psframesep\unhbox\pst@hbox}}} +\fi +% +\def\AltClipMode{}% +% +\def\putoverlaybox#1{% +\hbox{\special{x: gsave}\special{x: initoverlay #1}\copy\theoverlaybox\special{x: grestore}}}% +% +\def\pst@overlay#1{\edef\curr@overlay{#1}\special{x: clipoverlay #1}\aftergroup\pst@endoverlay}% +\def\pst@endoverlay{\special{x: clipoverlay \curr@overlay}}% +\def\AltOverlayMode{}% +%The next line is not necessary, if pstricks.sty of [2007/02/18 v0.33] or newer is used. +\@ifundefined{LaTeXe}{}{\AtBeginDocument{\psset{fillcolor=white}}}% +% +\endinput +% +% +%%%%%%%%%%%%%%%% DESCRIPTION OF CONFIGURATION DEFINITIONS %%%%%%%%%%%%%%% + +Here are the commands that must be defined in this file: + + \pstverb{} - The argument is included as verbatim PostScript, + grouped by save and restore. The coordinate system + should be square, not rotated, and with the origin + at TeX's currentpoint. + + \pstVerb{} - The argument is included as verbatim PostScript, not + grouped by (g)save and (g)restore. The currentpoint + should be TeX's currentpoint. + + \pstunit - The units used by driver for graphics included with + \pstverb. Probably 1bp or 1sp. + + \pstverbscale - The PostScript code that scales the coordinate system + from that in effect with \pstVerb to that in effect + with \pstverb. Should not translate to the currentpoint. + + \pstrotate - The PostScript code that takes a number off the stack + and rotates the axes properly. I.e., + \pstVerb{angle \pstrotate} is used to begin rotations. + + \pstheader{} - The argument is a header file (e.g., .pro file). + If your driver does not support such a special, then + the command might just remind you to include the header + when printing. You can use PSTricks without a header, + in which case it does not matter how you define + \pstheader. See read-me.pst for details. + If you cannot change the default directory where your + driver looks for header files, and you cannot write to + that directory, then you include the path for your + PSTricks header files. + E.g., \def\pstheader#1{\special{header=~/tex/#1}}. + + \pstdriver - The name of the driver. + + +%%%%%%%%% !! HOW TO MAKE A TEX FORMAT WITH PSTRICKS PRELOADED !! %%%%%%%% + +See your local TeX documentation for instructions on creating a TeX format. + +Before making the format, be sure that this configuration file is correct. +It will be read only when creating the format, and not with every job. + +If you are not using header files, there are no more special instructions. + +Special instructions when using header files: + + - If you want to include supplementary PSTricks files (e.g., pst-node.tex), + add \input commands in the customization section above. + + - If your definition of \pstheader is, e.g. + + \def\pstheader#1{\special{\header=#1}} + + then change it to + + \def\pstheader#1{% + \expandafter\everyjob\expandafter{\the\everyjob + \special{header=#1}}} + + and put your original definition in the customization section, AFTER + any \input commands. E.g., the customization section might look like: + + \pstcustomize + \input pst-node.tex + \input pst-coil.tex + \def\pstheader#1{\special{header=#1}} + + - Input pstricks.tex at the appropriate time when creating the format. + E.g., when initex stops running: + *\input pstricks + *\dump + + +%% +%% END: pstricks.con diff --git a/graphics/pstricks/base/doc/pst-news.tex b/graphics/pstricks/base/doc/pst-news.tex index f9e40428f8..6f3946714c 100644 --- a/graphics/pstricks/base/doc/pst-news.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news08.pdf b/graphics/pstricks/base/doc/pst-news08.pdf Binary files differindex 428653ebf2..00811580d4 100644 --- a/graphics/pstricks/base/doc/pst-news08.pdf +++ b/graphics/pstricks/base/doc/pst-news08.pdf diff --git a/graphics/pstricks/base/doc/pst-news09.tex b/graphics/pstricks/base/doc/pst-news09.tex index 4a656a8566..a548f6e1bb 100644 --- a/graphics/pstricks/base/doc/pst-news09.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news10.tex b/graphics/pstricks/base/doc/pst-news10.tex index d4c018d92e..e679c0a617 100644 --- a/graphics/pstricks/base/doc/pst-news10.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news11.tex b/graphics/pstricks/base/doc/pst-news11.tex index a4254f226f..61efbef06c 100644 --- a/graphics/pstricks/base/doc/pst-news11.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news12.tex b/graphics/pstricks/base/doc/pst-news12.tex index 759869d864..2b3e185931 100644 --- a/graphics/pstricks/base/doc/pst-news12.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news13.tex b/graphics/pstricks/base/doc/pst-news13.tex index 2995cf042d..04b7de5995 100644 --- a/graphics/pstricks/base/doc/pst-news13.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news14.tex b/graphics/pstricks/base/doc/pst-news14.tex index 75b209b580..f0a108fba1 100644 --- a/graphics/pstricks/base/doc/pst-news14.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news15.tex b/graphics/pstricks/base/doc/pst-news15.tex index c2369d7018..231a8bd38c 100644 --- a/graphics/pstricks/base/doc/pst-news15.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news16.tex b/graphics/pstricks/base/doc/pst-news16.tex index 9a544ca5bd..b0d91ec84a 100644 --- a/graphics/pstricks/base/doc/pst-news16.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news17.tex b/graphics/pstricks/base/doc/pst-news17.tex index 53cf23c2ce..1bd25716a6 100644 --- a/graphics/pstricks/base/doc/pst-news17.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news18.tex b/graphics/pstricks/base/doc/pst-news18.tex index dde1638e58..ac3ec7c4a4 100644 --- a/graphics/pstricks/base/doc/pst-news18.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news19.pdf b/graphics/pstricks/base/doc/pst-news19.pdf Binary files differindex 4c32cf3c1c..8fceedb1b9 100644 --- a/graphics/pstricks/base/doc/pst-news19.pdf +++ b/graphics/pstricks/base/doc/pst-news19.pdf diff --git a/graphics/pstricks/base/doc/pst-news19.tex b/graphics/pstricks/base/doc/pst-news19.tex index 9db696bc29..c670a6697d 100644 --- a/graphics/pstricks/base/doc/pst-news19.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news20.tex b/graphics/pstricks/base/doc/pst-news20.tex index 00acba1ff2..f5a8094d14 100644 --- a/graphics/pstricks/base/doc/pst-news20.tex +++ b/graphics/pstricks/base/doc/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/graphics/pstricks/base/doc/pst-news21.pdf b/graphics/pstricks/base/doc/pst-news21.pdf Binary files differindex dc4cada65b..fb0d5b9f1d 100644 --- a/graphics/pstricks/base/doc/pst-news21.pdf +++ b/graphics/pstricks/base/doc/pst-news21.pdf diff --git a/graphics/pstricks/base/doc/pst-news21.tex b/graphics/pstricks/base/doc/pst-news21.tex index facad54b55..7c8e8cb4ee 100644 --- a/graphics/pstricks/base/doc/pst-news21.tex +++ b/graphics/pstricks/base/doc/pst-news21.tex @@ -3,7 +3,7 @@ headinclude=false,footinclude=false,twoside]{pst-doc} \usepackage{libertinus} - +\usepackage{hvlogos} \listfiles %\usepackage[svgnames,dvipsnames,x11names,pspdf=-dALLOWPSTRANSPARENCY]{pstricks-pdf} \usepackage{showexpl,pst-arrow} @@ -188,6 +188,11 @@ There was a bug if this fillstyle was used together with a line sequence. \endpspicture\end{lstlisting} +\section{\LuaLaTeX} +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/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro b/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro new file mode 100644 index 0000000000..952fccfa80 --- /dev/null +++ b/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro @@ -0,0 +1,69 @@ +% $Id: pstricks-fonts-lm.pro 4 2020-06-09 08:32:19Z herbert $ +% +%% PostScript font prologue for pstricks.tex. +%% Version 0.01, 2016/04/22 +%% +%% 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. +% +% +%true setglobal globaldict begin + +%dd-lmbx10 LMRoman10-Bold <dotdigits-clm.enc <lmbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmbxi10 LMRoman10-BoldItalic <dotdigits-clm.enc <lmbxi10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmbxo10 LMRomanSlant10-Bold <dotdigits-clm.enc <lmbxo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmcsc10 LMRomanCaps10-Regular <dotdigits-clm.enc <lmcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmcsco10 LMRomanCaps10-Oblique <dotdigits-clm.enc <lmcsco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmdunh10 LMRomanDunh10-Regular <dotdigits-clm.enc <lmdunh10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmduno10 LMRomanDunh10-Oblique <dotdigits-clm.enc <lmduno10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmr10 LMRoman10-Regular <dotdigits-clm.enc <lmr10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmri10 LMRoman10-Italic <dotdigits-clm.enc <lmri10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmro10 LMRomanSlant10-Regular <dotdigits-clm.enc <lmro10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " + +/Times-Roman /LMRoman10-Regular def +/Times-Bold /LMRoman10-Bold def +/Times-Italic /LMRoman10-Italic def +/Times-BoldItalic /LMRoman10-BoldItalic def + +%mss8ttl10 LMSans10-Regular <t1-clm.enc <lmss10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%lmssbo8ttl10 LMSans10-BoldOblique <t1-clm.enc <lmssbo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%lmssbx8ttl10 LMSans10-Bold <t1-clm.enc <lmssbx10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%lmssdc8ttl10 LMSansDemiCond10-Regular <t1-clm.enc <lmssdc10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%lmssdo8ttl10 LMSansDemiCond10-Oblique <t1-clm.enc <lmssdo10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%lmsso8ttl10 LMSans10-Oblique <t1-clm.enc <lmsso10.pfb " fontinst-autoenc-t1-clm ReEncodeFont " +%dd-lmss10 LMSans10-Regular <dotdigits-clm.enc <lmss10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmssbo10 LMSans10-BoldOblique <dotdigits-clm.enc <lmssbo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmssbx10 LMSans10-Bold <dotdigits-clm.enc <lmssbx10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmssdc10 LMSansDemiCond10-Regular <dotdigits-clm.enc <lmssdc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmssdo10 LMSansDemiCond10-Oblique <dotdigits-clm.enc <lmssdo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmsso10 LMSans10-Oblique <dotdigits-clm.enc <lmsso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " + +/Helvetica /LMSans10-Regular def +/Helvetica-Bold /LMSans10-Bold def +/Helvetica-Oblique /LMSans10-Oblique def +/Helvetica-BoldOblique /LMSans10-BoldOblique def + +%dd-lmtcsc10 LMMonoCaps10-Regular <dotdigits-clm.enc <lmtcsc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtcso10 LMMonoCaps10-Oblique <dotdigits-clm.enc <lmtcso10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtk10 LMMonoLt10-Bold <dotdigits-clm.enc <lmtk10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtko10 LMMonoLt10-BoldOblique <dotdigits-clm.enc <lmtko10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtl10 LMMonoLt10-Regular <dotdigits-clm.enc <lmtl10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtlc10 LMMonoLtCond10-Regular <dotdigits-clm.enc <lmtlc10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtlco10 LMMonoLtCond10-Oblique <dotdigits-clm.enc <lmtlco10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtlo10 LMMonoLt10-Oblique <dotdigits-clm.enc <lmtlo10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtt10 LMMono10-Regular <dotdigits-clm.enc <lmtt10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtti10 LMMono10-Italic <dotdigits-clm.enc <lmtti10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " +%dd-lmtto10 LMMonoSlant10-Regular <dotdigits-clm.enc <lmtto10.pfb " fontinst-autoenc-dotdigits-clm ReEncodeFont " + +/Courier /LMMono10-Regular def +/Courier-Bold /LMMono10-Bold def +/Courier-Oblique /LMMono10-Italic def +/Courier-BoldOblique /LMMono10-BoldOblique def + +/Symbol /StandardSymL def + +%end false setglobal +% +% end of file + diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro b/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro new file mode 100644 index 0000000000..a2da535389 --- /dev/null +++ b/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro @@ -0,0 +1,32 @@ +% $Id: pstricks-fonts-ps.pro 4 2020-06-09 08:32:19Z herbert $ +% +%% PostScript font prologue for pstricks.tex. +%% Version 0.01, 2016/04/22 +%% +%% 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. +% +% +%true setglobal globaldict begin + +/Times-Roman /Times-Roman def +/Times-Bold /Times-Bold def +/Times-Italic /Times-Italic def +/Times-BoldItalic /Times-BoldItalic def + +/Helvetica /Helvetica def +/Helvetica-Bold /Helvetica-Bold def +/Helvetica-Oblique /Helvetica-Oblique def +/Helvetica-BoldOblique /Helvetica-BoldOblique def + +/Courier /Courier def +/Courier-Bold /Courier-Bold def +/Courier-Oblique /Courier-Oblique def +/Courier-BoldOblique /Courier-BoldOblique def + +/Symbol /Symbol def + +%end false setglobal +% +% end of file diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro b/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro new file mode 100644 index 0000000000..9191a26128 --- /dev/null +++ b/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro @@ -0,0 +1,61 @@ +% $Id: pstricks-fonts-urw.pro 4 2020-06-09 08:32:19Z herbert $ +% +%% PostScript font prologue for pstricks.tex. +%% Version 0.01, 2016/04/22 +%% +%% 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. +% +% +%true setglobal globaldict begin + +%n021003l.pfa:/FontName /NimbusRomNo9L-Regu def +%n021004l.pfa:/FontName /NimbusRomNo9L-Medi def +%n021023l.pfa:/FontName /NimbusRomNo9L-ReguItal def +%n021024l.pfa:/FontName /NimbusRomNo9L-MediItal def + +/Times-Roman /NimbusRomNo9L-Regu def +/Times-Roman-Bold /NimbusRomNo9L-Medi def +/Times-Italic /NimbusRomNo9L-ReguItal def +/Times-BoldItalic /NimbusRomNo9L-MediItal def + +%n019003l.pfa:/FontName /NimbusSanL-Regu def +%n019004l.pfa:/FontName /NimbusSanL-Bold def +%n019023l.pfa:/FontName /NimbusSanL-ReguItal def +%n019024l.pfa:/FontName /NimbusSanL-BoldItal def +%n019043l.pfa:/FontName /NimbusSanL-ReguCond def +%n019044l.pfa:/FontName /NimbusSanL-BoldCond def +%n019063l.pfa:/FontName /NimbusSanL-ReguCondItal def +%n019064l.pfa:/FontName /NimbusSanL-BoldCondItal def + +%/Helvetica /dd-lmss10 def +/Helvetica /LMSans10-Regular def +%/Helvetica /NimbusSanL-Regu def +/Helvetica-Bold /NimbusSanL-Bold def +/Helvetica-Oblique /NimbusSanL-ReguItal def +/Helvetica-BoldOblique /NimbusSanL-BoldItal def + +%n022003l.pfa:/FontName /NimbusMonL-Regu cvn def +%n022004l.pfa:/FontName /NimbusMonL-Bold cvn def +%n022023l.pfa:/FontName /NimbusMonL-ReguObli cvn def +%n022024l.pfa:/FontName /NimbusMonL-BoldObli cvn def + +/Courier /NimbusMonL-Regu def +/Courier-Bold /NimbusMonL-Bold def +/Courier-Oblique /NimbusMonL-ReguObli def +/Courier-BoldOblique /NimbusMonL-BoldObli def + +%s050000l.pfa:/FontName /StandardSymL def + +/Symbol /StandardSymL def + +%p052003l.pfa:/FontName /URWPalladioL-Roma def +%p052004l.pfa:/FontName /URWPalladioL-Bold def +%p052023l.pfa:/FontName /URWPalladioL-Ital def +%p052024l.pfa:/FontName /URWPalladioL-BoldItal def +%z003034l.pfa:/FontName /URWChanceryL-MediItal def + +%end false setglobal +% +% end of file diff --git a/graphics/pstricks/base/dvips/pstricks.pro b/graphics/pstricks/base/dvips/pstricks.pro index 26e64b4e33..ac52ca5f7d 100644 --- a/graphics/pstricks/base/dvips/pstricks.pro +++ b/graphics/pstricks/base/dvips/pstricks.pro @@ -1,7 +1,7 @@ -% $Id: pstricks.pro 164 2021-08-25 19:26:42Z herbert $ +% $Id: pstricks.pro 167 2021-08-27 12:15:28Z herbert $ % %% PostScript prologue for pstricks.tex. -%% Version 1.36, 2021/08/25 +%% Version 1.37, 2021/08/26 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -21,7 +21,7 @@ revision 952 gt } { /.setopacityalpha /.setfillconstantalpha load def - /.setblendmode { pop } def +% /.setblendmode { pop } def %% works again hv 20210825 /.setshapealpha {dup .setfillconstantalpha .setstrokeconstantalpha true .setalphaisshape } def } ifelse } @@ -1036,7 +1036,8 @@ tx@Dict begin /Points [ x1 y1 xSP ySP xSP 2 mul x1 sub y1 ] def } def % -/Grid { +/Grid { + 40 dict begin newpath /a 4 string def /b ED % psk@gridlabels in pt @@ -1114,6 +1115,7 @@ tx@Dict begin /i i h add def } repeat grestore + end } def % /ArcArrow { diff --git a/graphics/pstricks/base/generic/pst-fp.tex b/graphics/pstricks/base/generic/pst-fp.tex index 49638dbb0a..e00736bdeb 100644 --- a/graphics/pstricks/base/generic/pst-fp.tex +++ b/graphics/pstricks/base/generic/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', diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex index 10cd89eba5..3bbf6a341e 100644 --- a/graphics/pstricks/base/generic/pstricks.tex +++ b/graphics/pstricks/base/generic/pstricks.tex @@ -81,8 +81,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{3.05} -\def\filedate{2021/08/25} +\def\fileversion{3.06} +\def\filedate{2021/08/27} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -429,20 +429,53 @@ \fi% } \fi -%-------------- end old vesrion --------------- +%-------------- end old version --------------- % \def\pst@configerr#1{\@pstrickserr{\string#1 not defined in pstricks.con}\@ehpc} -% -\def\pstVerb#1{\pst@configerr\pstVerb} -\def\pstverb#1{\pst@configerr\pstverb} -\def\pstverbscale{\pst@configerr\pstverbscale} -\def\pstrotate{\pst@configerr\pstrotate} -\def\pstheader#1{\pst@configerr\pstheader} -\def\pstdriver{\pst@configerr\pstdriver} -\@ifundefined{pstcustomize}% - {\def\pstcustomize{\endinput\let\pstcustomize\relax}}{} -% -\input pstricks.con % local config file + +\newif\ifPSTlualatex + +\ifdefined\directlua + \ifdefined\app@cmd@latex % do we have auto-pst-pdf-lua loaded? + \PSTlualatexfalse % + \typeout{--- We are running lualatex or dvilualatex with auto-pst-pdf-lua ---}% + \else + \ifnum\outputmode=1 + \PSTlualatextrue % + \typeout{--- We are running lualatex with luapstricks ---}% + \else + \PSTlualatexfalse % + \typeout{--- We are running dvilualatex without luapstricks ---}% + \fi + \fi +\else + \typeout{--- We are running latex or xelatex ---}% + \PSTlualatexfalse +\fi +\ifPSTlualatex + \directlua{require'luapstricks'}% + \def\pstdriver{LuaLaTeX}% + \def\pstverb{\luaPST}% + \def\pstVerb{\luaPST direct}% + \def\pstunit{1bp}% + \def\pstverbscale{}% + \def\pstnodescale{}% + \def\pstheader{\luaPSTheader}% + \def\c@lor@to@ps#1\@@{(#1) setpdfcolor} +% \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} +\else + \def\pstVerb#1{\pst@configerr\pstVerb}% + \def\pstverb#1{\pst@configerr\pstverb}% + \def\pstverbscale{\pst@configerr\pstverbscale}% + \def\pstrotate{\pst@configerr\pstrotate}% + \def\pstheader#1{\pst@configerr\pstheader}% + \def\pstdriver{\pst@configerr\pstdriver}% + \@ifundefined{pstcustomize}% + {\def\pstcustomize{\endinput\let\pstcustomize\relax}}{}% + \input pstricks.con % local config file +\fi % \newif\ifPSTricks \PSTrickstrue @@ -2664,7 +2697,22 @@ \pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}} \psset[pstricks]{subgriddiv=5} % -\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13 +\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{% + \typeout{Test lualatex}% + \ifPSTlualatex + \typeout{Test true}% + \ifx\relax#1\relax + \typeout{>>>>>>>>>>>>>>>> HIER <<<<<<<<<<<<<<}% + \def\psk@gridfont{\fontid\font\space .findfontid }% + \else + \def\psk@gridfont{/#1 findfont }% hv 2007-11-13 + \fi + \else + \typeout{Test false}% + \def\psk@gridfont{/#1 findfont }% hv 2007-11-13 + \fi +}% + \ifpst@psfonts \psset[pstricks]{gridfont=Helvetica}% \else @@ -2707,7 +2755,7 @@ \pst@number\psxunit abs \pst@number\psyunit abs % hv 1.11 \psk@subgriddiv\space \psk@subgriddots\space {} 0 - \psk@gridfont findfont 0 scalefont setfont % hv 1.16 + \psk@gridfont 0 scalefont setfont % hv 1.16 \tx@Grid grestore }% @@ -2726,8 +2774,8 @@ % \pst@number\psxunit \pst@number\psyunit % hv 1.11 1 \psk@griddots\space { \pst@usecolor\psgridlabelcolor } \psk@gridlabels - \psk@gridfont findfont \psk@gridlabels scalefont setfont % hv 1.16 - \tx@Grid + \psk@gridfont \psk@gridlabels scalefont setfont % hv 1.16 + \tx@Grid grestore }% \end@SpecialObj @@ -2892,7 +2940,12 @@ \def\AltClipMode{% \def\end@psclip{\pstVerb{\pst@grestore}}% \def\begin@psclip{\pstVerb{gsave}}} - \def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}} + +\ifPSTlualatex + \AltClipMode +\fi + +\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}} % DG modification begin - Apr. 3, 1997 % From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus) %\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}} |