summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-10-04 23:04:03 +0000
committerKarl Berry <karl@freefriends.org>2017-10-04 23:04:03 +0000
commitd47159a7f43a28a563b1f7c94f982e3f57945395 (patch)
tree4c7924ce3e34e9cf83978bf0bf3e3b3bdc89849b /Master/texmf-dist/tex/generic/pstricks
parentb3a6a312f02486563f90e24dbb7555d63d54c31a (diff)
pstricks (4oct17)
git-svn-id: svn://tug.org/texlive/trunk@45464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-fp.tex21
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def84
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.con1
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex206
4 files changed, 179 insertions, 133 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex b/Master/texmf-dist/tex/generic/pstricks/pst-fp.tex
index 2ea9cf11f4f..2d4e748193a 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 446 2017-04-19 11:40:55Z herbert $
+%% $Id: pst-fp.tex 465 2017-05-22 17:50:57Z herbert $
%%
%%
%% This is file `pst-fp.tex',
@@ -121,12 +121,12 @@
\def\pstFP@swallow#1\relax{}
%
\def\ifpstFP@zero#1{%
- \ifnum%
- \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi%
- \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi%
- \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi%
+ \ifnum
+ \expandafter\ifnum\csname pstFP@#1ia\endcsname=0 0\else1\fi
+ \expandafter\ifnum\csname pstFP@#1ib\endcsname=0 0\else1\fi
+ \expandafter\ifnum\csname pstFP@#1fa\endcsname=0 0\else1\fi
\expandafter\ifnum\csname pstFP@#1fb\endcsname=0 0\else1\fi%
- =0\relax%
+ =0\relax
}
%
%read value
@@ -485,7 +485,8 @@
\fi%
\global\let\pstFP@tmp\pstFP@tmp%
}%
- \let#1\pstFP@tmp%
+% \pstFPstripZeros\pstFP@tmp{#1}%
+ \let#1\pstFP@tmp
}
@@ -581,7 +582,8 @@
\global\let\pstFP@tmp=\pstFP@tmp%
%
}%
- \let#1\pstFP@tmp%
+% \pstFPstripZeros\pstFP@tmp{#1}%
+ \let#1\pstFP@tmp
}
%multiply two values
@@ -705,7 +707,8 @@
\else\typeout{pstFPmul: Overflow}\fi%
\else\typeout{pstFPmul: Overflow}\fi%
\global\let\pstFP@tmp\pstFP@tmp}%
- \let#1\pstFP@tmp%
+% \pstFPstripZeros\pstFP@tmp{#1}%
+ \let#1\pstFP@tmp
}
%
\catcode`\@=\PstAtCode\relax
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
new file mode 100644
index 00000000000..f711b7589f8
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
@@ -0,0 +1,84 @@
+%% $Id: pstricks-tex.def 617 2017-10-04 16:16:21Z herbert $
+%% pstricks-tex.def
+%% Copyright 2017 Herbert Voss
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
+%
+ \newwrite\@unused
+ \def\typeout#1{\immediate\write\@unused{#1}}%
+ \typeout{we are running tex and have to make it etex and latex compatible ...}%
+ \ifx\eTeXversion\@undefined
+ \gdef\ch@ck#1#2#3{\ifnum\count1#1<#2 \else\errmessage{No room for a new #3}\fi}
+ \countdef\allocationnumber=21
+ \chardef\sixt@@n=16
+ \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne
+ \ch@ck#1#4#2% make sure there's still room
+ \allocationnumber\count1#1%
+ \global#3#5\allocationnumber
+ \wlog{\string#5=\string#2\the\allocationnumber}}
+ \alloc@7\write\chardef\sixt@@n\@unused
+ \else
+ \def\e@alloc#1#2#3#4#5#6{%
+ \global\advance#3\@ne
+ \e@ch@ck{#3}{#4}{#5}#1%
+ \allocationnumber#3\relax
+ \global#2#6\allocationnumber
+ \wlog{\string#6=\string#1\the\allocationnumber}}%
+ \gdef\e@ch@ck#1#2#3#4{%
+ \ifnum#1<#2\else
+ \ifnum#1=#2\relax
+ \global#1\@cclvi
+ \ifx\count#4\global\advance#1 10 \fi
+ \fi
+ \ifnum#1<#3\relax
+ \else
+ \errmessage{No room for a new \string#4}%
+ \fi
+ \fi}%
+ \fi
+%
+ \newif\ifpst@psfonts \pst@psfontsfalse % defined in pstricks.sty
+%
+ \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
+ \def\@namedef#1{\expandafter\def\csname #1\endcsname}
+ \def\@nameuse#1{\csname #1\endcsname}
+ \def\@eha{%
+ Your command was ignored.^^J
+ Type \space I <command> <return> \space to replace
+ it with another command,^^J
+ or \space <return> \space to continue without it.}
+ \def\@spaces{\space\space\space\space}
+ \def\@empty{}
+ \def\@gobble#1{}
+ \def\@nnil{\@nil}
+%
+ \def\@ifnextchar#1#2#3{%
+ \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
+%
+ \def\@ifnch{%
+ \ifx\@tempc\@sptoken \let\@tempd\@xifnch
+ \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi
+ \fi
+ \@tempd%
+ }%
+ \begingroup
+ \def\:{\global\let\@sptoken= } \:
+ \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
+ \endgroup
+ \def\endtabular{\crcr\egroup\egroup $\egroup}
+ \def\@width{width}% needed by pst-node
+ \def\@tfor#1:={\@tf@r#1 }
+ \long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else
+ \@tforloop#2\@nil\@nil\@@#1{#3}\fi}%
+ \long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil
+ \expandafter\@fornoop \else
+ #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}}
+ \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname}
+%%
+%% END: pstricks-tex.def
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.con b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
index fa94f812175..83bba1f7bbc 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.con
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.con
@@ -1,3 +1,4 @@
+%% $Id: pstricks.con 617 2017-10-04 16:16:21Z herbert $
%% BEGIN: pstricks.con (for dvips driver)
%%
%% Configuration file for PSTricks
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 24722d45cbe..e2d1405feda 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,3 +1,4 @@
+%% $Id: pstricks.tex 617 2017-10-04 16:16:21Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -17,90 +18,28 @@
%
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
-%
-%% !! loading additional TeX packages see line 112 !!
-%% !! loading config file pstricks.con line 476 !!
-%% !! loading pro files line 489 !!
-%% !! fileversion and date see line 119 !!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% !! loading additional TeX packages see line 38,39 and 72ff
+%% !! loading config file pstricks.con line 439
+%% !! loading pro files line 452ff
+%% !! fileversion and date see line 78
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
\edef\PstAtCode{\the\catcode`\@}
\catcode`\@=11\relax
%
-\expandafter\ifx\csname @latexerr\endcsname\relax % do we have LaTeX? then it is false
- \newwrite\@unused
- \def\typeout#1{\immediate\write\@unused{#1}}%
- \ifx\eTeXversion\@undefined
- \gdef\ch@ck#1#2#3{\ifnum\count1#1<#2 \else\errmessage{No room for a new #3}\fi}
- \countdef\allocationnumber=21
- \chardef\sixt@@n=16
- \def\alloc@#1#2#3#4#5{\global\advance\count1#1\@ne
- \ch@ck#1#4#2% make sure there's still room
- \allocationnumber\count1#1%
- \global#3#5\allocationnumber
- \wlog{\string#5=\string#2\the\allocationnumber}}
- \alloc@7\write\chardef\sixt@@n\@unused
- \else
- \def\e@alloc#1#2#3#4#5#6{%
- \global\advance#3\@ne
- \e@ch@ck{#3}{#4}{#5}#1%
- \allocationnumber#3\relax
- \global#2#6\allocationnumber
- \wlog{\string#6=\string#1\the\allocationnumber}}%
- \gdef\e@ch@ck#1#2#3#4{%
- \ifnum#1<#2\else
- \ifnum#1=#2\relax
- \global#1\@cclvi
- \ifx\count#4\global\advance#1 10 \fi
- \fi
- \ifnum#1<#3\relax
- \else
- \errmessage{No room for a new \string#4}%
- \fi
- \fi}%
- \fi
- \typeout{we are running tex and have to define some LaTeX commands ...}%
- \long\def\@ifundefined#1#2#3{\expandafter\ifx\csname #1\endcsname\relax#2\else#3\fi}
- \def\@namedef#1{\expandafter\def\csname #1\endcsname}
- \def\@nameuse#1{\csname #1\endcsname}
- \def\@eha{%
- Your command was ignored.^^J
- Type \space I <command> <return> \space to replace
- it with another command,^^J
- or \space <return> \space to continue without it.}
- \def\@spaces{\space\space\space\space}
- \def\@empty{}
- \def\@gobble#1{}
- \def\@nnil{\@nil}
-%
- \def\@ifnextchar#1#2#3{%
- \let\@tempe#1\def\@tempa{#2}\def\@tempb{#3}\futurelet\@tempc\@ifnch}
-%
- \def\@ifnch{%
- \ifx\@tempc\@sptoken \let\@tempd\@xifnch
- \else\ifx\@tempc\@tempe \let\@tempd\@tempa \else \let\@tempd\@tempb \fi
- \fi
- \@tempd%
- }
- \begingroup
- \def\:{\global\let\@sptoken= } \:
- \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch}
- \endgroup
- \def\endtabular{\crcr\egroup\egroup $\egroup}
- \def\@width{width}% needed by pst-node
- \def\@tfor#1:={\@tf@r#1 }
- \long\def\@tf@r#1#2\do#3{\def\@fortmp{#2}\ifx\@fortmp\space\else
- \@tforloop#2\@nil\@nil\@@#1{#3}\fi}%
- \long\def\@tforloop#1#2\@@#3#4{\def#3{#1}\ifx #3\@nnil
- \expandafter\@fornoop \else
- #4\relax\expandafter\@tforloop\fi#2\@@#3{#4}}
- \long\def\@break@tfor#1\@@#2#3{\csname fi\endcsname\csname fi\endcsname}
-\fi%
-\catcode`\@=\PstAtCode\relax
+\ifx\c@lor@to@ps\@undefined
+ \def\c@lor@to@ps{\PSTricks_Not_Configured_For_This_Format}% message for a pdflatex run
+\fi
+\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined
+ \input pstricks-tex.def
+\fi
%
-% now we have all commands defined, for TeX and LaTeX
+%\catcode`\@=\PstAtCode\relax
+\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
+\ifx\PSTFPloaded\endinput\else\input pst-fp.tex\fi
%
-\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey.tex \fi
-\catcode`\@=11\relax
+%\catcode`\@=11\relax
\def\XKV@ch@ckch@ice#1#2#3{% bugfix for xkeyval
\def\XKV@tempa{#1}%
\ifx\XKV@tempa\@nnil\let\XKV@tempa\@empty\else
@@ -127,21 +66,23 @@
\XKV@tempa
}
%
-\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }} %$
+\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }}%$
\def\ProvidesPackageRCS@i[#1] $#2${} %$
-\catcode`\@=\PstAtCode\relax
-\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
-%
-\@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{}
-\@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{}
-\@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{}
+
+\ifx\pgfkeysloaded\endinput\else
+ \input pgfutil-common.tex
+ \input pgfkeys.code.tex
+ \input pgffor.code.tex
+\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.72b}
-\def\filedate{2017/04/19}
-\catcode`\@=11\relax
+\def\fileversion{2.77}
+\def\filedate{2017/10/04}
\pst@addfams{pstricks}
%
+%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
+%\psset{useURWfonts}
+%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
\def\@fornoop#1\@@#2#3{}
@@ -510,6 +451,7 @@
\@ifundefined{pst@ATH}{\def\pst@ATH<#1>{}}{}
%
\pstheader{pstricks.pro}
+%\pstheader{pstricks-fonts.pro}
\pstheader{pst-algparser.pro}
\pstheader{pst-tools.pro}
%
@@ -624,7 +566,7 @@
\gdef\pslbrace[{ ]
\gdef\psrbrace[} ]
\endgroup
-
+%
\pstVerb{
/pssetRGBcolor /setrgbcolor load def
/pssetCMYKcolor /setcmykcolor load def
@@ -635,8 +577,8 @@
%\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@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}%
\def\pst@endcolor{\pstVerb{\pst@currentcolor}}
\def\pst@currentcolor{0 setgray}
\def\altcolormode{%
@@ -678,8 +620,8 @@
\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space}
%
\def\newgray#1#2{%
- \pst@checknum{#2}\pst@tempg
- \@newcolor{#1}{\pst@tempg setgray}}
+ \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}}
@@ -700,6 +642,18 @@
\newrgbcolor{yellow}{1 1 0}
\newrgbcolor{cyan}{0 1 1}
\newrgbcolor{magenta}{1 0 1}
+
+\@ifundefined{xglobal}% do we have xcolor loaded?
+ {\@newcolor{randomgray}{Rand setgray}%
+ \@newcolor{randomrgb}{Rand Rand Rand setrgbcolor}%
+ \@newcolor{randomcmyk}{Rand Rand Rand Rand setcmykcolor}%
+ \@newcolor{randomhsb}{Rand Rand Rand sethsbcolor}%
+ }{%
+ \definecolor[ps]{randomgray}{gray}{Rand}%
+ \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}%
+ \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}%
+ \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}%
+ }
%
\define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{}
\define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture
@@ -832,10 +786,12 @@
\def\@degrees[#1]{%
\pst@checknum{#1}\pst@tempg
\edef\pst@angleunit{360 \pst@tempg div mul }%
+ \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}%
\ignorespaces}
%
-\def\radians{\def\pst@angleunit{57.2956 mul }}
-\def\pst@angleunit{}
+\def\radians{\def\pst@angleunit{57.2956 mul }}%
+\def\pst@angleunit{}%
+\pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}%
%
\def\SpecialCoor{%
\def\pst@@getcoor##1{%
@@ -1069,18 +1025,16 @@
\fi\fi}
%
\def\special@length#1#2\@nil#3{%
- \psDEBUG[special@length]{ #1|#2|#3 }%
\ifx !#1\relax
\edef\pst@SpecialLength{ #2 \pst@number\psunit mul }%
- \Pst@SpecialLengthtrue%
- \psDEBUG[special@length]{ Special length: \pst@SpecialLength}%
+ \Pst@SpecialLengthtrue
\else
\let\@psunit\psunit
\afterassignment\pstunit@off
- #3 #1#2\@psunit%
- \Pst@SpecialLengthfalse%
- \psDEBUG[special@length]{ Normal length: \the#3 }%
- \fi}
+ #3 #1#2\@psunit
+ \Pst@SpecialLengthfalse
+ \fi
+}
%
\def\Cartesian{%
\def\cartesian@coor##1,##2,##3\@nil{%
@@ -1105,14 +1059,14 @@
\def\psk@origin{}
%
\define@boolkey[psset]{pstricks}[Pst@]{algebraic}[true]{}
-\psset%[pstricks]
-{algebraic=false}
+\psset{algebraic=false}
%
-\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst
+\define@boolkey[psset]{pstricks}[]{swapaxes}[true]{% \if@pst
\@nameuse{@pst#1}%
\if@pst\def\psk@swapaxes{-90 rotate -1 1 scale }%
\else\def\psk@swapaxes{}%
- \fi}
+ \fi
+}
\psset[pstricks]{swapaxes=false}
%
\define@boolkey[psset]{pstricks}[]{showpoints}[true]{}
@@ -2441,33 +2395,33 @@
\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]{Symbol}{<E0>}
-%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
+%\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>}
% 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]{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>}
-\newpsfontdot{+}[2.3 0.0 0.0 2.3 -0.6486 -0.5819]{Times-Roman}{<2B>}
-\newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>}
-\newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>}
-\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>}
-\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)}
+\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>}
+\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>}
+\newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{NimbusRomNo9L-Bold}{<2A>}
+\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{NimbusSanL-Regu}{(|)}
% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)}
+%[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{NimbusSanL-Regu}{(|)}
% DG/SR modification end
-\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}%
+\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{NimbusSanL-Bold}{(|)}%
% DG/SR modification begin - Oct. 27, 1997 - Patch 7
-%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)}
+%[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{NimbusSanL-Bold}{(|)}
% DG/SR modification end
\iffalse
-\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>}
-\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{<CA>}
+\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>}
+\newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{NimbusRomNo9L-Bold}{<CA>}
\fi
% Etienne Riga
\newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)}
@@ -2847,8 +2801,12 @@
\pst@cntg=#1\relax\edef\psk@subgriddiv{\the\pst@cntg}}
\psset[pstricks]{subgriddiv=5}
%
-\define@key[psset]{pstricks}{gridfont}[Helvetica]{\def\psk@gridfont{/#1 }}% hv 2007-11-13
-\psset[pstricks]{gridfont=Helvetica}
+\define@key[psset]{pstricks}{gridfont}[NimbusSanL-Regu]{\def\psk@gridfont{/#1 }}% hv 2007-11-13
+\ifpst@psfonts
+ \psset[pstricks]{gridfont=Helvetica}%
+\else
+ \psset[pstricks]{gridfont=NimbusSanL-Regu}%
+\fi
%
\define@key[psset]{pstricks}{gridlabels}[10pt]{\pst@getlength{#1}\psk@gridlabels}
\psset[pstricks]{gridlabels=10pt}