pst-marble (2may19)

git-svn-id: svn://tug.org/texlive/trunk@50925 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 15 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex b/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
index 636491a9b73..a84cf6f0ae5 100644
--- a/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
+++ b/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
@@ -25,8 +25,8 @@
 \let \PSTMARBLELoaded\endinput
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
 \ifx\PSTXKeyLoaded\endinput \else\input pst-xkey.tex\fi
-\def\fileversion{1.4}
-\def\filedate{2019/02/25}
+\def\fileversion{1.6}
+\def\filedate{2019/03/20}
 \message{`PST' v\fileversion, \filedate}
 %
 \pstheader{pst-marble.pro}
@@ -34,12 +34,14 @@
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
 \pst@addfams{pst-marble}
 \define@key[psset]{pst-marble}{background}{\def\pst@marble@background{#1 }}
+\define@key[psset]{pst-marble}{paper}{\def\pst@marble@paper{#1 }}
 \define@key[psset]{pst-marble}{viscosity}{\def\pst@marble@visc{#1 }}
 \define@key[psset]{pst-marble}{oversample}{\def\pst@marble@oversample{#1 }}
 \define@key[psset]{pst-marble}{overscan}{\def\pst@marble@overscan{#1 }}
 \define@key[psset]{pst-marble}{seed}{\def\pst@marble@seed{#1}}
 \define@key[psset]{pst-marble}{actions}{\def\pst@marble@actions{#1 }}
 \define@key[psset]{pst-marble}{spractions}{\def\pst@marble@spractions{#1 }}
+\define@key[psset]{pst-marble}{shadings}{\def\pst@marble@shadings{#1 }}
 % colors are red, green, and blue components between 0 and 1.
 \define@key[psset]{pst-marble}{colors}{\def\pst@marble@colors{#1 }}
 \define@boolkey[psset]{pst-marble}[Pst@]{drawcontours}[true]{}
@@ -49,6 +51,9 @@
     background={
       [1 1 1]
     },
+    paper={
+      [1 1 1]
+    },
     colors={
       [0.275 0.569 0.796]
       [0.965 0.882 0.302]
@@ -66,14 +71,15 @@
     overscan=1,
     actions={0 0 36 colors 35 concentric-rings},
     spractions={},
+    shadings={},
     drawcontours=false,
     bckg=true
     }
 \psset[pstricks]{shapealpha=1}
-\def\psMarble{\def\pst@par{}\pst@object{psMarble}}
-\def\psMarble@i{\@ifnextchar({\psMarble@ii}{\psMarble@iii(-5,-5)(5,5)}}
-\def\psMarble@ii(#1,#2){\@ifnextchar({\psMarble@iii(#1,#2)}{\psMarble@iii(#1 -0.5 mul, #2 -0.5 mul)(#1 0.5 mul,#2 0.5 mul)}}
-\def\psMarble@iii(#1,#2)(#3,#4){
+\def\psMarble{\pst@object{psMarble}}
+\def\psMarble@i(#1,#2){
+\@ifnextchar({\psMarble@ii(#1,#2)}{\psMarble@ii(#1 -0.5 mul, #2 -0.5 mul)(#1 0.5 mul,#2 0.5 mul)}}
+\def\psMarble@ii(#1,#2)(#3,#4){
 \begin@SpecialObj
 \addto@pscode{
 plotdict begin
@@ -81,6 +87,7 @@ plotdict begin
 /STROKE {\pst@number\pslinewidth 1000 div SLW \tx@setStrokeTransparency \tx@setBlendmode systemdict /stroke get exec} def
 /cm {\pst@number\psunit mul } bind def
 /background \pst@marble@background color-norm def
+/paper \pst@marble@paper color-norm def
 /colors [\pst@marble@colors] def
 /seed (\pst@marble@seed) rc4setkey def
 /lox #1 cm cvi def
@@ -94,6 +101,8 @@ plotdict begin
 /acnt actions length def
 /spractions [\pst@marble@spractions] def
 /pcnt spractions length def
+/shadings [\pst@marble@shadings] def
+/scnt shadings length def
 \ifPst@drawcontours /Contours {STROKE} def \else /Contours {FILL} def \fi
 gsave
 \ifPst@bckg