summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-10 03:03:06 +0000
committerNorbert Preining <norbert@preining.info>2020-06-10 03:03:06 +0000
commit6706ba0fbc0ef5a672ef0ccb05bd75174a30bb07 (patch)
tree8550d1422518fc677ef6e16dc409e92466155139 /graphics
parent03edc188c852d76ccf08759e0c334228f5f37c9f (diff)
CTAN sync 202006100303
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pstricks/base/Changes4
-rw-r--r--graphics/pstricks/base/README6
-rw-r--r--graphics/pstricks/base/doc/pst-doc.cls3
-rw-r--r--graphics/pstricks/base/doc/pst-news19.pdfbin63160 -> 59875 bytes
-rw-r--r--graphics/pstricks/base/doc/pst-news19.tex5
-rw-r--r--graphics/pstricks/base/doc/pst-news20.pdfbin0 -> 39952 bytes
-rw-r--r--graphics/pstricks/base/doc/pst-news20.tex77
-rw-r--r--graphics/pstricks/base/dvips/pst-algparser.pro2
-rw-r--r--graphics/pstricks/base/dvips/pst-dots.pro2
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-lm.pro2
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-ps.pro2
-rw-r--r--graphics/pstricks/base/dvips/pstricks-fonts-urw.pro2
-rw-r--r--graphics/pstricks/base/dvips/pstricks.pro48
-rw-r--r--graphics/pstricks/base/generic/pst-fp.tex2
-rw-r--r--graphics/pstricks/base/generic/pst-key.tex2
-rw-r--r--graphics/pstricks/base/generic/pstricks-tex.def2
-rw-r--r--graphics/pstricks/base/generic/pstricks-xetex.def2
-rw-r--r--graphics/pstricks/base/generic/pstricks.con2
-rw-r--r--graphics/pstricks/base/generic/pstricks.tex17
-rw-r--r--graphics/pstricks/base/latex/pst-all.sty2
-rw-r--r--graphics/pstricks/base/latex/pst-key.sty2
-rw-r--r--graphics/pstricks/base/latex/pst-platform.sty2
-rw-r--r--graphics/pstricks/base/latex/pstcol.sty2
-rw-r--r--graphics/pstricks/base/latex/pstricks-pdf.sty2
-rw-r--r--graphics/pstricks/base/latex/pstricks.sty2
25 files changed, 147 insertions, 45 deletions
diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes
index 77863478a3..a79536fa9e 100644
--- a/graphics/pstricks/base/Changes
+++ b/graphics/pstricks/base/Changes
@@ -1,4 +1,4 @@
-% $Id: Changes 934 2019-02-23 14:07:34Z herbert $
+% $Id: Changes 4 2020-06-09 08:32:19Z herbert $
Changelog for
@@ -25,6 +25,7 @@ pstricks.tex --------
versions like 2.47a have only changes in other files, but not
in this main package.
+2.99 2020-06-09 - added two optional arguments for \psgrid: griddx and griddy
2.97 2019-05-11 - fix for trailing space with \pscustom
2.96 2019-02-23 - use \ifx\pgfkeysloaded\relax for the test
2.95 2019-01-22 - preset dimen=inner for a circle
@@ -335,6 +336,7 @@ pstricks-doc -----------
---- pstricks.pro
+1.31 2020-06-09 - added support for griddx and griddy
1.30 2018-12-17 - added offset parameter for Grid
1.29 2018-11-14 - added /Power function
1.28 2017-12-30 - /AnytoDeg, /DegtoAny, /AnytoRad and /RadtoAny
diff --git a/graphics/pstricks/base/README b/graphics/pstricks/base/README
index d665fee041..9bc1dd3686 100644
--- a/graphics/pstricks/base/README
+++ b/graphics/pstricks/base/README
@@ -1,4 +1,4 @@
-PSTricks 2019
+PSTricks 2020
This package may be distributed under the terms of the LaTeX Project
Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -25,7 +25,7 @@ news articles in the doc directory!
COPYRIGHT 1993, 1994, 2000 by Timothy Van Zandt, <tvz@econ.insead.fr>.
COPYRIGHT 2004, 2005 by Herbert Voss <voss@PSTricks.de> and
Rolf Niepraschk <Rolf.Niepraschk@ptb.de>.
-COPYRIGHT 2006-- by Herbert Voss <hvoss@tug.org>
+COPYRIGHT 2006--current by 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
@@ -122,4 +122,4 @@ be found on the Web page.
--
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated December 2018)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated June 2020)
diff --git a/graphics/pstricks/base/doc/pst-doc.cls b/graphics/pstricks/base/doc/pst-doc.cls
index d03ad411d9..fb5d75fb45 100644
--- a/graphics/pstricks/base/doc/pst-doc.cls
+++ b/graphics/pstricks/base/doc/pst-doc.cls
@@ -1,4 +1,4 @@
-% $Id: pst-doc.cls 857 2018-12-13 11:20:40Z herbert $
+% $Id: pst-doc.cls 1044 2019-04-11 09:32:09Z herbert $
%
%%
%% The PSTricks Project
@@ -437,6 +437,7 @@ xleftmargin=0pt,xrightmargin=0pt,
\def\OptArgs{\colorbox{black!20}{\texttt{[Options]}}\kern1pt}
+
\def\OptArg{\@ifnextchar*\OptArg@i{\OptArg@ii*}}% star version without braces
\def\OptArg@i*#1{\colorbox{black!20}{\texttt{#1}}\kern1pt}
\def\OptArg@ii*#1{\colorbox{black!20}{\texttt{[#1]}}\kern1pt}
diff --git a/graphics/pstricks/base/doc/pst-news19.pdf b/graphics/pstricks/base/doc/pst-news19.pdf
index 03e52eaaa5..4c32cf3c1c 100644
--- a/graphics/pstricks/base/doc/pst-news19.pdf
+++ b/graphics/pstricks/base/doc/pst-news19.pdf
Binary files differ
diff --git a/graphics/pstricks/base/doc/pst-news19.tex b/graphics/pstricks/base/doc/pst-news19.tex
index 5c7a52d60a..9db696bc29 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 927 2019-01-30 15:11:30Z herbert $
+%% $Id: pst-news19.tex 934 2019-02-23 14:07:34Z herbert $
\PassOptionsToPackage{useCalc}{pstricks}
\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
headinclude=false,footinclude=false,twoside]{pst-doc}
@@ -102,6 +102,7 @@ pairwise coordinates.
\end{LTXexample}
+\iffalse
There is a new experimental feature, which allows algebraic notation for
coordinates. It needs
@@ -116,7 +117,7 @@ coordinates. It needs
\end{pspicture}
\end{LTXexample}
-
+\fi
\subsection{Error message}
diff --git a/graphics/pstricks/base/doc/pst-news20.pdf b/graphics/pstricks/base/doc/pst-news20.pdf
new file mode 100644
index 0000000000..fb73a7c29c
--- /dev/null
+++ b/graphics/pstricks/base/doc/pst-news20.pdf
Binary files differ
diff --git a/graphics/pstricks/base/doc/pst-news20.tex b/graphics/pstricks/base/doc/pst-news20.tex
new file mode 100644
index 0000000000..b304d4b798
--- /dev/null
+++ b/graphics/pstricks/base/doc/pst-news20.tex
@@ -0,0 +1,77 @@
+%% $Id: pst-news20.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}
+\listfiles
+\let\Lfile\LFile
+\usepackage{pstricks}
+\let\pstnodeFV\fileversion
+\let\pstnodeFD\filedate
+\usepackage{pst-node}
+\usepackage{pst-plot}
+\usepackage{pst-solides3d}
+\usepackage{pst-node}
+\usepackage{pst-calculate}
+\usepackage{pstricks-add}
+\usepackage{xkvview}
+\renewcommand\bgImage{\psscalebox{15}{\color{blue!20}\the\year}}
+\def\textat{\char064}
+\usepackage{dtk-logos}
+\usepackage{biblatex}
+\addbibresource{PSTricks.bib}
+
+\lstset{explpreset={width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+ escapechar=?}
+\begin{document}
+
+%\psset{PstDebug=1}
+\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the
+basic package \nxLFile{pstricks}}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\clearpage
+\tableofcontents
+
+\clearpage
+\part{\texttt{pstricks} -- package}
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty} -- \texttt{pstricks-pdf.sty}}
+%--------------------------------------------------------------------------------------
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (v. 2.99 -- 2020/06/09)}
+%--------------------------------------------------------------------------------------
+
+New optional arguments \Lkeyword{griddx} and \Lkeyword{griddy}, which are only valid
+for \Lcs{psgrid}:
+
+\begin{LTXexample}[pos=t,vsep=10mm]
+\psset{unit=5mm}
+\newpsstyle{gridstyle}{gridlabels=8pt, gridfont=Helvetica, gridcolor=red,
+ subgridcolor=gray, subgriddiv=5, gridwidth=.8pt, subgridwidth=.4pt,
+ griddots=10, subgriddots=5,
+ griddx=5, griddy=2 }
+\begin{pspicture}[showgrid](25,25)
+\end{pspicture}
+\end{LTXexample}
+
+\newpage
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.pro}}
+%--------------------------------------------------------------------------------------
+
+The function \texttt{Grid} supports GridDX and GridDY.
+
+\nocite{*}
+\printbibliography
+
+\printindex
+
+
+\end{document}
+
diff --git a/graphics/pstricks/base/dvips/pst-algparser.pro b/graphics/pstricks/base/dvips/pst-algparser.pro
index 2f0e84aae0..58f772b212 100644
--- a/graphics/pstricks/base/dvips/pst-algparser.pro
+++ b/graphics/pstricks/base/dvips/pst-algparser.pro
@@ -1,4 +1,4 @@
-% $Id: pst-algparser.pro 446 2017-04-19 11:40:55Z herbert $
+% $Id: pst-algparser.pro 4 2020-06-09 08:32:19Z herbert $
%%
%% PostScript prologue for PSTricks algorithm parser
%% Version 0.07, 2014/08/01
diff --git a/graphics/pstricks/base/dvips/pst-dots.pro b/graphics/pstricks/base/dvips/pst-dots.pro
index eb71f86867..5e77137ed4 100644
--- a/graphics/pstricks/base/dvips/pst-dots.pro
+++ b/graphics/pstricks/base/dvips/pst-dots.pro
@@ -1,4 +1,4 @@
-% $Id: pst-dots.pro 446 2017-04-19 11:40:55Z herbert $
+% $Id: pst-dots.pro 4 2020-06-09 08:32:19Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 2.02, 2009/06/16
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro b/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro
index 5ab5e436df..952fccfa80 100644
--- a/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro
+++ b/graphics/pstricks/base/dvips/pstricks-fonts-lm.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+% $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
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro b/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro
index da5cdb7a1e..a2da535389 100644
--- a/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro
+++ b/graphics/pstricks/base/dvips/pstricks-fonts-ps.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+% $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
diff --git a/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro b/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro
index a0dd8bdda5..9191a26128 100644
--- a/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro
+++ b/graphics/pstricks/base/dvips/pstricks-fonts-urw.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks-fonts.pro 446 2017-04-19 11:40:55Z herbert $
+% $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
diff --git a/graphics/pstricks/base/dvips/pstricks.pro b/graphics/pstricks/base/dvips/pstricks.pro
index 0911f0eb0b..9ea39830fe 100644
--- a/graphics/pstricks/base/dvips/pstricks.pro
+++ b/graphics/pstricks/base/dvips/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 872 2018-12-21 20:39:31Z herbert $
+% $Id: pstricks.pro 4 2020-06-09 08:32:19Z herbert $
%
%% PostScript prologue for pstricks.tex.
%% Version 1.30, 2018/12/17
@@ -62,13 +62,20 @@ tx@Dict begin
%
/NET { neg exch neg exch T } def % change coordinate system to the negative one
/Pyth { dup mul exch dup mul add sqrt } def % Pythagoras, expects 2 parameter
+/addCoors {
+ 3 -1 roll % xA xB yB yA
+ add % xA xB yB+yA
+ 3 1 roll % yB+yA xA xB
+ add % yB+yA xA+xB
+ exch % xA+xB yA+yB
+} def
/Pyth2 { % Pythagoras, xA yA xB yB
3 -1 roll % xA xB yB yA
sub % xA xB yB-yA
3 1 roll % yB-yA xA xB
sub % yB-yA xA-xB
Pyth } def
-/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian (origimal)
+/PtoC { 2 copy cos mul 3 1 roll sin mul } def % Polar to Cartesian (original)
/PtoCrel { pst@angleunit PtoC } def % Polar to Cartesian with \degrees[??]
/PtoCab { dup cos 4 -1 roll mul 3 1 roll sin mul } def % Polar to Cartesian (Ellipse) a b phi-> x y
/AnytoDeg { pst@angleunit } def
@@ -989,7 +996,7 @@ gsave
/s ED % \psk@subgriddiv
s div dup 0 eq { pop 1 } if
/dy ED s div dup 0 eq { pop 1 } if % \pst@number\psyunit abs
- /dx ED dy div round dy mul % \pst@number\psxunit abs
+ /dx ED dy div round dy mul % \pst@number\psxunit abs
/y0 ED dx div round dx mul
/x0 ED dy div round cvi
/y2 ED dx div round cvi
@@ -1015,36 +1022,45 @@ gsave
/f y1 dy mul n 0 gt { dy n div 2 div h mul sub } if def
/g y2 dy mul n 0 gt { dy n div 2 div h mul add } if def
x2 x1 sub w mul 1 add dup 1000 gt { pop 1000 } if
- { i dx mul dup xGridOffset add y0 moveto
- b 0 gt
- { gsave c i a cvs dup stringwidth pop
- /z2 ED w 0 gt {z1} {z1 z2 add neg} ifelse
- h 0 gt {b neg}{z1} ifelse
- rmoveto show grestore } if
+ dup % run loop two times: lines and labels
+ { i dx mul dup xGridOffset add y0 moveto % draw the lines
dup t f moveto
g t L stroke
/i i w add def
} repeat
+ /i x1 def
+ GridDX div ceiling cvi
+ { i dx mul GridDX mul dup xGridOffset add y0 moveto % plot the labels
+ b 0 gt
+ { gsave c i GridDX mul a cvs dup stringwidth pop /z2 ED
+ w 0 gt {z1} {z1 z2 add neg} ifelse
+ h 0 gt {b neg}{z1} ifelse exch GridDX div z2 2 div sub exch
+ rmoveto show grestore } if
+ /i i w add def
+ } repeat
grestore
gsave
n 0 gt
- % DG/SR modification begin - Nov. 7, 1997 - Patch 1
- %{ 1 setlinecap [ 0 dx n div ] dy n div 2 div setdash }
{ 1 setlinecap [ 0 dx n div ] dx n div 2 div setdash }
- % DG/SR modification end
{ 2 setlinecap } ifelse
/i y1 def
/f x1 dx mul n 0 gt { dx n div 2 div w mul sub } if def
/g x2 dx mul n 0 gt { dx n div 2 div w mul add } if def
y2 y1 sub h mul 1 add dup 1000 gt { pop 1000 } if
+ dup % run loop two times: lines and labels
{ newpath i dy mul dup yGridOffset add x0 exch moveto
- b 0 gt { gsave c i a cvs dup stringwidth pop
+ dup f exch t moveto
+ g exch t L stroke
+ /i i h add def
+ } repeat
+ /i y1 def
+ GridDY div ceiling cvi
+ { newpath i dy mul GridDY mul dup yGridOffset add x0 exch moveto
+ b 0 gt { gsave c i GridDY mul a cvs dup stringwidth pop
/z2 ED
w 0 gt {z1 z2 add neg} {z1} ifelse
- h 0 gt {z1} {b neg} ifelse
+ h 0 gt {z1} {b neg} ifelse GridDY div b 2 div sub
rmoveto show grestore } if
- dup f exch t moveto
- g exch t L stroke
/i i h add def
} repeat
grestore
diff --git a/graphics/pstricks/base/generic/pst-fp.tex b/graphics/pstricks/base/generic/pst-fp.tex
index 2d4e748193..34cfb16f9e 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 465 2017-05-22 17:50:57Z herbert $
+%% $Id: pst-fp.tex 4 2020-06-09 08:32:19Z herbert $
%%
%%
%% This is file `pst-fp.tex',
diff --git a/graphics/pstricks/base/generic/pst-key.tex b/graphics/pstricks/base/generic/pst-key.tex
index 8c1204bc17..7a58ce2e7d 100644
--- a/graphics/pstricks/base/generic/pst-key.tex
+++ b/graphics/pstricks/base/generic/pst-key.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-key.tex 446 2017-04-19 11:40:55Z herbert $
+%% $Id: pst-key.tex 4 2020-06-09 08:32:19Z herbert $
%%
%% This is file `pst-key.tex',
%% generated with the docstrip utility.
diff --git a/graphics/pstricks/base/generic/pstricks-tex.def b/graphics/pstricks/base/generic/pstricks-tex.def
index d5e7311030..d3039e8bf6 100644
--- a/graphics/pstricks/base/generic/pstricks-tex.def
+++ b/graphics/pstricks/base/generic/pstricks-tex.def
@@ -1,4 +1,4 @@
-%% $Id: pstricks-tex.def 1044 2019-04-11 09:32:09Z herbert $
+%% $Id: pstricks-tex.def 4 2020-06-09 08:32:19Z herbert $
%% pstricks-tex.def
%% Copyright 2017- Herbert Voss
%
diff --git a/graphics/pstricks/base/generic/pstricks-xetex.def b/graphics/pstricks/base/generic/pstricks-xetex.def
index 8e9efc2026..68049094a2 100644
--- a/graphics/pstricks/base/generic/pstricks-xetex.def
+++ b/graphics/pstricks/base/generic/pstricks-xetex.def
@@ -1,4 +1,4 @@
-%% $Id: pstricks-xetex.def 872 2018-12-21 20:39:31Z herbert $
+%% $Id: pstricks-xetex.def 4 2020-06-09 08:32:19Z herbert $
%%
%% Copyright 2019- Herbert Voss
%
diff --git a/graphics/pstricks/base/generic/pstricks.con b/graphics/pstricks/base/generic/pstricks.con
index 83bba1f7bb..0c119d13a3 100644
--- a/graphics/pstricks/base/generic/pstricks.con
+++ b/graphics/pstricks/base/generic/pstricks.con
@@ -1,4 +1,4 @@
-%% $Id: pstricks.con 617 2017-10-04 16:16:21Z herbert $
+%% $Id: pstricks.con 4 2020-06-09 08:32:19Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex
index 70283822fc..cc6f663ce5 100644
--- a/graphics/pstricks/base/generic/pstricks.tex
+++ b/graphics/pstricks/base/generic/pstricks.tex
@@ -2885,9 +2885,11 @@
\psset[pstricks]{gridlabels=10pt}
\define@key[psset]{pstricks}{gridlabelcolor}[black]{\pst@getcolor{#1}\psgridlabelcolor}
\psset[pstricks]{gridlabelcolor=black}
+\define@key[psset]{pstricks}{griddx}[1]{\def\psk@xgridDX{#1 }}
+\define@key[psset]{pstricks}{griddy}[1]{\def\psk@ygridDY{#1 }}
\define@key[psset]{pstricks}{xgridoffset}[0]{\pst@getlength{#1}\psk@xgridoffset}
\define@key[psset]{pstricks}{ygridoffset}[0]{\pst@getlength{#1}\psk@ygridoffset}
-\psset[pstricks]{xgridoffset=0,ygridoffset=0}
+\psset[pstricks]{xgridoffset=0,ygridoffset=0,griddx=1,griddy=1}
\def\tx@Grid{Grid }
@@ -2896,14 +2898,16 @@
\def\psgrid@ii(#1){\@ifnextchar({\psgrid@iii(#1)}{\psgrid@iv(0,0)(0,0)(#1)}}
\def\psgrid@iii(#1)(#2){\@ifnextchar({\psgrid@iv(#1)(#2)}{\psgrid@iv(#1)(#1)(#2)}}
\def\psgrid@iv(#1)(#2)(#3){%
- \begin@SpecialObj%
+ \begin@SpecialObj
\pst@getcoor{#1}\pst@tempA% hv 1.11
\pst@getcoor{#2}\pst@tempB% hv 1.11
\pst@@getcoor{#3}%
\ifnum\psk@subgriddiv>1\relax
\addto@pscode{
- /xGridOffset \psk@xgridoffset\space def
- /yGridOffset \psk@ygridoffset\space def
+ /xGridOffset \psk@xgridoffset\space def
+ /yGridOffset \psk@ygridoffset\space def
+ /GridDX \psk@xgridDX\space def
+ /GridDY \psk@ygridDY\space def
gsave
\tx@setStrokeTransparency
\psk@subgridwidth SLW
@@ -2917,7 +2921,7 @@
\tx@Grid
grestore
}%
- \fi%
+ \fi
\addto@pscode{
gsave
/xGridOffset \psk@xgridoffset def
@@ -2934,7 +2938,8 @@
\tx@Grid
grestore
}%
- \end@SpecialObj}
+ \end@SpecialObj
+ \ignorespaces}
%
\newif\ifpsmathbox
\psmathboxtrue
diff --git a/graphics/pstricks/base/latex/pst-all.sty b/graphics/pstricks/base/latex/pst-all.sty
index 3c9d1a8ddb..be6d92bc5c 100644
--- a/graphics/pstricks/base/latex/pst-all.sty
+++ b/graphics/pstricks/base/latex/pst-all.sty
@@ -1,4 +1,4 @@
-% $Id: pst-all.sty 446 2017-04-19 11:40:55Z herbert $
+% $Id: pst-all.sty 4 2020-06-09 08:32:19Z herbert $
%%
%% This is file `pst-all.sty'
%%
diff --git a/graphics/pstricks/base/latex/pst-key.sty b/graphics/pstricks/base/latex/pst-key.sty
index e1550d293e..e3d0a480ca 100644
--- a/graphics/pstricks/base/latex/pst-key.sty
+++ b/graphics/pstricks/base/latex/pst-key.sty
@@ -1,4 +1,4 @@
-% $Id: pst-key.sty 446 2017-04-19 11:40:55Z herbert $
+% $Id: pst-key.sty 4 2020-06-09 08:32:19Z herbert $
\RequirePackage{pstricks}
\ProvidesPackage{pst-key}[2004/07/15 package wrapper for pst-key.tex]
\input{pst-key.tex}
diff --git a/graphics/pstricks/base/latex/pst-platform.sty b/graphics/pstricks/base/latex/pst-platform.sty
index a1bde247b6..08af2b1c3a 100644
--- a/graphics/pstricks/base/latex/pst-platform.sty
+++ b/graphics/pstricks/base/latex/pst-platform.sty
@@ -1,4 +1,4 @@
-% $Id: pst-platform.sty 446 2017-04-19 11:40:55Z herbert $
+% $Id: pst-platform.sty 4 2020-06-09 08:32:19Z herbert $
%%
%% This is file `pst-platform.sty',
%%
diff --git a/graphics/pstricks/base/latex/pstcol.sty b/graphics/pstricks/base/latex/pstcol.sty
index 7a83dd1fd9..a5b68ee9c5 100644
--- a/graphics/pstricks/base/latex/pstcol.sty
+++ b/graphics/pstricks/base/latex/pstcol.sty
@@ -1,4 +1,4 @@
-% $Id: pstcol.sty 446 2017-04-19 11:40:55Z herbert $
+% $Id: pstcol.sty 4 2020-06-09 08:32:19Z herbert $
%%
%% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle
%% 2004--2007 Herbert Voss <voss@perce.de>
diff --git a/graphics/pstricks/base/latex/pstricks-pdf.sty b/graphics/pstricks/base/latex/pstricks-pdf.sty
index c363a62f80..db3be75a18 100644
--- a/graphics/pstricks/base/latex/pstricks-pdf.sty
+++ b/graphics/pstricks/base/latex/pstricks-pdf.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks-pdf.sty 446 2017-04-19 11:40:55Z herbert $
+% $Id: pstricks-pdf.sty 4 2020-06-09 08:32:19Z herbert $
%%
%% This is file `pstricks-pdf.sty'.
%%
diff --git a/graphics/pstricks/base/latex/pstricks.sty b/graphics/pstricks/base/latex/pstricks.sty
index dff12d797f..4c84dde218 100644
--- a/graphics/pstricks/base/latex/pstricks.sty
+++ b/graphics/pstricks/base/latex/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 1044 2019-04-11 09:32:09Z herbert $
+% $Id: pstricks.sty 4 2020-06-09 08:32:19Z herbert $
%%
%% This is file `pstricks.sty'.
%%