summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-19 20:34:34 +0000
committerKarl Berry <karl@freefriends.org>2018-10-19 20:34:34 +0000
commitc571740f80243b351c79c03e688258e374a4c110 (patch)
treea44b19d32109e3c38c759a5d76d5d26be9aea68a /Master/texmf-dist/tex
parent2fc43b1bd746c45eaf2fdc043547f2f3a1bb16ca (diff)
pst-marble (19oct18)
git-svn-id: svn://tug.org/texlive/trunk@48942 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex44
-rw-r--r--Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty5
2 files changed, 25 insertions, 24 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 a4d254cd9f9..9f188063ac0 100644
--- a/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
+++ b/Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex
@@ -5,8 +5,9 @@
%% IMPORTANT NOTICE: %%
%% %%
%% Package `pst-marble' %%
+%% Copyright (C) 2018 Aubrey Jaffer %%
%% %%
-%% Aubrey Jaffers, with help of Manuel Luque, Jürgen Gilg %%
+%% Aubrey Jaffers, with help of Manuel Luque, Jürgen Gilg %%
%% Email address: agj@alum.mit.edu %%
%% %%
%% This program can redistributed and/or modified under %%
@@ -24,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{0.1}
-\def\filedate{2018/09/23}
+\def\fileversion{1.0}
+\def\filedate{2018/10/19}
\message{`PST' v\fileversion, \filedate}
%
\pstheader{pst-marble.pro}
@@ -34,24 +35,24 @@
\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 }}
-% characteristic length
-\define@key[psset]{pst-marble}{L}{\def\pst@marble@L{#1 }} %
-\define@key[psset]{pst-marble}{resolution}{\def\pst@marble@resolution{#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]{}
-\psset[pst-marble]{background=0 0 0,
- viscosity=25,
- L=200,
- resolution=1,
- actions=concentric-bands,
+\define@boolkey[psset]{pst-marble}[Pst@]{bckg}[true]{}
+\psset[pst-marble]{background=1 1 1,
+ viscosity=1000,
+ bckg=true,
+ actions=0 0 40 colors length concentric-bands,
colors={
- [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]},
+[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
}%
\def\psMarble{\def\pst@par{}\pst@object{psMarble}}
@@ -61,13 +62,10 @@
\addto@pscode{%
/cm {\pst@number\psunit mul } bind def
/background [\pst@marble@background] def
-/resolution \pst@marble@resolution def
/colors [\pst@marble@colors] def
/pagewidth #1 cm def % en cm
/pageheight #2 cm def % en cm
-% clippath pathbbox
-%/hiy exch round cvi def /hix exch round cvi def
-%/loy exch round cvi def /lox exch round cvi def
+\pst@number\pslinewidth\space 1000 div setlinewidth
plotdict begin
/loy pageheight -2 div def
/hiy pageheight 2 div def
@@ -76,16 +74,18 @@ plotdict begin
/orgx hix lox add 2 div def
/orgy hiy loy add 2 div def
orgx orgy translate
-/actions [\pst@marble@actions] def
+/actions [ \pst@marble@actions ] def
/acnt actions length def
\ifPst@drawcontours /Contours {stroke} def \else /Contours {fill} def \fi
+\ifPst@bckg
gsave
background aload pop setrgbcolor
lox loy pagewidth pageheight rectfill
grestore
+\fi
gsave
lox loy pagewidth pageheight rectclip
- \pst@marble@visc \pst@marble@L marble
+ \pst@marble@visc marble
grestore
end
}% fin du code ps
diff --git a/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty b/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty
index af463fa277c..63a68a01981 100644
--- a/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty
+++ b/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty
@@ -5,6 +5,7 @@
%% 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 %%
@@ -21,13 +22,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{pstricks}
-\ProvidesPackage{pst-marble}[2018/09/23 package wrapper for PSTricks pst-marble.tex]
+\ProvidesPackage{pst-marble}[2018/10/19 package wrapper for PSTricks pst-marble.tex]
\input pst-marble.tex
\ProvidesFile{pst-marble.tex}
[\filedate\space v\fileversion\space `PST-marble']
\IfFileExists{pst-marble.pro}{%
\ProvidesFile{pst-marble.pro}
- [2018/09/23 v. 0.1, PostScript prologue file ]
+ [2018/10/19 v. 1.0, PostScript prologue file ]
\@addtofilelist{pst-marble.pro}}{}%
\endinput