diff options
author | Karl Berry <karl@freefriends.org> | 2019-02-02 22:36:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-02-02 22:36:55 +0000 |
commit | a6293b17dfc5a0adacb498e03db5d9dedd7923a2 (patch) | |
tree | 5c9dc75954355067d8fd9e347ba52bcea96cbc81 /Master/texmf-dist/tex | |
parent | 15b8d62fa73285233b50c2aac79ca173232cc476 (diff) |
pst-marble (2feb19)
git-svn-id: svn://tug.org/texlive/trunk@49908 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pst-marble/pst-marble.tex | 36 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty | 4 |
2 files changed, 26 insertions, 14 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 8d1245ea5a2..0eaff0e150a 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 Jaffers, 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.1} -\def\filedate{2019/01/23} +\def\fileversion{1.2} +\def\filedate{2019/02/01} \message{`PST' v\fileversion, \filedate} % \pstheader{pst-marble.pro} @@ -35,20 +35,31 @@ \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}{seed}{\def\pst@marble@seed{#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=0 0 0, +\psset[pst-marble]{ + seed={Mathematical Marbling}, + background={ + [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] + }, viscosity=1000, actions={0 0 35 colors 35 concentric-rings}, - 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]}, drawcontours=false, bckg=true }% @@ -60,8 +71,9 @@ 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] color-norm 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 def @@ -85,4 +97,4 @@ grestore end}% fin du code ps \end@SpecialObj}% % fin de la commande PSTricks \catcode`\@=\PstAtCode\relax -\endinput
\ No newline at end of file +\endinput 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 1d22201ee75..f6f0d367e87 100644 --- a/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty +++ b/Master/texmf-dist/tex/latex/pst-marble/pst-marble.sty @@ -1,11 +1,11 @@ \RequirePackage{pstricks} -\ProvidesPackage{pst-marble}[2019/01/24 package wrapper for PSTricks pst-marble.tex] +\ProvidesPackage{pst-marble}[2019/02/01 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} - [2019/01/24 v. 1.1, PostScript prologue file ] + [2019/02/01 v. 1.2, PostScript prologue file ] \@addtofilelist{pst-marble.pro}}{}% \endinput |