summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-marble
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-26 22:57:13 +0000
committerKarl Berry <karl@freefriends.org>2019-01-26 22:57:13 +0000
commitd4802db53ea2e712cd0acfb472b73891de14e27c (patch)
tree9342e2fa1d3dabcd7f920b0a3018eb8043fecacb /Master/texmf-dist/tex/generic/pst-marble
parent77f296fc4d17c9378658b6085929e839b4f1b9c8 (diff)
pst-marble (26jan19)
git-svn-id: svn://tug.org/texlive/trunk@49824 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-marble')
-rw-r--r--Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex51
1 files changed, 22 insertions, 29 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 9f188063ac0..8d1245ea5a2 100644
--- a/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
+++ b/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
@@ -5,10 +5,10 @@
%% IMPORTANT NOTICE: %%
%% %%
%% Package `pst-marble' %%
-%% Copyright (C) 2018 Aubrey Jaffer %%
%% %%
%% Aubrey Jaffers, with help of Manuel Luque, Jürgen Gilg %%
%% Email address: agj@alum.mit.edu %%
+%% Copyright (C) 2018-2019 Aubrey Jaffer %%
%% %%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -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.0}
-\def\filedate{2018/10/19}
+\def\fileversion{1.1}
+\def\filedate{2019/01/23}
\message{`PST' v\fileversion, \filedate}
%
\pstheader{pst-marble.pro}
@@ -35,61 +35,54 @@
\pst@addfams{pst-marble}
\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}{resolution}{\def\pst@marble@resolution{#1 }} %
\define@key[psset]{pst-marble}{actions}{\def\pst@marble@actions{#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]{}
\define@boolkey[psset]{pst-marble}[Pst@]{bckg}[true]{}
-\psset[pst-marble]{background=1 1 1,
+\psset[pst-marble]{background=0 0 0,
viscosity=1000,
- bckg=true,
- actions=0 0 40 colors length concentric-bands,
+ actions={0 0 35 colors 35 concentric-rings},
colors={
-[0.960 0.764 0.576]
-[0.316 0.362 0.298]
-[0.200 0.050 0.015]
-[0.023 0.145 0.451]
-[0.866 0.353 0.050]
-[0.200 0.050 0.015]
-},
- drawcontours=false
+ [0.376 0.357 0.451]
+ [0.255 0.259 0.341]
+ [0.306 0.498 0.62 ]
+ [0.686 0.741 0.851]
+ [0.353 0.529 0.627]},
+ drawcontours=false,
+ bckg=true
}%
\def\psMarble{\def\pst@par{}\pst@object{psMarble}}
\def\psMarble@i{\@ifnextchar({\psMarble@ii}{\psMarble@ii(10,10)}}
\def\psMarble@ii(#1,#2){%
\begin@SpecialObj
\addto@pscode{%
+plotdict begin
+/STROKE {\pst@number\pslinewidth 1000 div SLW systemdict /stroke get exec } def
/cm {\pst@number\psunit mul } bind def
-/background [\pst@marble@background] def
+/background [\pst@marble@background] color-norm def
/colors [\pst@marble@colors] def
/pagewidth #1 cm def % en cm
/pageheight #2 cm def % en cm
-\pst@number\pslinewidth\space 1000 div setlinewidth
-plotdict begin
/loy pageheight -2 div def
/hiy pageheight 2 div def
/hix pagewidth 2 div def
/lox pagewidth -2 div def
/orgx hix lox add 2 div def
/orgy hiy loy add 2 div def
-orgx orgy translate
-/actions [ \pst@marble@actions ] def
+% orgx orgy translate
+/actions [\pst@marble@actions] def
/acnt actions length def
-\ifPst@drawcontours /Contours {stroke} def \else /Contours {fill} def \fi
-\ifPst@bckg
+\ifPst@drawcontours /Contours {STROKE} def \else /Contours {fill} def \fi
gsave
+\ifPst@bckg
background aload pop setrgbcolor
lox loy pagewidth pageheight rectfill
-grestore
\fi
-gsave
lox loy pagewidth pageheight rectclip
- \pst@marble@visc marble
+ \pst@marble@visc marble
grestore
-end
- }% fin du code ps
- \end@SpecialObj
- }% % fin de la commande PSTricks
+end}% fin du code ps
+\end@SpecialObj}% % fin de la commande PSTricks
\catcode`\@=\PstAtCode\relax
\endinput \ No newline at end of file