summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-10 21:02:44 +0000
committerKarl Berry <karl@freefriends.org>2021-09-10 21:02:44 +0000
commit5d6fff8fbf92d4ec1185bef63a353cefb80762e9 (patch)
tree38a483ee0abbfa863fb8bd051ea0b9d40bccde3a /Master/texmf-dist/tex/generic/pstricks
parentededfa09b5b2ca189371118688bcdcffb8f200cb (diff)
pstricks (10sep21)
git-svn-id: svn://tug.org/texlive/trunk@60466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/distiller.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvips.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/dvipsone.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/gastex.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/textures.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/config/vtex.cfg2
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pst-fp.tex12
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-arrows.tex54
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-color.tex137
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.con7
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex103
11 files changed, 184 insertions, 141 deletions
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
}
%