From 549c5b5143e9ae63dbce060b6460b8e0995d7dc8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Feb 2019 22:18:42 +0000 Subject: pst-marble (19feb19) git-svn-id: svn://tug.org/texlive/trunk@50060 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-marble/pst-marble.tex | 28 +++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 0eaff0e150a..86f370e8b50 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.2} -\def\filedate{2019/02/01} +\def\fileversion{1.3} +\def\filedate{2019/02/18} \message{`PST' v\fileversion, \filedate} % \pstheader{pst-marble.pro} @@ -35,6 +35,7 @@ \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}{oversample}{\def\pst@marble@oversample{#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. @@ -59,6 +60,7 @@ [0.624 0.588 0.439] }, viscosity=1000, + oversample=0, actions={0 0 35 colors 35 concentric-rings}, drawcontours=false, bckg=true @@ -69,30 +71,34 @@ \begin@SpecialObj \addto@pscode{% plotdict begin -/STROKE {\pst@number\pslinewidth 1000 div SLW systemdict /stroke get exec } def +/FILL {\tx@setTransparency\space\tx@setBlendmode systemdict /fill get exec } def +/STROKE {\pst@number\pslinewidth 1000 div SLW \tx@setStrokeTransparency\space\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 def -/hiy pageheight 2 div def -/hix pagewidth 2 div def -/lox pagewidth -2 div def +/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 +/visc \pst@marble@visc abs def +/oversample \pst@marble@oversample dup 0 eq \pst@marble@visc 0 lt and {pop 1} if def /actions [\pst@marble@actions] def /acnt actions length def -\ifPst@drawcontours /Contours {STROKE} def \else /Contours {fill} def \fi +\ifPst@drawcontours /Contours {STROKE} def \else /Contours {FILL} def \fi gsave \ifPst@bckg background aload pop setrgbcolor - lox loy pagewidth pageheight rectfill +% lox loy pagewidth pageheight RECTFILL + newpath lox loy moveto pagewidth 0 rlineto 0 pageheight rlineto pagewidth neg 0 rlineto closepath FILL \fi lox loy pagewidth pageheight rectclip - \pst@marble@visc marble + marble grestore end}% fin du code ps \end@SpecialObj}% % fin de la commande PSTricks -- cgit v1.2.3