CTAN sync 202108240302

8 files changed, 148 insertions, 27 deletions

diff --git a/graphics/pstricks/base/Changes b/graphics/pstricks/base/Changes
index 98e1a674c0..598c51f0c2 100644
--- a/graphics/pstricks/base/Changes
+++ b/graphics/pstricks/base/Changes
@@ -1,4 +1,4 @@
-% $Id: Changes 68 2021-04-08 06:41:14Z herbert $
+% $Id: Changes 155 2021-08-23 17:27:13Z herbert $
 
 
 Changelog for 
@@ -25,6 +25,8 @@ pstricks.tex --------
 versions like 2.47a have only changes in other files, but not
 in this main package.
 
+3.03  2021-08-23  - LaTeX option gsfonts=false (default) now uses URW font Symbol instead 
+                    of GhostScript's StandardSymL->s050000l.pfb
 3.02  2021-05-31  - added arrow type T<->T, similar to TikZ
 3.01a 2021-03-30  - fix bug for intro to Ghostscript >9.52 in pstricks.pro
 3.01  2020-09-18  - make it compatible to Ghostscript >9.52 for strokeopacity
@@ -298,6 +300,7 @@ pst-fp.tex ----------- (hv)
 
 
 xdvipdfmx.con ------
+0.06 2021-08-21   - small changes in the code 
 0.05 2015-09-11	  - move the fix into pstricks.tex
 0.04 2015-09-11	  - fix bug with wrong scaling for \psput@cartesian
 0.03 2011-11-23	  - fix bug with wrong scaling for nodes
@@ -313,6 +316,7 @@ vtex.con ------
 
 
 pstricks-doc -----------
+2021-08-21  - added news2021 
 2015-11-11  - updated news2015 
 2015-07-25  - updated news2015 
 2015-06-29  - new news2015 
@@ -344,6 +348,7 @@ pstricks-doc -----------
 
 
 ---- pstricks.pro
+1.35  2021-08-21  - fix for new version > 9.53 
 1.34  2021-03-30  - fix bug for intro to Ghostscript >9.52 
 1.33  2020-09-21  - suppress Ghostscript warning
 1.32  2020-09-18  - make .setopacityalpha compatible to Ghostscript >9.52
@@ -429,6 +434,7 @@ Version 97 patch 3, 98/06/01
 
 
 pstricks.sty --------
+0.71  2021-08-23  - added optional argument gsfonts 
 0.70  2020-06-11  - added optional argument xetex 
 0.69  2018-12-22  - added optional argument xetex 
 0.68  2018-02-08  - make grayscale and monochrome option 
diff --git a/graphics/pstricks/base/README b/graphics/pstricks/base/README
index 9bc1dd3686..c824ddb9b1 100644
--- a/graphics/pstricks/base/README
+++ b/graphics/pstricks/base/README
@@ -1,4 +1,4 @@
-PSTricks 2020
+PSTricks 2021
 
 This package may be distributed under the terms of the LaTeX Project 
 Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -122,4 +122,4 @@ be found on the Web page.
 
 
 --
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated June 2020)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated August 2021)
diff --git a/graphics/pstricks/base/config/xdvipdfmx.cfg b/graphics/pstricks/base/config/xdvipdfmx.cfg
index 75a596ca35..668ba41905 100644
--- a/graphics/pstricks/base/config/xdvipdfmx.cfg
+++ b/graphics/pstricks/base/config/xdvipdfmx.cfg
@@ -1,20 +1,22 @@
-% $Id: xdvipdfmx.cfg 4 2020-06-09 08:32:19Z herbert $
+% $Id: xdvipdfmx.cfg 152 2021-08-19 11:24:26Z herbert $
 %
-%% BEGIN: pstricks.con (for xdvipdfmx driver)
+%% BEGIN: pstricks.con (for dvipdfmx driver)
 %%
 %% Configuration file for PSTricks
 %%
-%% Version 0.05 (2015/09/11)
+%% Version 0.06 (2021/08/21)
 %%
-%% For use with xdvipdfmx
+%% For use with dvipdfmx
 %% 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\pstdriver{dvipdfmx}%
+%%\def\pstverb#1{\special{pst: #1}}% Check catcode of "
+\def\pstverb#1{\special{ps: #1}}% Check catcode of "
 \def\pstunit{1bp}%
-\def\pstVerb#1{\immediate\special{PST: #1}}%
+\def\pstVerb#1{\immediate\special{ps: #1}}%
+%\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)
@@ -39,7 +41,7 @@
 %% \tx@NET means neg exch neg exch translate.
 \def\pstrotate{CP CP translate 3 -1 roll neg rotate \tx@NET}%
 %%
-%% ****************** END xdvipdfmx *****************************
+%% ****************** END dvipdfmx *****************************
 
 
 %%%%%%%%%%%%%%%%%%% !! CUSTOMIZATION STUFF GOES HERE: !! %%%%%%%%%%%%%%%%%%
@@ -53,7 +55,7 @@
 \def\c@lor@ps@cmyk#1\@@{#1 setcmykcolor}%
 \def\c@lor@ps@gray#1\@@{#1 setgray}%
 \pstcustomize
-\typeout{Using PSTricks configuration for XeTeX+xdvipdfmx}%
+\typeout{Using PSTricks configuration for LaTeX+dvipdfmx}%
 \def\@@scalebox{%
   \leavevmode
   \hbox{%
diff --git a/graphics/pstricks/base/doc/pst-news21.pdf b/graphics/pstricks/base/doc/pst-news21.pdf
new file mode 100644
index 0000000000..89442fefa8
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..9fbe4e2f34
--- /dev/null
+++ b/graphics/pstricks/base/doc/pst-news21.tex
@@ -0,0 +1,91 @@
+%% $Id: pst-news21.tex 157 2021-08-23 18:21:41Z herbert $
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+    headinclude=false,footinclude=false,twoside]{scrartcl}
+
+\listfiles
+\usepackage[T1]{fontenc}
+\usepackage{listings}
+\lstset{basicstyle=\ttfamily\small}
+\usepackage{libertinus}
+\usepackage[scaled=0.88]{beramono}
+\usepackage{babel}
+\usepackage[svgnames,dvipsnames,x11names,pspdf=-dALLOWPSTRANSPARENCY]{pstricks-pdf}
+\usepackage{pstricks-add}
+\usepackage{showexpl}
+\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
+    escapechar=?}
+
+\usepackage{biblatex}
+\addbibresource{PSTricks.bib}
+\def\Lcs#1{\texttt{\textbackslash#1}}
+\begin{document}
+
+\title{\texttt{News -- \the\year}\\ \Large new macros and bugfixes for the basic package.}
+\author{Herbert Voß}
+\date{\today}
+
+\maketitle
+
+\tableofcontents
+
+\part{\texttt{pstricks} -- package}
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.sty}}
+%--------------------------------------------------------------------------------------
+The optional argument \texttt{gsfonts} can be used to load only the symbol font from GhostScript.
+Otherwise the one from URW or the system is used, which is the default.
+
+
+
+%--------------------------------------------------------------------------------------
+\section{\texttt{pstricks.tex} (v. 3.03 -- 2021/08/23)}
+%--------------------------------------------------------------------------------------
+
+\subsection{Arrows}
+
+There are new arrow tyoes 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}
+
+%\@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
+%}
+
+
+
+\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}
+\newif\ifpstGSfonts
+\pstGSfontsfalse % or true for using GS font
+
+\input pstricks
+...
+\end{verbatim}
+
+
+\nocite{*}
+\printbibliography
+
+
+\end{document}
+
diff --git a/graphics/pstricks/base/dvips/pstricks.pro b/graphics/pstricks/base/dvips/pstricks.pro
index a54aed45d2..c351841e8c 100644
--- a/graphics/pstricks/base/dvips/pstricks.pro
+++ b/graphics/pstricks/base/dvips/pstricks.pro
@@ -1,4 +1,4 @@
-% $Id: pstricks.pro 68 2021-04-08 06:41:14Z herbert $
+% $Id: pstricks.pro 152 2021-08-19 11:24:26Z herbert $
 %
 %% PostScript prologue for pstricks.tex.
 %% Version 1.35, 2021/05/21
diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex
index 52a5865655..8b1edd58e0 100644
--- a/graphics/pstricks/base/generic/pstricks.tex
+++ b/graphics/pstricks/base/generic/pstricks.tex
@@ -80,8 +80,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{3.02}
-\def\filedate{2021/05/31}
+\def\fileversion{3.03}
+\def\filedate{2021/08/23}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -1668,8 +1668,10 @@
 \define@key[psset]{pstricks}{arrowinset}[0.4]{\pst@checknum{#1}\psk@arrowinset}%
 \psset[pstricks]{arrowinset=0.4}
 %
+%% ---------------------- end arrow part ----------------------
+%
 \def\tx@SD{ \tx@setTransparency SD }
-\def\tx@EndDot{EndDot }
+\def\tx@EndDot{ EndDot }
 %
 \def\pst@par{}
 \def\addto@par#1{%
@@ -2367,13 +2369,13 @@
 \@namedef{psds@triangle}{%
   /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
   /y2 y1 CLW add def /x2 y2 1.732 mul neg def
-  \pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}}
+  \pst@gdot{x1 y1 \tx@ST  x2 y2 \tx@ST}}
 \@namedef{psds@pentagon*}{%
   /r1 DS 1.149 mul def
   \pst@gdot{r1 \tx@SP}}
 \@namedef{psds@pentagon}{%
   DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
-  \pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}}
+  \pst@gdot{r1 \tx@SP  r2 \tx@SP}}
 \@namedef{psds@+}{%
   /DS DS 1.253 mul def
   \pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}}
@@ -2428,16 +2430,29 @@
 \newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)}
 \newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)}
 % DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14
-%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{<E0>}
-%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{<A8>}
+
+\ifpstGSfonts
+  %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{StandardSymL}{<E0>}
+  %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{StandardSymL}{<A8>}
+\else
+  %\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
+  %\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
+\fi
 % D.G. modification begin - Jan. 17, 2000
 \newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
 \newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
 \newpsfontdot{diamond*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)}
 % DG/SR modification end
-\newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
-\newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
-\newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
+
+\ifpstGSfonts
+  \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{StandardSymL}{<C5>}
+  \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{StandardSymL}{<C4>}
+  \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{StandardSymL}{<B4>}
+\else
+  \newpsfontdot{oplus}[1.44928 0.0 0.0 1.44928 -0.562319 -0.478261]{Symbol}{<C5>}
+  \newpsfontdot{otimes}[1.44928 0.0 0.0 1.44928 -0.562319 -0.475362]{Symbol}{<C4>}
+  \newpsfontdot{x}[1.8 0.0 0.0 1.8 -0.495 -0.4788]{Symbol}{<B4>}
+\fi
 \newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{NimbusRomNo9L-Regu}{<2B>}
 \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{NimbusRomNo9L-Regu}{<2A>}
 \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{NimbusRomNo9L-Bold}{<2B>}
@@ -2452,8 +2467,13 @@
 
 % DG/SR modification end
 \iffalse
-\newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{<B7>}
-\newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{<B0>}
+\ifpstGSfonts
+  \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{StandardSymL}{<B7>}
+  \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{StandardSymL}{<B0>}
+\else
+  \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>}
+  \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>}
+\fi
 \newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{<CA>}
 \fi
 % Etienne Riga
diff --git a/graphics/pstricks/base/latex/pstricks.sty b/graphics/pstricks/base/latex/pstricks.sty
index eca5930bae..e6189b7203 100644
--- a/graphics/pstricks/base/latex/pstricks.sty
+++ b/graphics/pstricks/base/latex/pstricks.sty
@@ -1,4 +1,4 @@
-% $Id: pstricks.sty 6 2020-06-10 18:50:14Z herbert $
+% $Id: pstricks.sty 155 2021-08-23 17:27:13Z herbert $
 %%
 %% This is file `pstricks.sty'.
 %%
@@ -17,7 +17,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{pstricks}[2020/06/11 v0.70 LaTeX wrapper for `PSTricks' (RN,HV)]
+\ProvidesPackage{pstricks}[2021/08/23 v0.71 LaTeX wrapper for `PSTricks' (RN,HV)]
 % 
 \def\documentclass{%
   \edef\@tempa{\jobname.tex }%
@@ -40,11 +40,13 @@
 %
 \newif\ifpst@useCalc  \pst@useCalcfalse
 \newif\ifpst@psfonts  \pst@psfontsfalse
+\newif\ifpstGSfonts  \pstGSfontsfalse
 \newif\if@check@engine  \@check@enginetrue 
 \newif\ifpst@xetex  \pst@xetexfalse
 \newif\ifpst@autopdf  \pst@autopdffalse
 
 \DeclareOption{useCalc}{\pst@useCalctrue}
+\DeclareOption{gsfonts}{\pstGSfontstrue}
 \DeclareOption{psfonts}{\pst@psfontstrue}
 \DeclareOption{noEngineCheck}{\@check@enginefalse}
 \DeclareOption{pdf}{\global\pst@autopdftrue}