diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex | 64 |
1 files changed, 33 insertions, 31 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 4370413c880..636491a9b73 100644 --- a/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex +++ b/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex @@ -6,7 +6,7 @@ %% %% %% Package `pst-marble' %% %% %% -%% Aubrey Jaffer, with help of Manuel Luque, Jürgen Gilg %% +%% Aubrey Jaffer, with help of Manuel Luque, Jürgen Gilg %% %% Email address: agj@alum.mit.edu %% %% Copyright (C) 2018-2019 Aubrey Jaffer %% %% %% @@ -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.3a} -\def\filedate{2019/02/23} +\def\fileversion{1.4} +\def\filedate{2019/02/25} \message{`PST' v\fileversion, \filedate} % \pstheader{pst-marble.pro} @@ -36,8 +36,10 @@ \define@key[psset]{pst-marble}{background}{\def\pst@marble@background{#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 }} % 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]{} @@ -48,58 +50,58 @@ [1 1 1] }, colors={ - [0.275 0.569 0.796] - [0.965 0.882 0.302] - [0.176 0.353 0.129] - [0.635 0.008 0.094] - [0.078 0.165 0.518] - [0.824 0.592 0.031] - [0.059 0.522 0.392] - [0.816 0.333 0.475] - [0.365 0.153 0.435] - [0.624 0.588 0.439] + [0.275 0.569 0.796] + [0.965 0.882 0.302] + [0.176 0.353 0.129] + [0.635 0.008 0.094] + [0.078 0.165 0.518] + [0.824 0.592 0.031] + [0.059 0.522 0.392] + [0.816 0.333 0.475] + [0.365 0.153 0.435] + [0.624 0.588 0.439] }, viscosity=1000, oversample=0, - actions={0 0 35 colors 35 concentric-rings}, + overscan=1, + actions={0 0 36 colors 35 concentric-rings}, + spractions={}, drawcontours=false, bckg=true - }% + } \psset[pstricks]{shapealpha=1} \def\psMarble{\def\pst@par{}\pst@object{psMarble}} -\def\psMarble@i{\@ifnextchar({\psMarble@ii}{\psMarble@ii(10,10)}} -\def\psMarble@ii(#1,#2){% +\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){ \begin@SpecialObj -\addto@pscode{% +\addto@pscode{ plotdict begin /FILL {\tx@setTransparency \tx@setBlendmode fill } def -%/FILL {\tx@setTransparency fill } def /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 /colors [\pst@marble@colors] def /seed (\pst@marble@seed) rc4setkey def -/pagewidth #1 cm def % en cm -/pageheight #2 cm def % en cm -/loy pageheight -2 div cvi def -/hiy pageheight 2 div cvi def -/hix pagewidth 2 div cvi def -/lox pagewidth -2 div cvi def -/orgx hix lox add 2 div def -/orgy hiy loy add 2 div def -% orgx orgy translate +/lox #1 cm cvi def +/loy #2 cm cvi def +/hix #3 cm cvi def +/hiy #4 cm cvi def /visc \pst@marble@visc abs def /oversample \pst@marble@oversample dup 0 eq \pst@marble@visc 0 lt and {pop 1} if def +/overscan \pst@marble@overscan def /actions [\pst@marble@actions] def /acnt actions length def +/spractions [\pst@marble@spractions] def +/pcnt spractions length def \ifPst@drawcontours /Contours {STROKE} def \else /Contours {FILL} def \fi gsave \ifPst@bckg background aload pop setrgbcolor - lox loy pagewidth pageheight rectfill -% newpath lox loy moveto pagewidth 0 rlineto 0 pageheight rlineto pagewidth neg 0 rlineto closepath FILL + lox loy hix lox sub hiy loy sub rectfill +% newpath lox loy moveto lox hiy lineto hix hiy lineto hix loy lineto closepath FILL \fi - lox loy pagewidth pageheight rectclip + lox loy hix lox sub hiy loy sub rectclip marble grestore end}% fin du code ps |